summaryrefslogtreecommitdiff
path: root/tests/requirements
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-01-25 16:26:30 -0500
committerTim Graham <timograham@gmail.com>2017-01-25 16:26:59 -0500
commit888c1e9bfe49135d049cbdcbbb0f2e97a1a0a1f5 (patch)
treecf6648694ef968ad082229c15960dd73c7702b14 /tests/requirements
parent1c466994d9729a8902d34e277a3a685bef2a08e1 (diff)
downloaddjango-888c1e9bfe49135d049cbdcbbb0f2e97a1a0a1f5.tar.gz
Fixed #27776 -- Merged tests/requirements/base.txt into py3.txt.
Diffstat (limited to 'tests/requirements')
-rw-r--r--tests/requirements/base.txt14
-rw-r--r--tests/requirements/py3.txt15
2 files changed, 14 insertions, 15 deletions
diff --git a/tests/requirements/base.txt b/tests/requirements/base.txt
deleted file mode 100644
index ee72121d52..0000000000
--- a/tests/requirements/base.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-argon2-cffi >= 16.1.0
-bcrypt
-docutils
-geoip2
-jinja2 >= 2.9.2
-numpy
-Pillow
-PyYAML
-# pylibmc/libmemcached can't be built on Windows.
-pylibmc; sys.platform != 'win32'
-pytz
-selenium
-sqlparse
-tblib
diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt
index ced3eed101..045c68ab40 100644
--- a/tests/requirements/py3.txt
+++ b/tests/requirements/py3.txt
@@ -1,2 +1,15 @@
--r base.txt
+argon2-cffi >= 16.1.0
+bcrypt
+docutils
+geoip2
+jinja2 >= 2.9.2
+numpy
+Pillow
+# pylibmc/libmemcached can't be built on Windows.
+pylibmc; sys.platform != 'win32'
python3-memcached
+pytz
+PyYAML
+selenium
+sqlparse
+tblib