summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-02-17 15:22:44 +0000
committerMark McLoughlin <markmc@redhat.com>2013-02-17 15:44:00 +0000
commitf63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3 (patch)
treefc46499db82de0829e1137b1d620bceb46cb787f /tools
parent8ce59472653439d646309395bf195ec6163ff29a (diff)
downloadoslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.tar.gz
oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.tar.xz
oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.zip
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
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv_common.py2
-rw-r--r--tools/pip-requires1
-rw-r--r--tools/test-requires1
3 files changed, 3 insertions, 1 deletions
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