Merge test-requirements-py3.txt to test-requirements.txt

The requirements job was failing since it doesn't allow duplicate
requirements like we have in test-requirements.txt and
test-requirements-py3.txt. test-requirements-py3.txt can now be
removed since python-memcached supports python3.

Also, updated the requirements using the update-requirements
script from commit ae4aa204367b97170a808ad6ef7261959c7efae1 .

Change-Id: Icfc7cedd3fe7ac48bb04f9acbb73d0b8d0190721

requirements.txt

@@ -7,8 +7,8 @@ oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils>=1.6.0 # Apache-2.0
-pbr<2.0,>=0.11
+oslo.utils>=1.9.0 # Apache-2.0
+pbr<2.0,>=1.3
 pycadf>=0.8.0
 python-keystoneclient>=1.6.0
 requests>=2.5.2

setup.py

@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.3'],
     pbr=True)

test-requirements-py3.txt

@@ -1,20 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-hacking<0.11,>=0.10.0
-
-coverage>=3.6
-discover
-fixtures>=0.3.14
-mock>=1.0
-pycrypto>=2.6
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.5.1 # Apache-2.0
-oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
-requests-mock>=0.6.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-stevedore>=1.5.0 # Apache-2.0
-testrepository>=0.0.18
-testresources>=0.2.4
-testtools>=1.4.0

test-requirements.txt

@@ -5,19 +5,19 @@
 hacking<0.11,>=0.10.0
 
 coverage>=3.6
-fixtures>=0.3.14
-mock>=1.0
+fixtures>=1.3.1
+mock>=1.2
 pycrypto>=2.6
 oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.5.1 # Apache-2.0
-oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+oslotest>=1.9.0 # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
 requests-mock>=0.6.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 stevedore>=1.5.0 # Apache-2.0
 testrepository>=0.0.18
 testresources>=0.2.4
 testtools>=1.4.0
-python-memcached>=1.48
+python-memcached>=1.56
 
 # Bandit security code scanner
 bandit>=0.10.1

tox.ini

@@ -14,10 +14,6 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'
 
-[testenv:py34]
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements-py3.txt
-
 [testenv:pep8]
 commands =
   flake8