Merge "Updated requirements to match Liberty's one"

requirements.txt

@@ -1,16 +1,21 @@
 setuptools>=16.0
-pbr>=0.6,!=0.7,<1.0
+pbr>=1.6
-python-swiftclient>=2.2.0,<2.5.0
+python-swiftclient>=2.2.0
-python-keystoneclient>=1.2.0,<1.4.0
+python-keystoneclient>=1.6.0
-python-cinderclient>=1.1.0,<1.2.0
+python-cinderclient>=1.3.1
-python-glanceclient>=0.15.0,<0.18.0
+python-glanceclient>=0.18.0
-python-novaclient>=2.22.0,<2.24.0
+python-novaclient>=2.28.1,!=2.33.0
-python-openstackclient>=1.0.3,<1.1.0
+python-openstackclient>=1.5.0
-oslo.utils>=1.4.0,!=1.4.1,<1.5.0
+oslo.utils>=2.0.0,!=2.6.0 # Apache-2.0
-oslo.i18n>=1.5.0,<1.6.0
+oslo.i18n>=1.5.0 # Apache-2.0
 
 PyMySQL>=0.6.2  # MIT License
-pymongo>=2.6.3,<3.0
+pymongo>=3.0.2
+paramiko>=1.13.0
+
 # Not in global-requirements
 apscheduler
-paramiko>=1.13.0
+
+# Platform specific
+pywin32; sys_platform == 'win32'
+pep3143daemon; sys_platform != 'win32'

setup.py

@@ -13,27 +13,9 @@
 #limitations under the License.
 
 from setuptools import setup
-import sys
-import subprocess
-
-# All this Machinery unfortunately is needed to support win32 platform.
-# We follow the advice from pbr as:
-# Note that we do nott support the easy_install aspects of setuptools:
-# while we depend on setup_requires, for any install_requires we recommend
-# that they be installed prior to running setup.py install - either by hand,
-# or by using an install tool such as pip.
-install_requires = ''
-if sys.platform.startswith('linux'):
-    install_requires = 'pep3143daemon'
-elif sys.platform.startswith('win32'):
-    install_requires = 'pywin32'
-
-subprocess.call(['easy_install', 'pip'])
-if install_requires:
-  subprocess.call(['pip', 'install', install_requires])
 
 setup(
-    setup_requires='pbr>=0.6,!=0.7,<1.0',
+    setup_requires='pbr',
     pbr=True
 )
 

test-requirements.txt

@@ -1,11 +1,11 @@
 flake8>=2.2.4,<=2.4.1
-pylint>=1.3.1
+pylint==1.4.4 # GNU GPL v2
 hacking>=0.10.2,<0.11
 coverage>=3.6
 discover
-mock>=1.0
+mock>=1.2
-oslosphinx
+oslosphinx>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools>=1.4.0