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

1 files changed, 0 insertions, 4 deletions

diff --git a/tox.ini b/tox.ini
index b11122d..790bf02 100644
--- a/tox.ini
+++ b/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