diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-28 21:32:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-28 21:32:58 +0000 |
| commit | 19cfe4f11f933f0439e649cff6b3c979158fc40e (patch) | |
| tree | a8968ca17009ecb3a4a0082cdc22354f67019504 | |
| parent | 62e626f31f3021731a6a53b11bb72842a72c2b09 (diff) | |
| parent | b83d3bdf2c718cdf4bf0d04210fb0f1381ec8b05 (diff) | |
| download | python-keystoneclient-stable/icehouse.tar.gz | |
Merge "Updated from global requirements" into stable/icehouseicehouse-eolstable/icehouse
| -rw-r--r-- | requirements.txt | 20 | ||||
| -rw-r--r-- | setup.py | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 26 |
3 files changed, 23 insertions, 31 deletions
diff --git a/requirements.txt b/requirements.txt index 99f6a23..7a23a46 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,16 +2,16 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.6,!=0.7,<1.0 +pbr>=0.6,<1.0 argparse -Babel>=1.3 -iso8601>=0.1.9 -netaddr>=0.7.12 -oslo.config>=1.4.0 # Apache-2.0 -oslo.serialization>=1.0.0 # Apache-2.0 -oslo.utils>=1.0.0 # Apache-2.0 +Babel>=1.3,<=1.3 +iso8601>=0.1.9,<=0.1.10 +netaddr>=0.7.6,<=0.7.14 +oslo.config>=1.2.0,<1.5 +oslo.serialization>=0.1.0,<1.1 # Apache-2.0 +oslo.utils>=0.1.1,<1.1 # Apache-2.0 PrettyTable>=0.7,<0.8 -requests>=2.2.0,!=2.4.0 -six>=1.7.0 -stevedore>=1.0.0 # Apache-2.0 +requests>=1.1,<=2.6.0 +six>=1.6.0,<=1.9.0 +stevedore>=0.14 @@ -17,14 +17,6 @@ # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index f207486..314fc8f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,21 +2,21 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.9.2,<0.10 +hacking>=0.8.0,<0.9 -coverage>=3.6 -discover -fixtures>=0.3.14 -keyring>=2.1,!=3.3 -lxml>=2.3 -mock>=1.0 +coverage>=3.6,<=3.7.1 +discover<=0.4.0 +fixtures>=0.3.14,<=1.0.0 +keyring>=1.6.1,!=2.0,!=2.0.1,!=2.0.2,!=2.0.3,!=3.3 +lxml>=2.3,<=3.4.2 +mock>=1.0,<=1.0.1 mox3>=0.7.0 oauthlib>=0.6 -oslosphinx>=2.2.0 # Apache-2.0 -pycrypto>=2.6 +oslosphinx<=2.5.0 +pycrypto>=2.6,<=2.6.1 requests-mock>=0.4.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -testrepository>=0.0.18 +sphinx>=1.1.2,<1.1.999 +testrepository>=0.0.18,<=0.0.20 testresources>=0.2.4 -testtools>=0.9.34 -WebOb>=1.2.3 +testtools>=0.9.34,!=1.2.0,!=1.4.0,<=1.7.1 +WebOb>=1.2.3,<=1.4 |