requirements: Start using fixed versions

Given that 'tox' doesn't actually read any of these, there's no reason
to use ranges of requirements. Instead, use the latest and greatest for
live instances and rely on tox to validate behavior with older versions.

The selenium dependency, which is no longer required since commit
bab2895f, is removed. The psycopg2 dependency is updated to use
psycopg2-binary, as this avoids the need for the libpg library and
removes a deprecation warning.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Signed-off-by: Daniel Axtens <dja@axtens.net>

diff --git a/requirements-dev.txt b/requirements-dev.txt
index f4ad751aed7860f6de7892fe987f3545433fe490..70b747f566bac4387239b4b8bdcd728ac201e924 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
-Django>=1.11,<2.1; python_version >= '3.4'
-Django>=1.11,<2.0; python_version < '3.0'
-djangorestframework>=3.4,<3.9
-django-filter>=1.0,<1.2
+Django==2.0.8; python_version >= '3.4'
+Django==1.11.15; python_version < '3.0'
+djangorestframework==3.8.2
+django-filter==1.1.0
 -r requirements-test.txt

diff --git a/requirements-prod.txt b/requirements-prod.txt
index e7a753544567142793f86328cb5c0347c5963824..efe6743c754407f50b38bbe1b2a7095f05ef61b5 100644 (file)
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,6 +1,6 @@
-Django>=1.11,<2.1; python_version >= '3.4'
-Django>=1.11,<2.0; python_version < '3.0'
-djangorestframework>=3.4,<3.9
-django-filter>=1.0,<1.2
-psycopg2>=2.7,<2.8
+Django==2.0.8; python_version >= '3.4'
+Django==1.11.15; python_version < '3.0'
+djangorestframework==3.8.2
+django-filter==1.1.0
+psycopg2-binary==2.7.5
 sqlparse==0.2.4

diff --git a/requirements-test.txt b/requirements-test.txt
index 94dc3db755c641d1169cb70365d185595918cd30..295cceffa4aa8fc770e3639031580d9529a77378 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,5 +1,4 @@
-mysqlclient>=1.3,<1.4
-psycopg2-binary>=2.7,<2.8
+mysqlclient==1.3.13
+psycopg2-binary==2.7.5
 django-debug-toolbar==1.9.1
-python-dateutil>2.0,<3.0
-selenium>=3.0,<4.0
+python-dateutil==2.7.3

diff --git a/tox.ini b/tox.ini
index fb7bd85e0cfeb62baf32c8cc7bfa8872f4c32d75..ab35be82b9fa94a07b9227417c11fd239ed6f962 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,6 @@ setenv =
     py27: PYTHONWARNINGS = once
     py{34,36}:PYTHONWARNINGS = once,ignore::ImportWarning:backports
     py35:PYTHONWARNINGS = once,ignore::ResourceWarning:unittest.suite,ignore::ImportWarning:backports
-
 passenv =
     http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
     PW_TEST_DB_TYPE PW_TEST_DB_USER PW_TEST_DB_PASS PW_TEST_DB_HOST