From: Stephen Finucane <stephen@that.guru>
Date: Wed, 29 Aug 2018 10:01:41 +0000 (+0100)
Subject: requirements: Start using fixed versions
X-Git-Tag: v2.2.0-rc1~273
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab0c443691;p=thirdparty%2Fpatchwork.git

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 f4ad751a..70b747f5 100644
--- 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 e7a75354..efe6743c 100644
--- 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 94dc3db7..295cceff 100644
--- 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 fb7bd85e..ab35be82 100644
--- 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