Merge pull request #435 from creativecommons/python-3-11-and-django-4-2

upgrade to Python 3.11 and Django 4.2

.github/workflows/django-app-coverage.yml

@@ -25,10 +25,10 @@ jobs:
         git config --global user.name "Testing User"
 
     # https://github.com/actions/setup-python
-    - name: Install Python 3.10
+    - name: Install Python 3.11
       uses: actions/setup-python@v5
       with:
-        python-version: "3.10"
+        python-version: "3.11"
 
     - name: Install pipenv
       run: |
@@ -49,31 +49,25 @@ jobs:
         path: cc-legal-tools-data
 
     - name: Install Python dependencies
-      run: |
-        pipenv sync --dev --system
+      run: pipenv sync --dev --system
       working-directory: ./cc-legal-tools-app
 
     - name: Check for missing Django migrations
-      run: |
-        ./manage.py makemigrations --check
+      run: ./manage.py makemigrations --check
       working-directory: ./cc-legal-tools-app
 
     - name: Update Django database schema
-      run: |
-        ./manage.py migrate
+      run: ./manage.py migrate
       working-directory: ./cc-legal-tools-app
 
     - name: Coverage Test
-      run: |
-        coverage run manage.py test --noinput --parallel 4
+      run: coverage run manage.py test --noinput --parallel 4
       working-directory: ./cc-legal-tools-app
 
     - name: Coverage Combine
-      run: |
-        coverage combine
+      run: coverage combine
       working-directory: ./cc-legal-tools-app
 
     - name: Coverage Report
-      run: |
-        coverage report
+      run: coverage report
       working-directory: ./cc-legal-tools-app

.github/workflows/static-analysis.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
 
     # https://github.com/actions/setup-python
-    - name: Install Python 3.10
+    - name: Install Python 3.11
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install pipenv
       run: |

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 exclude: \\.coverage.*
 default_language_version:
-  python: python3.10
+  python: python3.11
 
 repos:
 

Dockerfile

@@ -1,7 +1,7 @@
 # https://docs.docker.com/engine/reference/builder/
 
 # https://hub.docker.com/_/python/
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 # Configure apt not to prompt during docker build
 ARG DEBIAN_FRONTEND=noninteractive

Pipfile

@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 Babel = "*"
-Django = ">=3.2.25,<3.3"
+Django = ">=4.2.11,<4.3"
 GitPython = ">=3.1.41"
 PyYAML = "*"
 beautifulsoup4 = "*"
@@ -26,17 +26,17 @@ black = ">=24.3.0"  # Sync version with [static-analysis], below
 coverage = "*"
 django-debug-toolbar = "*"
 factory-boy = "*"
-flake8 = "*"  # Sync version with [static-analysis], below
-isort = "*"  # Sync version with [static-analysis], below
-pre-commit = "*"  # Sync version with [static-analysis], below
+flake8 = "*"        # Sync version with [static-analysis], below
+isort = "*"         # Sync version with [static-analysis], below
+pre-commit = "*"    # Sync version with [static-analysis], below
 tblib = "*"  # Dependency of coverage (with --parallel)
 
 [static-analysis]
 # Also see: .github/workflows/static-analysis.yml
 black = ">=24.3.0"  # Sync version with [dev-packages], above
-flake8 = "*"  # Sync version with [dev-packages], above
-isort = "*"  # Sync version with [dev-packages], above
-pre-commit = "*"  # Sync version with [dev-packages], above
+flake8 = "*"        # Sync version with [dev-packages], above
+isort = "*"         # Sync version with [dev-packages], above
+pre-commit = "*"    # Sync version with [dev-packages], above
 
 [requires]
-python_version = "3.10"
+python_version = "3.11"

README.md

@@ -40,20 +40,20 @@ site (served as static files).
 
 ## Software Versions
 
-- [Python 3.10][python310] specified in:
+- [Python 3.11][python311] specified in:
   - [`.github/workflows/django-app-coverage.yml`][django-app-coverage]
   - [`.github/workflows/static-analysis.yml`][static-analysis]
   - [`.pre-commit-config.yaml`](.pre-commit-config.yaml)
   - [`Dockerfile`](Dockerfile)
   - [`Pipfile`](Pipfile)
   - [`pyproject.toml`](pyproject.toml)
-- [Django 3.2 (LTS)][django32]
+- [Django 4.2 (LTS)][django42]
   - [`Pipfile`](Pipfile)
 
 [django-app-coverage]: .github/workflows/django-app-coverage.yml
 [static-analysis]: .github/workflows/static-analysis.yml
-[python310]: https://docs.python.org/3.10/
-[django32]: https://docs.djangoproject.com/en/3.2/
+[python310]: https://docs.python.org/3.11/
+[django42]: https://docs.djangoproject.com/en/4.2/
 
 
 ## Setting up the Project

legal_tools/urls.py

@@ -30,7 +30,7 @@
 # See Converter functions, below, for a description of the following regex:
 RE_CATEGORY = r"licenses|publicdomain"
 RE_JURISDICTION = r"[a-z]{2}|igo|scotland"
-RE_UNIT = r"(?i)[-a-z0-9+]+"
+RE_UNIT = r"[-a-z0-9+]+"
 RE_VERSION = r"[0-9]+[.][0-9]+"
 
 

pyproject.toml

@@ -9,7 +9,7 @@ force-exclude = '''
 )
 '''
 line-length = 79
-target-version = ['py310', 'py311']
+target-version = ['py311', 'py312']
 
 
 [tool.coverage.run]