From 9f0ef207802002cd3fd56c575f645df3d9691ec0 Mon Sep 17 00:00:00 2001 From: Misha Kalyna Date: Tue, 1 Oct 2019 01:03:58 +0200 Subject: [PATCH 1/3] add Django 3.0 to the test matrix --- .travis.yml | 4 ++++ setup.py | 1 + tox.ini | 2 ++ 3 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index d1571c0f8..6493e8f52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,10 @@ matrix: env: TOXENV=py36-django22 - python: 3.7 env: TOXENV=py37-django22 + - python: 3.6 + env: TOXENV=py36-django30 + - python: 3.7 + env: TOXENV=py37-django30 - python: 3.6 env: TOXENV=py36-djangomaster - python: 3.7 diff --git a/setup.py b/setup.py index 9b0b405e0..2db4ac22d 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,7 @@ def read(filename): 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', + 'Framework :: Django :: 3.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', diff --git a/tox.ini b/tox.ini index d39b8add3..4859e577a 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,7 @@ envlist = py{34,35,36,37}-django20 py{35,36,37}-django21 py{35,36,37}-django22 + py{36,37}-django30 py{36,37}-djangomaster integration flake8 @@ -20,6 +21,7 @@ deps = django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 django22: Django>=2.2,<3.0 + django30: Django>=3.0a1,<3.1 djangomaster: https://github.com/django/django/archive/master.tar.gz py27: mock pytest From 0fb8585fd9236ac6f60a440e9170137e127a1efc Mon Sep 17 00:00:00 2001 From: Misha Kalyna Date: Tue, 1 Oct 2019 09:07:04 +0200 Subject: [PATCH 2/3] put 4.0 version constraint --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 4859e577a..0aab57ee1 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ deps = django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 django22: Django>=2.2,<3.0 - django30: Django>=3.0a1,<3.1 + django30: Django>=3.0a1,<4.0 djangomaster: https://github.com/django/django/archive/master.tar.gz py27: mock pytest From c3ab2f272fc636f18f2e22f44e404189bee6fc54 Mon Sep 17 00:00:00 2001 From: Misha Kalyna Date: Sun, 6 Oct 2019 14:25:28 +0200 Subject: [PATCH 3/3] removed django 3.0 from setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 2db4ac22d..9b0b405e0 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ def read(filename): 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', - 'Framework :: Django :: 3.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent',