From 6ee096f970a46e860ecc8d8efbf4ede353082914 Mon Sep 17 00:00:00 2001 From: Agate Date: Thu, 28 Jul 2022 09:38:38 +0200 Subject: [PATCH 1/5] Enabled django 3.2 testing in tox file --- setup.py | 4 ++-- tox.ini | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 6c77ba6..be1ceb5 100644 --- a/setup.py +++ b/setup.py @@ -149,13 +149,13 @@ setup( 'Programming Language :: Python', ], install_requires=[ - 'django>=2.2, <2.3', + 'django>=2.2, <3.3', 'gadjo', 'celery<4' if sys.version_info < (3, 7) else 'celery>=4', 'django-mellon', 'django-tenant-schemas', 'prometheus_client', - 'djangorestframework>=3.4, <3.10', + 'djangorestframework>=3.4, <3.13', 'dnspython', 'lxml', 'num2words==0.5.9', diff --git a/tox.ini b/tox.ini index cf69ec3..51ccd57 100644 --- a/tox.ini +++ b/tox.ini @@ -32,6 +32,7 @@ setenv = fast: NOMIGRATIONS=--nomigrations deps: django22: django>=2.2,<2.3 + django32: django>=3.2,<3.3 pytest!=6.0.0 pytest-cov pytest-django @@ -42,7 +43,8 @@ deps: django-mellon django-webtest Markdown<3 - django-tables2<2.0 + django22: django-tables2<2.0 + django32: django-tables2>=2.4<2.5 authentic: https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz passerelle: https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz passerelle: python-memcached @@ -54,8 +56,11 @@ deps: pytest-freezegun xmlschema<1.1 enum34<=1.1.6 - psycopg2<2.9 - psycopg2-binary<2.9 + django32: psycopg2 + django32: psycopg2-binary + django22: psycopg2<2.9 + django22: psycopg2-binary<2.9 + black: pre-commit commands = ./getlasso3.sh -- 2.36.1