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

@@ -1,7 +1,8 @@
-oslo.config
+oslo.config>=1.11.0  # Apache-2.0
-oslo.i18n
+oslo.i18n>=1.5.0  # Apache-2.0
-oslo.log>=1.6.0  # Apache-2.0
+keystonemiddleware>=2.0.0
-keystonemiddleware
+jsonschema>=2.0.0,<3.0.0,!=2.5.0
-jsonschema
+elasticsearch>=1.3.0
-elasticsearch
+
+#Non-compliant with global-requirements: falcon>=0.1.6,<0.2.0
 falcon>=0.2.0

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
+mock>=1.1,!=1.1.4;python_version!='2.6'
-python-openstackclient
+mock==1.0.1;python_version=='2.6'
-mox
+python-openstackclient>=1.5.0
+mox>=0.5.3
+# Not in global-requirements
 parsedatetime
 coverage>=3.6

requirements.txt

@@ -1,18 +1,14 @@
-python-swiftclient>=1.6.0
+python-swiftclient>=2.2.0,<2.5.0
-python-keystoneclient>=0.8.0
+python-swiftclient>=2.2.0
-python-cinderclient>=1.2.1
+python-keystoneclient>=1.2.0,<1.4.0
-python-glanceclient
+python-cinderclient>=1.1.0,<1.2.0
-python-novaclient>=2.21.0
+python-glanceclient>=0.15.0,<0.18.0
-python-openstackclient
+python-novaclient>=2.22.0,<2.24.0python-openstackclient>=1.0.3,<1.1.0
+paramiko>=1.13.0
 
-docutils>=0.8.1
+PyMySQL>=0.6.2  # MIT License
-paramiko
+pymongo>=3.0.2
-pymysql
+# Not in global-requirements
-pymongo
 apscheduler
+# Not in global-requirements
 pep3143daemon
-
-[testing]
-pytest
-flake8
-mock

setup.py

@@ -79,15 +79,18 @@ setup(
         'Topic :: System :: Archiving',
     ],
     install_requires=[
-        'paramiko',
+        'python-swiftclient>=2.2.0,<2.5.0',
-        'python-swiftclient>=1.6.0',
+        'python-swiftclient>=2.2.0',
-        'python-keystoneclient>=0.7.0',
+        'python-keystoneclient>=1.2.0,<1.4.0',
-        'python-cinderclient>=1.2.1',
+        'python-cinderclient>=1.1.0,<1.2.0',
-        'python-glanceclient',
+        'python-glanceclient>=0.15.0,<0.18.0',
-        'python-novaclient>=2.21.0',
+        'python-novaclient>=2.22.0,<2.24.0',
-        'pymysql',
+        'python-openstackclient>=1.0.3,<1.1.0',
-        'pymongo',
+        'PyMySQL>=0.6.2',
-        'docutils>=0.8.1'],
+        'pymongo>=3.0.2',
+        'apscheduler',
+        'pep3143daemon',
+        'paramiko>=1.13.0'],
     extras_require={
         'testing': ['pytest', 'flake8', 'pylint>=1.3.1'],
     },

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'
+

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