From f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sun, 17 Feb 2013 15:22:44 +0000 Subject: Use oslo-config-2013.1b3 The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b3 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Remove the 'deps = pep8==1.3.3' and 'deps = pyflakes' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc --- tools/install_venv_common.py | 2 +- tools/pip-requires | 1 + tools/test-requires | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 00f73d7..7cb3968 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -32,7 +32,7 @@ if os.path.exists(os.path.join(possible_topdir, "oslo", sys.path.insert(0, possible_topdir) -from openstack.common import cfg +from oslo.config import cfg class InstallVenv(object): diff --git a/tools/pip-requires b/tools/pip-requires index 31be6e3..fa90b95 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -10,3 +10,4 @@ kombu==1.0.4 argparse stevedore SQLAlchemy>=0.7.8,<=0.7.9 +http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config diff --git a/tools/test-requires b/tools/test-requires index ab7df82..3c26a47 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -12,6 +12,7 @@ nosexcover openstack.nose_plugin nosehtmloutput pep8==1.3.3 +pyflakes pylint pyzmq>=2.1.11 setuptools-git>=0.4 -- cgit