From ec8e830b782f39006e35638ee5f230cd620e6dc2 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 6 Aug 2020 01:40:14 +0100
Subject: [PATCH] Test against Django 3.1 final and django-rest-framework
3.11.1
---
.travis.yml | 6 ++++--
setup.py | 4 ++--
tox.ini | 6 ++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d5b34c5510..f83f23b64b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
python: 3.7
- env: TOXENV=py38-dj30-postgres-noelasticsearch
python: 3.8
- - env: TOXENV=py38-dj30stable-postgres-noelasticsearch
+ - env: TOXENV=py38-dj31-postgres-noelasticsearch
python: 3.8
- env: TOXENV=py38-dj31stable-postgres-noelasticsearch
python: 3.8
@@ -35,6 +35,8 @@ matrix:
python: 3.8
- env: TOXENV=py38-dj30-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
python: 3.8
+ - env: TOXENV=py38-dj31-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
+ python: 3.8
allow_failures:
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
- env: TOXENV=py36-dj22-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
@@ -42,8 +44,8 @@ matrix:
- env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
- env: TOXENV=py38-dj30-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
+ - env: TOXENV=py38-dj31-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
# allow failures against Django pre-releases on git
- - env: TOXENV=py38-dj30stable-postgres-noelasticsearch
- env: TOXENV=py38-dj31stable-postgres-noelasticsearch
- env: TOXENV=py38-djmaster-postgres-noelasticsearch
diff --git a/setup.py b/setup.py
index e550b86bbd..0b0c2fc5f8 100755
--- a/setup.py
+++ b/setup.py
@@ -21,11 +21,11 @@ except ImportError:
install_requires = [
- "Django>=2.2,<3.1",
+ "Django>=2.2,<3.2",
"django-modelcluster>=5.0,<6.0",
"django-taggit>=1.0,<2.0",
"django-treebeard>=4.2.0,<5.0",
- "djangorestframework>=3.7.4,<4.0",
+ "djangorestframework>=3.11.1,<4.0",
"django-filter>=2.2,<3.0",
"draftjs_exporter>=2.1.5,<3.0",
"Pillow>=4.0.0,<8.0.0",
diff --git a/tox.ini b/tox.ini
index 7a6bde93eb..ce6df69330 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True
-envlist = py{35,36,37}-dj{22,30,30stable,31stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
+envlist = py{35,36,37,38}-dj{22,30,31,31stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
[testenv]
install_command = pip install -e ".[testing]" -U {opts} {packages}
@@ -25,11 +25,9 @@ deps =
dj22: Django>=2.2,<2.3
dj30: Django>=3.0,<3.1
- dj30stable: git+https://github.com/django/django.git@stable/3.0.x#egg=Django
+ dj31: Django>=3.1,<3.2
dj31stable: git+https://github.com/django/django.git@stable/3.1.x#egg=Django
- dj31stable: git+https://github.com/encode/django-rest-framework.git
djmaster: git+https://github.com/django/django.git@master#egg=Django
- djmaster: git+https://github.com/encode/django-rest-framework.git
postgres: psycopg2>=2.6
mysql: mysqlclient>=1.3.7,<1.4