From c90473ea4478db20a0c7e6686620ad8dd0d412e4 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Sun, 8 Sep 2019 17:05:21 +0100 Subject: [PATCH] requirements: Switch to compatible releases In commit ab0c443691, we switched from using commit ranges to fixed ranges. This was a good idea in so far as it ensures we're providing an application with dependencies that are guaranteed to work. However, Patchwork as a project isn't active enough to warrant the continued busy work effort necessary to keep bumping these versions and it's probably about time to abandon the experiment. However, rather than switching back to version ranges, use the compatible releases feature introduced in PEP 440 [1]. This gives us most of the benefits of ranges but with a nicer syntax. [1] https://www.python.org/dev/peps/pep-0440/#compatible-release Signed-off-by: Stephen Finucane --- requirements-dev.txt | 18 +++++++++--------- requirements-prod.txt | 16 ++++++++-------- requirements-test.txt | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 62cd8b21..28bb8efb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,10 +1,10 @@ -Django==2.2.5; python_version >= '3.5' -Django==1.11.24; python_version < '3.0' # pyup: ignore -djangorestframework==3.10.3; python_version >= '3.5' -djangorestframework==3.9.4; python_version < '3.0' # pyup: ignore -django-filter==2.2.0; python_version >= '3.5' -django-filter==1.1.0; python_version < '3.0' # pyup: ignore -django-debug-toolbar==2.0; python_version >= '3.5' # pyup: ignore -django-debug-toolbar==1.11; python_version < '3.0' # pyup: ignore -django-dbbackup==3.2.0 +Django~=2.2; python_version >= '3.5' +Django~=1.11; python_version < '3.0' # pyup: ignore +djangorestframework~=3.10; python_version >= '3.5' +djangorestframework~=3.9; python_version < '3.0' # pyup: ignore +django-filter~=2.2; python_version >= '3.5' +django-filter~=1.1; python_version < '3.0' # pyup: ignore +django-debug-toolbar~=2.0; python_version >= '3.5' # pyup: ignore +django-debug-toolbar~=1.11; python_version < '3.0' # pyup: ignore +django-dbbackup~=3.2 -r requirements-test.txt diff --git a/requirements-prod.txt b/requirements-prod.txt index 4a7ca630..1532b4f6 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,8 +1,8 @@ -Django==2.2.5; python_version >= '3.5' -Django==1.11.24; python_version < '3.0' # pyup: ignore -djangorestframework==3.10.3; python_version >= '3.5' -djangorestframework==3.9.4; python_version < '3.0' # pyup: ignore -django-filter==2.2.0; python_version >= '3.5' -django-filter==1.1.0; python_version < '3.0' # pyup: ignore -psycopg2-binary==2.8.3 -sqlparse==0.3.0 +Django~=2.2; python_version >= '3.5' +Django~=1.11; python_version < '3.0' # pyup: ignore +djangorestframework~=3.10; python_version >= '3.5' +djangorestframework~=3.9; python_version < '3.0' # pyup: ignore +django-filter~=2.2; python_version >= '3.5' +django-filter~=1.1; python_version < '3.0' # pyup: ignore +psycopg2-binary~=2.8 +sqlparse~=0.3 diff --git a/requirements-test.txt b/requirements-test.txt index b1a38c31..6d0b3ef1 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ -mysqlclient==1.4.4 -psycopg2-binary==2.8.3 -sqlparse==0.3.0 -python-dateutil==2.8.0 -openapi-core==0.8.0 +mysqlclient~=1.4.4 +psycopg2-binary~=2.8 +sqlparse~=0.3 +python-dateutil~=2.8 +openapi-core~=0.8.0 -- 2.47.3