diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-02-10 18:50:40 -0500 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-02-18 12:16:47 +0000 |
| commit | 909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826 (patch) | |
| tree | 84c5511f66e39aea370b279bd518a8ed2e997f14 /tools | |
| parent | 5a8682ddc233b80faf82f4327a8e5d0658a872ef (diff) | |
| download | keystone-909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826.tar.gz keystone-909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826.tar.xz keystone-909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826.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' 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.py | 2 | ||||
| -rw-r--r-- | tools/pip-requires | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 9c5cb446..dd1977e4 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, "keystone", sys.path.insert(0, possible_topdir) -from keystone.openstack.common import cfg +from oslo.config import cfg class InstallVenv(object): diff --git a/tools/pip-requires b/tools/pip-requires index de4a1b9b..f331eb9d 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -12,3 +12,4 @@ passlib lxml iso8601>=0.1.4 python-keystoneclient>=0.2,<0.3 +http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config |