Add Python 3.9 to test suite

.gitlab-ci.yml

@@ -5,7 +5,6 @@ variables:
   POSTGRES_HOST_AUTH_METHOD: 'trust'
 
 stages:
-  - lint
   - test
 
 services:
@@ -17,30 +16,22 @@ cache:
   paths:
     - $HOME/.cache/pip
 
-test_python36:
+test:
   stage: test
-  image: python:3.6
+  image: $IMAGE
   script:
     - pip install tox
-    - tox -e 'py36-django{111,220,300}-drf{310}'
+    - tox -e $TOX_ENVS
+  parallel:
+    matrix:
+      - IMAGE: python:3.7
+        TOX_ENVS: py37-django{220,300,310}-drf{310,311,312}
 
-test_python37:
-  stage: test
-  image: python:3.7
-  script:
-    - pip install tox
-    - tox -e 'py37-django{220,300}-drf{310}'
+      - IMAGE: python:3.8
+        TOX_ENVS: py38-django{220,300,310}-drf{310,311,312}
 
-test_python38:
-  stage: test
-  image: python:3.8
-  script:
-    - pip install tox
-    - tox -e 'py38-django{220,300}-drf{310}'
+      - IMAGE: python:3.9
+        TOX_ENVS: py39-django{220,300,310}-drf{310,311,312}
 
-test_pypy3:
-  stage: test
-  image: pypy:3
-  script:
-    - pip install tox
-    - tox -e 'pypy3-django{111,220,300}-drf{310}'
+      - IMAGE: pypy:3
+        TOX_ENVS: pypy3-django{220,300,310}-drf{310,311,312}

setup.py

@@ -12,7 +12,7 @@ from versiontag import get_version, cache_git_tag  # NOQA
 packages = find_packages('src')
 
 install_requires = [
-    'Django>=1.11',
+    'Django>=2.2',
     'djangorestframework>=3.10',
     'lru-dict>=1.1.6',
 ]
@@ -59,17 +59,12 @@ setup(
         'Environment :: Console',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: ISC License (ISCL)',
         'Operating System :: Unix',
         'Operating System :: MacOS :: MacOS X',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
     ],
     author='Craig Weber',
     author_email='crgwbr@gmail.com',

tox.ini

 [tox]
 toxworkdir={env:TOX_WORK_DIR:.tox}
-envlist = py{py3,35,36,37,38}-django{111,220,300}-drf{310}
+envlist = py{py3,37,38,39}-django{220,300,310}-drf{310,311,312}
 
 [testenv]
 extras = development,kafka,kinesis,msgpack
 deps =
-    django111: django>=1.11,<1.12
     django220: django>=2.2,<2.3
     django300: django>=3.0,<3.1
+    django310: django>=3.1,<3.2
     drf310: djangorestframework>=3.10,<3.11
+    drf311: djangorestframework>=3.11,<3.12
+    drf312: djangorestframework>=3.12,<3.13
 commands =
     flake8 src sandbox setup.py
     {envpython} {toxinidir}/sandbox/manage.py test logpipe.tests.unit