Update to latest Django version (#75)

* Move tox config into pyproject.toml

Skip the flake8 config, since that appears to be entirely unused.

* Update README

* Update to the latest version of server dependencies

* Update for changes to CheckConstraint API

The check parameter is now called condition

Author: jgraham

README.md

@@ -7,9 +7,9 @@
 WebCompatManager is a dashboard for analysing Brokemn Site Reporter
 reports and other web compatibility issues.
 
-# Local Development
+## Local Development
 
-The server part of WebCompatManager is a Django application, with a vuew frontend.
+The server part of WebCompatManager is a Django application, with a vue frontend.
 
 ### Frontend
 
@@ -57,6 +57,19 @@ $ uv run -p 3.12 --extra=server server/manage.py runserver
 
 Log in using the credentials created above.
 
+### Tests
+
+Lints are run with pre-commit. This can be installed as a Git hook, or run manually using:
+
+```
+uv run --extra=dev -p 3.12 pre-commit run --all
+```
+
+Tests are run using tox:
+```
+uv run --extra=dev -p 3.12 tox
+```
+
 ### Redis
 
 For some commands e.g, importing data, a [Redis](https://redis.io/)

pyproject.toml

@@ -35,23 +35,27 @@ dependencies = [
 dev = [
     "pre-commit",
     "tox",
-    "ruff==0.14.11"
+    "ruff==0.14.11",
+    "mypy==1.11.2",
+    "pytest",
+    "pytest-cov",
+    "pytest-mock",
 ]
 docker = [
     "gunicorn~=22.0.0",
     "mozilla-django-oidc~=4.0.1",
     "mysqlclient~=2.2.4",
 ]
 server = [
-    "celery~=5.3.5",
-    "crispy-bootstrap3",
-    "django~=4.2.7",
-    "django-crispy-forms~=2.1",
-    "django-enumfields~=2.1.1",
-    "djangorestframework~=3.15.1",
-    "google-cloud-bigquery",
-    "pyyaml",
-    "whitenoise~=6.6.0",
+    "celery==5.6.2",
+    "crispy-bootstrap3==2024.1",
+    "django==6.0.1",
+    "django-crispy-forms==2.5",
+    "django-enumfields==2.1.1",
+    "djangorestframework==3.16.1",
+    "google-cloud-bigquery==3.40.0",
+    "pyyaml==6.0.3",
+    "whitenoise==6.11.0",
 ]
 
 [project.urls]
@@ -136,3 +140,31 @@ where = ["src"]
 include = ["webcompat", "webcompat.schemas"]
 
 [tool.setuptools_scm]
+
+[tool.tox]
+envlist = ["312"]
+tox_pip_extensions_ext_venv_update = true
+skip_missing_interpreters = true
+
+[tool.tox.env_run_base]
+extras = ["dev", "server"]
+usedevelop = true
+passenv = ["TOXENV", "CI", "TRAVIS", "TRAVIS_*", "CODECOV_*", "TWINE_*"]
+install_command = ["python", "-m", "pip", "install", "-c", "{toxinidir}/requirements.txt", "{opts}", "{packages}"]
+commands = [["pytest", "-v", "--cov", "{toxinidir}", "--cov-report", "term-missing", "{posargs}"]]
+
+[tool.tox.env.codecov]
+skip_install = true
+deps = ["coverage[toml]"]
+commands = [["codecov"]]
+allowlist_externals = ["codecov"]
+
+[tool.tox.env.mypy]
+commands = [["mypy", "--install-types", "--non-interactive", "{posargs}"]]
+usedevelop = true
+
+[tool.tox.env.pypi]
+skip_install = true
+deps = ["twine", "build"]
+commands = [["python", "-m", "build"], ["twine", "upload", "--skip-existing", "dist/*"]]
+allowlist_externals = ["bash"]

requirements.txt

@@ -1,30 +1,25 @@
-#
-# This file is autogenerated by pip-compile with Python 3.9
-# by the following command:
-#
-#    pip-compile --extra=docker --extra=server --strip-extras
-#
+# This file was autogenerated by uv via the following command:
+#    uv export --extra=docker --extra=server --no-hashes --format requirements-txt
+-e .
 amqp==5.3.1
     # via kombu
-asgiref==3.8.1
+asgiref==3.11.0
     # via django
-attrs==24.2.0
+attrs==25.3.0
     # via
     #   jsonschema
     #   referencing
 billiard==4.2.1
     # via celery
-cachetools==5.5.0
-    # via google-auth
-celery==5.3.6
-    # via WebCompatManager (pyproject.toml)
-certifi==2024.8.30
+celery==5.6.2
+    # via webcompatmanager
+certifi==2025.1.31
     # via requests
-cffi==1.17.1
+cffi==1.17.1 ; platform_python_implementation != 'PyPy'
     # via cryptography
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
     # via requests
-click==8.1.7
+click==8.1.8
     # via
     #   celery
     #   click-didyoumean
@@ -36,86 +31,86 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
+colorama==0.4.6 ; sys_platform == 'win32'
+    # via click
 crispy-bootstrap3==2024.1
-    # via WebCompatManager (pyproject.toml)
-cryptography==44.0.0
+    # via webcompatmanager
+cryptography==44.0.2
     # via
     #   josepy
     #   mozilla-django-oidc
-    #   pyopenssl
-django==4.2.17
+django==6.0.1
     # via
-    #   WebCompatManager (pyproject.toml)
     #   crispy-bootstrap3
     #   django-crispy-forms
-    #   django-model-utils
     #   djangorestframework
-    #   jsonfield
     #   mozilla-django-oidc
-django-crispy-forms==2.3
+    #   webcompatmanager
+django-crispy-forms==2.5
     # via
-    #   WebCompatManager (pyproject.toml)
     #   crispy-bootstrap3
+    #   webcompatmanager
 django-enumfields==2.1.1
-    # via WebCompatManager (pyproject.toml)
-djangorestframework==3.15.2
-    # via WebCompatManager (pyproject.toml)
-google-api-core==2.23.0
+    # via webcompatmanager
+djangorestframework==3.16.1
+    # via webcompatmanager
+google-api-core==2.24.2
     # via
     #   google-cloud-bigquery
     #   google-cloud-core
-google-auth==2.36.0
+google-auth==2.47.0
     # via
     #   google-api-core
     #   google-cloud-bigquery
     #   google-cloud-core
-google-cloud-bigquery==3.27.0
-    # via WebCompatManager (pyproject.toml)
-google-cloud-core==2.4.1
+google-cloud-bigquery==3.40.0
+    # via webcompatmanager
+google-cloud-core==2.4.3
     # via google-cloud-bigquery
-google-crc32c==1.6.0
+google-crc32c==1.7.0
     # via google-resumable-media
 google-resumable-media==2.7.2
     # via google-cloud-bigquery
-googleapis-common-protos==1.66.0
+googleapis-common-protos==1.69.2
     # via
     #   google-api-core
     #   grpcio-status
-grpcio==1.68.1
+grpcio==1.71.0
     # via
     #   google-api-core
     #   grpcio-status
-grpcio-status==1.68.1
+grpcio-status==1.71.0
     # via google-api-core
 gunicorn==22.0.0
-    # via WebCompatManager (pyproject.toml)
+    # via webcompatmanager
 idna==3.10
     # via requests
-josepy==1.14.0
+josepy==2.0.0
     # via mozilla-django-oidc
 jsonpath-ng==1.7.0
-    # via WebCompatManager (pyproject.toml)
+    # via webcompatmanager
 jsonschema==4.23.0
-    # via WebCompatManager (pyproject.toml)
+    # via webcompatmanager
 jsonschema-specifications==2024.10.1
     # via jsonschema
-kombu==5.4.2
+kombu==5.6.2
     # via celery
 mozilla-django-oidc==4.0.1
-    # via WebCompatManager (pyproject.toml)
-mysqlclient==2.2.6
-    # via WebCompatManager (pyproject.toml)
-packaging==24.2
+    # via webcompatmanager
+mysqlclient==2.2.7
+    # via webcompatmanager
+packaging==25.0
     # via
     #   google-cloud-bigquery
     #   gunicorn
+    #   kombu
 ply==3.11
     # via jsonpath-ng
-prompt-toolkit==3.0.48
+prompt-toolkit==3.0.50
     # via click-repl
-proto-plus==1.25.0
+proto-plus==1.26.1
     # via google-api-core
-protobuf==5.29.1
+protobuf==5.29.4
     # via
     #   google-api-core
     #   googleapis-common-protos
@@ -127,18 +122,16 @@ pyasn1==0.6.1
     #   rsa
 pyasn1-modules==0.4.1
     # via google-auth
-pycparser==2.22
+pycparser==2.22 ; platform_python_implementation != 'PyPy'
     # via cffi
-pyopenssl==24.3.0
-    # via josepy
 python-dateutil==2.9.0.post0
     # via
-    #   WebCompatManager (pyproject.toml)
     #   celery
     #   google-cloud-bigquery
-pyyaml==6.0.2
-    # via WebCompatManager (pyproject.toml)
-referencing==0.35.1
+    #   webcompatmanager
+pyyaml==6.0.3
+    # via webcompatmanager
+referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -147,25 +140,28 @@ requests==2.32.3
     #   google-api-core
     #   google-cloud-bigquery
     #   mozilla-django-oidc
-rpds-py==0.22.3
+rpds-py==0.23.1
     # via
     #   jsonschema
     #   referencing
 rsa==4.9
     # via google-auth
+setuptools==80.9.0
+    # via webcompatmanager
 six==1.17.0
     # via python-dateutil
-sqlparse==0.5.2
+sqlparse==0.5.3
     # via django
-typing-extensions==4.12.2
-    # via
-    #   asgiref
-    #   kombu
-tzdata==2024.2
+typing-extensions==4.15.0
+    # via referencing
+tzdata==2025.3
     # via
-    #   celery
+    #   django
     #   kombu
-urllib3==2.6.3
+    #   tzlocal
+tzlocal==5.3.1
+    # via celery
+urllib3==2.3.0
     # via requests
 vine==5.1.0
     # via
@@ -174,5 +170,5 @@ vine==5.1.0
     #   kombu
 wcwidth==0.2.13
     # via prompt-toolkit
-whitenoise==6.6.0
-    # via WebCompatManager (pyproject.toml)
+whitenoise==6.11.0
+    # via webcompatmanager

server/reportmanager/migrations/0001_initial.py

@@ -341,7 +341,7 @@ class Migration(migrations.Migration):
         migrations.AddConstraint(
             model_name="bucketcolor",
             constraint=models.CheckConstraint(
-                check=models.Q(("value__gte", 0), ("value__lte", 16777215)),
+                condition=models.Q(("value__gte", 0), ("value__lte", 16777215)),
                 name="value_range",
             ),
         ),
@@ -372,7 +372,7 @@ class Migration(migrations.Migration):
         migrations.AddConstraint(
             model_name="bucket",
             constraint=models.CheckConstraint(
-                check=models.Q(("priority__gte", -2), ("priority__lte", 2)),
+                condition=models.Q(("priority__gte", -2), ("priority__lte", 2)),
                 name="priority_range",
             ),
         ),

server/reportmanager/models.py

@@ -74,7 +74,7 @@ class Bucket(models.Model):
     class Meta:
         constraints = (
             models.CheckConstraint(
-                check=models.Q(priority__gte=-2) & models.Q(priority__lte=2),
+                condition=models.Q(priority__gte=-2) & models.Q(priority__lte=2),
                 name="priority_range",
             ),
         )
@@ -303,7 +303,7 @@ class BucketColor(models.Model):
     class Meta:
         constraints = (
             models.CheckConstraint(
-                check=models.Q(value__gte=0) & models.Q(value__lte=0xFFFFFF),
+                condition=models.Q(value__gte=0) & models.Q(value__lte=0xFFFFFF),
                 name="value_range",
             ),
         )