Nit fixes, cleanup old versions (#80)

* Add Django 4.2 classifier
* Update docs copyright
* Use default language 'en'
* Cleanup commands
* Ignore Redis dump file
* Remove 3.11 from Django 3.2
* Remove Django-specific options from pytest.ini
* Calculate copyright year range
* Switch to .readthedocs.yaml

Author: jwhitlock

.gitignore

@@ -10,3 +10,5 @@ build
 dist
 *.pyc
 .pytest_cache/
+# dump.rdb is created by redis-server, needed to run tests
+dump.rdb

.readthedocs.yaml

@@ -0,0 +1,15 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+formats: all
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+sphinx:
+  configuration: docs/conf.py
+python:
+  install:
+  - requirements: docs/requirements.txt

MANIFEST.in

@@ -1,6 +1,6 @@
 recursive-include docs *
 recursive-include tests *
-include pytest.ini AUTHORS.rst CODE_OF_CONDUCT.md pyproject.toml LICENSE README.rst tox.ini .coveragerc .isort.cfg
+include pytest.ini AUTHORS.rst CODE_OF_CONDUCT.md pyproject.toml LICENSE README.rst tox.ini .coveragerc .isort.cfg .readthedocs.yaml
 prune docs/_build
 global-exclude *.pyc
 prune __pycache__

docs/conf.py

@@ -16,6 +16,7 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
+from datetime import date
 import os
 import sys
 
@@ -60,7 +61,7 @@
 
 # General information about the project.
 project = "python-dockerflow"
-copyright = "2016, Mozilla Foundation"
+copyright = f"2016 - {date.today().year}, Mozilla Foundation"
 author = "Mozilla Foundation"
 
 # The version info for the project you're documenting, acts as replacement for
@@ -77,7 +78,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

pytest.ini

@@ -1,6 +1,4 @@
 [pytest]
-DJANGO_SETTINGS_MODULE = tests.django.settings
 norecursedirs = .git .*
 addopts = -rsxX --showlocals --tb=native --cov=dockerflow --cov-report xml --cov-report term --cov-report html --cov-append
-django_find_project = false
 python_paths = .

setup.py

@@ -30,6 +30,7 @@ def read(*parts):
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.0",
         "Framework :: Django :: 4.1",
+        "Framework :: Django :: 4.2",
         "Framework :: Flask",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",

tox.ini

@@ -3,8 +3,8 @@ usedevelop = True
 minversion = 1.8
 envlist =
     py38-lint
-    py38-docs
-    py{37,38,39,310,311}-dj32
+    py311-docs
+    py{37,38,39,310}-dj32
     py{38,39,310,311}-dj{40,41,42}
     py{37,38,39,310,311}-fl{20,21,22}
     py{37,38,39,310,311}-s{21,22}
@@ -39,12 +39,12 @@ deps =
     s22: -ctests/constraints/sanic-22.txt
 commands =
     python --version
-    dj{32,40,41,42}: pytest tests/core/ tests/django --nomigrations {posargs:}
-    fl{012,10,11,20,21,22}: pytest tests/core/ tests/flask/ {posargs:}
-    s{20,21,22}: pytest tests/core/ tests/sanic/ {posargs:}
+    dj{32,40,41,42}: pytest tests/core/ tests/django --no-migrations -o DJANGO_SETTINGS_MODULE=tests.django.settings -o django_find_project=false {posargs:}
+    fl{20,21,22}: pytest tests/core/ tests/flask/ {posargs:}
+    s{21,22}: pytest tests/core/ tests/sanic/ {posargs:}
 
-[testenv:py38-docs]
-basepython = python3.8
+[testenv:py311-docs]
+basepython = python3.11
 deps = -rdocs/requirements.txt
 commands = sphinx-build -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
 pip_pre = false