From: Stephen Finucane Date: Tue, 10 Sep 2019 18:12:16 +0000 (+0100) Subject: requirements: Use compatible MINOR releases X-Git-Tag: v2.2.0-rc1~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f0ba2bb74499c3c4884746a782e87ed362e8f1e;p=thirdparty%2Fpatchwork.git requirements: Use compatible MINOR releases '~= 2.2' will match '2.2.N', '2.3.N', etc. but not '3.0.N'. What we want in most cases is to match '2.2.N' only. Ensure this is the case. Signed-off-by: Stephen Finucane Fixes: c90473ea ("requirements: Switch to compatible releases") --- diff --git a/requirements-dev.txt b/requirements-dev.txt index 28bb8efb..60eb8a63 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,10 +1,10 @@ -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 +Django~=2.2.0; python_version >= '3.5' +Django~=1.11.0; python_version < '3.0' # pyup: ignore +djangorestframework~=3.10.0; python_version >= '3.5' +djangorestframework~=3.9.0; 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.0; python_version >= '3.5' # pyup: ignore +django-debug-toolbar~=1.11.0; python_version < '3.0' # pyup: ignore +django-dbbackup~=3.2.0 -r requirements-test.txt diff --git a/requirements-prod.txt b/requirements-prod.txt index 1532b4f6..797d30bb 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,8 +1,8 @@ -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 +Django~=2.2.0; python_version >= '3.5' +Django~=1.11.0; python_version < '3.0' # pyup: ignore +djangorestframework~=3.10.0; python_version >= '3.5' +djangorestframework~=3.9.0; 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.0 +sqlparse~=0.3.0 diff --git a/requirements-test.txt b/requirements-test.txt index 6d0b3ef1..4235f372 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ mysqlclient~=1.4.4 -psycopg2-binary~=2.8 -sqlparse~=0.3 -python-dateutil~=2.8 +psycopg2-binary~=2.8.0 +sqlparse~=0.3.0 +python-dateutil~=2.8.0 openapi-core~=0.8.0