From 403a76ccd392271516603a5d0142ab446388698b Mon Sep 17 00:00:00 2001 From: Erno Kuvaja Date: Sat, 18 Jul 2015 16:29:56 +0000 Subject: [PATCH] Align requirements with global-requirements Setting requirements to mins and caps aligned with global requirements on packages where it's possible. Commenting the ones that does not align. Change-Id: Iba37d120c980ba849f79851fcbfc005651ed600d --- freezer_api/requirements.txt | 13 +++++++------ horizon_web_ui/test-requirements.txt | 10 ++++++---- requirements.txt | 26 +++++++++++--------------- setup.py | 21 ++++++++++++--------- test-requirements.txt | 5 +++++ tox.ini | 2 +- 6 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 test-requirements.txt diff --git a/freezer_api/requirements.txt b/freezer_api/requirements.txt index 960d2be9..ab63f109 100644 --- a/freezer_api/requirements.txt +++ b/freezer_api/requirements.txt @@ -1,7 +1,8 @@ -oslo.config -oslo.i18n -oslo.log>=1.6.0 # Apache-2.0 -keystonemiddleware -jsonschema -elasticsearch +oslo.config>=1.11.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +keystonemiddleware>=2.0.0 +jsonschema>=2.0.0,<3.0.0,!=2.5.0 +elasticsearch>=1.3.0 + +#Non-compliant with global-requirements: falcon>=0.1.6,<0.2.0 falcon>=0.2.0 diff --git a/horizon_web_ui/test-requirements.txt b/horizon_web_ui/test-requirements.txt index bebc1f6a..ea631ccd 100644 --- a/horizon_web_ui/test-requirements.txt +++ b/horizon_web_ui/test-requirements.txt @@ -1,8 +1,10 @@ -e git+https://github.com/openstack/horizon.git#egg=horizon -django-nose +django-nose>=1.2 nose-exclude -mock -python-openstackclient -mox +mock>=1.1,!=1.1.4;python_version!='2.6' +mock==1.0.1;python_version=='2.6' +python-openstackclient>=1.5.0 +mox>=0.5.3 +# Not in global-requirements parsedatetime coverage>=3.6 diff --git a/requirements.txt b/requirements.txt index 25018ec3..867afcd0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,18 +1,14 @@ -python-swiftclient>=1.6.0 -python-keystoneclient>=0.8.0 -python-cinderclient>=1.2.1 -python-glanceclient -python-novaclient>=2.21.0 -python-openstackclient +python-swiftclient>=2.2.0,<2.5.0 +python-swiftclient>=2.2.0 +python-keystoneclient>=1.2.0,<1.4.0 +python-cinderclient>=1.1.0,<1.2.0 +python-glanceclient>=0.15.0,<0.18.0 +python-novaclient>=2.22.0,<2.24.0python-openstackclient>=1.0.3,<1.1.0 +paramiko>=1.13.0 -docutils>=0.8.1 -paramiko -pymysql -pymongo +PyMySQL>=0.6.2 # MIT License +pymongo>=3.0.2 +# Not in global-requirements apscheduler +# Not in global-requirements pep3143daemon - -[testing] -pytest -flake8 -mock diff --git a/setup.py b/setup.py index 58261bab..53cacd26 100644 --- a/setup.py +++ b/setup.py @@ -79,15 +79,18 @@ setup( 'Topic :: System :: Archiving', ], install_requires=[ - 'paramiko', - 'python-swiftclient>=1.6.0', - 'python-keystoneclient>=0.7.0', - 'python-cinderclient>=1.2.1', - 'python-glanceclient', - 'python-novaclient>=2.21.0', - 'pymysql', - 'pymongo', - 'docutils>=0.8.1'], + 'python-swiftclient>=2.2.0,<2.5.0', + 'python-swiftclient>=2.2.0', + 'python-keystoneclient>=1.2.0,<1.4.0', + 'python-cinderclient>=1.1.0,<1.2.0', + 'python-glanceclient>=0.15.0,<0.18.0', + 'python-novaclient>=2.22.0,<2.24.0', + 'python-openstackclient>=1.0.3,<1.1.0', + 'PyMySQL>=0.6.2', + 'pymongo>=3.0.2', + 'apscheduler', + 'pep3143daemon', + 'paramiko>=1.13.0'], extras_require={ 'testing': ['pytest', 'flake8', 'pylint>=1.3.1'], }, diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 00000000..c889c143 --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,5 @@ +pytest +flake8>=2.2.4,<=2.4.1 +mock>=1.1,!=1.1.4;python_version!='2.6' +mock==1.0.1;python_version=='2.6' + diff --git a/tox.ini b/tox.ini index 76c232a4..a9ec3be7 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ deps = pytest-cov pytest-xdist pymysql - python-openstackclient + python-openstackclient>=1.0.3,<1.1.0 mock pep3143daemon apscheduler