Test Django 3.1, and Pythons 3.8 and 3.9, drop Python 3.4

charettes · Oct 28, 2020 · 6fdab9a · 6fdab9a
1 parent f49b339
commit 6fdab9a
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,6 @@ matrix:
   include:
   - python: 2.7
     env: TOXENV=py27-1.11
-  - python: 3.4
-    env: TOXENV=py34-1.11
   - python: 3.5
     env: TOXENV=py35-1.11
   - python: 3.5
@@ -32,6 +30,10 @@ matrix:
     env: TOXENV=py36-3.0
     dist: xenial
     sudo: true
+  - python: 3.6
+    env: TOXENV=py36-3.1
+    dist: xenial
+    sudo: true
   - python: 3.6
     env: TOXENV=py36-master
     dist: xenial
@@ -48,13 +50,59 @@ matrix:
     env: TOXENV=py37-3.0
     dist: xenial
     sudo: true
+  - python: 3.7
+    env: TOXENV=py37-3.1
+    dist: xenial
+    sudo: true
   - python: 3.7
     env: TOXENV=py37-master
     dist: xenial
     sudo: true
+  - python: 3.8
+    env: TOXENV=py38-2.1
+    dist: xenial
+    sudo: true
+  - python: 3.8
+    env: TOXENV=py38-2.2
+    dist: xenial
+    sudo: true
+  - python: 3.8
+    env: TOXENV=py38-3.0
+    dist: xenial
+    sudo: true
+  - python: 3.8
+    env: TOXENV=py38-3.1
+    dist: xenial
+    sudo: true
+  - python: 3.8
+    env: TOXENV=py38-master
+    dist: xenial
+    sudo: true
+  - python: 3.9
+    env: TOXENV=py39-2.1
+    dist: xenial
+    sudo: true
+  - python: 3.9
+    env: TOXENV=py39-2.2
+    dist: xenial
+    sudo: true
+  - python: 3.9
+    env: TOXENV=py39-3.0
+    dist: xenial
+    sudo: true
+  - python: 3.9
+    env: TOXENV=py39-3.1
+    dist: xenial
+    sudo: true
+  - python: 3.9
+    env: TOXENV=py39-master
+    dist: xenial
+    sudo: true
   allow_failures:
   - env: TOXENV=py36-master
   - env: TOXENV=py37-master
+  - env: TOXENV=py38-master
+  - env: TOXENV=py39-master
 install:
 - pip install tox coveralls
 script:

diff --git a/setup.py b/setup.py
@@ -4,45 +4,47 @@
 
 import testdata
 
-with open('README.rst') as file_:
+with open("README.rst") as file_:
     long_description = file_.read()
 
 setup(
-    name='django-testdata',
+    name="django-testdata",
     version=testdata.__version__,
-    description='Django application providing isolation for model instances created during `setUpTestData`.',
+    description="Django application providing isolation for model instances created during `setUpTestData`.",
     long_description=long_description,
-    long_description_content_type='text/rst',
-    url='https://github.com/charettes/django-testdata',
-    author='Simon Charette.',
-    author_email='charette.s+testdata@gmail.com',
-    license='MIT',
+    long_description_content_type="text/rst",
+    url="https://github.com/charettes/django-testdata",
+    author="Simon Charette.",
+    author_email="charette.s+testdata@gmail.com",
+    license="MIT",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Web Environment',
-        'Framework :: Django',
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.1',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Topic :: Software Development :: Libraries :: Application Frameworks',
-        'Topic :: Software Development :: Libraries :: Python Modules',
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Web Environment",
+        "Framework :: Django",
+        "Framework :: Django :: 1.11",
+        "Framework :: Django :: 2.1",
+        "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.0",
+        "Framework :: Django :: 3.1",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Topic :: Software Development :: Libraries :: Application Frameworks",
+        "Topic :: Software Development :: Libraries :: Python Modules",
     ],
-    keywords=['django test testdata'],
-    packages=find_packages(exclude=['tests', 'tests.*']),
-    install_requires=['Django>=1.11'],
+    keywords=["django test testdata"],
+    packages=find_packages(exclude=["tests", "tests.*"]),
+    install_requires=["Django>=1.11"],
     extras_require={
-        'tests': ['tox'],
+        "tests": ["tox"],
     },
 )
diff --git a/tox.ini b/tox.ini
@@ -4,18 +4,21 @@ args_are_paths = false
 envlist =
     flake8,
     isort,
-    py{27,34}-1.11,
-    py35-{1.11,2.1,2.2},
-    py36-{1.11,2.1,2.2,3.0,master},
-    py37-{1.11,2.1,2.2,3.0,master}
+    py{27}-1.11
+    py35-{1.11,2.1,2.2}
+    py36-{1.11,2.1,2.2,3.0,3.1,master}
+    py37-{1.11,2.1,2.2,3.0,3.1,master}
+    py38-{2.2,3.0,3.1,master}
+    py39-{2.2,3.0,3.1,master}
 
 [testenv]
 basepython =
     py27: python2.7
-    py34: python3.4
     py35: python3.5
     py36: python3.6
     py37: python3.7
+    py38: python3.8
+    py39: python3.9
 usedevelop = true
 commands =
     {envpython} -R -Wonce {envbindir}/coverage run -m django test -v2 --settings=tests.settings {posargs}
@@ -25,7 +28,8 @@ deps =
     1.11: Django>=1.11,<2.0
     2.1: Django>=2.1,<2.2
     2.2: Django>=2.2,<3.0
-    3.0: Django>=3.0a1,<3.1
+    3.0: Django>=3.0,<3.1
+    3.1: Django>=3.1,<3.2
     master: https://github.com/django/django/archive/master.tar.gz
 
 [testenv:flake8]