Skip to content

Commit

Permalink
[WIP] Ignore me - trying oslo.* master against Nova unit tests
Browse files Browse the repository at this point in the history
Change-Id: I52764de041a49d16d7d0c4bd35cc3274c5b3cdb1
  • Loading branch information
dims committed Jun 30, 2015
1 parent f59b5cf commit b5483a7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 19 deletions.
26 changes: 13 additions & 13 deletions requirements.txt
Expand Up @@ -10,7 +10,7 @@ eventlet>=0.17.3
Jinja2>=2.6 # BSD License (3 clause)
keystonemiddleware>=1.5.0
lxml>=2.3
Routes!=2.0,>=1.12.3
Routes!=2.0,!=2.1,>=1.12.3
WebOb>=1.2.3
greenlet>=0.3.2
PasteDeploy>=1.5.0
Expand All @@ -33,18 +33,18 @@ six>=1.9.0
stevedore>=1.5.0 # Apache-2.0
setuptools
websockify<0.7,>=0.6.0
oslo.concurrency>=2.0.0 # Apache-2.0
oslo.config>=1.11.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.log>=1.2.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0
oslo.utils>=1.6.0 # Apache-2.0
oslo.db>=1.10.0 # Apache-2.0
oslo.rootwrap>=2.0.0 # Apache-2.0
oslo.messaging>=1.8.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
-e git+https://github.com/openstack/oslo.concurrency.git#egg=oslo.concurrency
-e git+https://github.com/openstack/oslo.config.git#egg=oslo.config
-e git+https://github.com/openstack/oslo.context.git#egg=oslo.context
-e git+https://github.com/openstack/oslo.log.git#egg=oslo.log
-e git+https://github.com/openstack/oslo.serialization.git#egg=oslo.serialization
-e git+https://github.com/openstack/oslo.utils.git#egg=oslo.utils
-e git+https://github.com/openstack/oslo.db.git#egg=oslo.db
-e git+https://github.com/openstack/oslo.rootwrap.git#egg=oslo.rootwrap
-e git+https://github.com/openstack/oslo.messaging.git#egg=oslo.messaging
-e git+https://github.com/openstack/oslo.i18n.git#egg=oslo.i18n
-e git+https://github.com/openstack/oslo.middleware.git#egg=oslo.middleware
-e git+https://github.com/openstack/oslo.versionedobjects.git#egg=oslo.versionedobjects
rfc3986>=0.2.0 # Apache-2.0
oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
psutil<2.0.0,>=1.1.1
oslo.versionedobjects>=0.3.0
alembic>=0.7.2
4 changes: 2 additions & 2 deletions test-requirements-py3.txt
Expand Up @@ -15,8 +15,8 @@ python-ironicclient>=0.2.1
python-subunit>=0.0.18
requests-mock>=0.6.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.5.1 # Apache-2.0
-e git+https://github.com/openstack/oslosphinx.git#egg=oslosphinx
-e git+https://github.com/openstack/oslotest.git#egg=oslotest
testrepository>=0.0.18
testtools>=1.4.0
tempest-lib>=0.5.0
Expand Down
6 changes: 3 additions & 3 deletions test-requirements.txt
Expand Up @@ -15,11 +15,11 @@ python-ironicclient>=0.2.1
python-subunit>=0.0.18
requests-mock>=0.6.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.5.1 # Apache-2.0
-e git+https://github.com/openstack/oslosphinx.git#egg=oslosphinx
-e git+https://github.com/openstack/oslotest.git#egg=oslotest
testrepository>=0.0.18
testtools>=1.4.0
tempest-lib>=0.5.0

# vmwareapi driver specific dependencies
oslo.vmware>=0.13.1 # Apache-2.0
-e git+https://github.com/openstack/oslo.vmware.git#egg=oslo.vmware
1 change: 0 additions & 1 deletion tox.ini
Expand Up @@ -8,7 +8,6 @@ usedevelop = True
# tox is silly... these need to be separated by a newline....
whitelist_externals = bash
find
install_command = pip install -U --force-reinstall {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=./nova/tests/unit
LANGUAGE=en_US
Expand Down

0 comments on commit b5483a7

Please sign in to comment.