summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-12-18 10:37:43 -1000
committerTim Graham <timograham@gmail.com>2017-12-18 15:23:44 -1000
commit06e4e80382b2987e47e9fb1f9083dc117e9be40c (patch)
tree3adea09612e25345f2e621459b452f61e7dd35c2
parent35222035029863f95769e2e59beeeb953d125689 (diff)
[1.11.x] Fixed #25277 -- Restored test dependency to the original python-memcached.
Backport of 770b9ea77fb5e39d616e62b54c06755e6d4f4d36 from master
-rw-r--r--tests/requirements/base.txt1
-rw-r--r--tests/requirements/py2.txt2
-rw-r--r--tests/requirements/py3.txt1
3 files changed, 1 insertions, 3 deletions
diff --git a/tests/requirements/base.txt b/tests/requirements/base.txt
index ee72121d52..6ee885e13c 100644
--- a/tests/requirements/base.txt
+++ b/tests/requirements/base.txt
@@ -8,6 +8,7 @@ Pillow
PyYAML
# pylibmc/libmemcached can't be built on Windows.
pylibmc; sys.platform != 'win32'
+python-memcached >= 1.59
pytz
selenium
sqlparse
diff --git a/tests/requirements/py2.txt b/tests/requirements/py2.txt
index 0ed845bb7e..43719a354f 100644
--- a/tests/requirements/py2.txt
+++ b/tests/requirements/py2.txt
@@ -1,5 +1,3 @@
-r base.txt
enum34
-# Due to https://github.com/linsomniac/python-memcached/issues/79 in newer versions.
-python-memcached <= 1.53
mock
diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt
index ced3eed101..a3e81b8dcf 100644
--- a/tests/requirements/py3.txt
+++ b/tests/requirements/py3.txt
@@ -1,2 +1 @@
-r base.txt
-python3-memcached