Merge c767a62 into 1f15e5d

.travis.yml

@@ -1,9 +1,6 @@
 language: python
-# see https://github.com/travis-ci/travis-ci/issues/9069#issuecomment-425720905
-dist: xenial
 sudo: required
 python:
-  - '3.4'
   - '3.5'
   - '3.6'
   - '3.7'
@@ -13,33 +10,34 @@ install:
   - pip install django=="$DJANGO"
   - pip install --upgrade -r test-requirements.txt
   # These are not supported on all Python versions, so we allow the installation
-  # to fail. Linting and static analysis only happens on the Python 3.7 builds.
+  # to fail. Linting and static analysis only happens on the Python 3.8 builds.
   - pip install --upgrade -r lint-requirements.txt || true
 env:
   - DJANGO=1.11
   - DJANGO=2.1
   - DJANGO=2.2
+  - DJANGO=3.0
 before_script:
   # see https://github.com/travis-ci/travis-ci/issues/7940
   - sudo rm -f /etc/boto.cfg
 script:
-  - 'if [[ $(python --version) == "Python 3.7."* ]]; then flake8; fi'
-  - 'if [[ $(python --version) == "Python 3.7."* ]]; then black --check .; fi'
-  - 'if [[ $(python --version) == "Python 3.7."* ]]; then sorti --check .; fi'
-  - 'if [[ $(python --version) == "Python 3.7."* && "$DJANGO" != "1.11" ]]; then pip install . && mypy .; fi'
+  - 'if [[ $(python --version) == "Python 3.8."* ]]; then flake8; fi'
+  - 'if [[ $(python --version) == "Python 3.8."* ]]; then black --check .; fi'
+  - 'if [[ $(python --version) == "Python 3.8."* ]]; then sorti --check .; fi'
+  - 'if [[ $(python --version) == "Python 3.8."* && "$DJANGO" != "1.11" ]]; then pip install . && mypy .; fi'
   - 'if [[ $TRAVIS_REPO_SLUG != "antonagestam/collectfast" ]]; then export SKIP_LIVE_TESTS=true; fi'
   - coverage run --source collectfast -m pytest
 after_script:
   - coveralls
 matrix:
   exclude:
-    - env: DJANGO=2.1
-      python: '3.4'
-    - env: DJANGO=2.2
-      python: '3.4'
+    - env: DJANGO=3.0
+      python: '3.5'
     - env: DJANGO=1.11
       python: '3.8'
     - env: DJANGO=2.1
       python: '3.8'
+    - env: DJANGO=2.2
+      python: '3.8'
 notifications:
   email: false

setup.py

@@ -27,11 +27,11 @@
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
         "Framework :: Django",
     ],
 )