summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Cazenave <ecazenave@entrouvert.com>2022-06-13 20:17:07 (GMT)
committerEmmanuel Cazenave <ecazenave@entrouvert.com>2022-06-13 20:17:07 (GMT)
commit8103ec73f1cb1404fe99e160919a3da12520cb1e (patch)
tree0d109f001cf27a9f29ef5135ab188fb3dab4e1a1
parentebb39515f3723ec91038cd4a08d6442d4457713b (diff)
downloaddocbow-wip/64430-django-32.zip
docbow-wip/64430-django-32.tar.gz
docbow-wip/64430-django-32.tar.bz2
django 3.2: update dependencies and test against django 3.2wip/64430-django-32
-rwxr-xr-xsetup.py7
-rw-r--r--tox.ini3
2 files changed, 5 insertions, 5 deletions
diff --git a/setup.py b/setup.py
index 1879e71..f9f6e79 100755
--- a/setup.py
+++ b/setup.py
@@ -100,16 +100,15 @@ setup(
scripts=('manage.py',),
packages=find_packages(),
install_requires=[
- 'django>=2.2, <2.3',
- 'six<1.11.0',
+ 'django>=2.2, <3.3',
'typing', # For M2Crypto.util
'gunicorn',
'django_journal>=2.0.0',
- 'django-picklefield<2.0.0',
+ 'django-picklefield',
'django-tables2',
'requests',
'python-magic',
- 'django-watson<1.5.4',
+ 'django-watson',
'sqlalchemy<1.4',
],
cmdclass={
diff --git a/tox.ini b/tox.ini
index 3e6eb1d..e39c371 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/docbow/{env:BRANCH_NAME:}
-envlist = py3-django22-{pw,pfwb}-coverage,py3-django22-mellon-coverage,py3-django22-pfwbmellon-coverage, black
+envlist = py3-{django22,django32}-{pw,pfwb}-coverage,py3-{django22,django32}-mellon-coverage,py3-{django22,django32}-pfwbmellon-coverage, black
[testenv]
usedevelop = True
@@ -8,6 +8,7 @@ deps =
setuptools<50
M2Crypto
django22: django>=2.2,<2.3
+ django32: django>=3.2.12,<3.3
pfwb: SQLAlchemy-Utils<0.36.7
django-webtest
mock<4