From f6f9a05e12b9795a9c024e124fc1b1adcb531c55 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sun, 10 Feb 2013 19:00:19 -0500 Subject: [PATCH] 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' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc --- openstack-common.conf | 2 +- tools/install_venv_common.py | 2 +- tools/pip-requires | 1 + tox.ini | 2 -- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openstack-common.conf b/openstack-common.conf index 0d738376e..91eea907b 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,5 +1,5 @@ [DEFAULT] # The list of modules to copy from openstack-common -modules=cfg,context,eventlet_backdoor,exception,excutils,fileutils,gettextutils,importutils,iniparser,install_venv_common,jsonutils,local,lockutils,log,loopingcall,network_utils,notifier,periodic_task,policy,processutils,rpc,service,setup,threadgroup,timeutils,uuidutils,version +modules=context,eventlet_backdoor,exception,excutils,fileutils,gettextutils,importutils,install_venv_common,jsonutils,local,lockutils,log,loopingcall,network_utils,notifier,periodic_task,policy,processutils,rpc,service,setup,threadgroup,timeutils,uuidutils,version # The base module to hold the copy of openstack.common base=quantum diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 8dfc4cf01..38b413cd8 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, "quantum", sys.path.insert(0, possible_topdir) -from quantum.openstack.common import cfg +from oslo.config import cfg class InstallVenv(object): diff --git a/tools/pip-requires b/tools/pip-requires index ee1136de4..1f91e1ec1 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -16,6 +16,7 @@ sqlalchemy==0.7.9 WebOb>=1.2 python-keystoneclient>=0.2.0 alembic>=0.4.1 +http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config # Cisco plugin dependencies python-novaclient diff --git a/tox.ini b/tox.ini index e3b17ecdb..45261b2f0 100644 --- a/tox.ini +++ b/tox.ini @@ -19,8 +19,6 @@ sitepackages = True downloadcache = ~/cache/pip [testenv:pep8] -deps = pep8 - setuptools_git>=0.4 commands = pep8 --repeat --show-source --ignore=E125 --exclude=.venv,.tox,dist,doc,openstack,*egg . pep8 --repeat --show-source --ignore=E125 --filename=quantum* bin