[pull] main from creativecommons:main

.github/workflows/check-python-versions.yml

@@ -0,0 +1,19 @@
+name: Check Python versions
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  job:
+    runs-on: ubuntu-latest
+
+    steps:
+
+    # https://github.com/actions/checkout
+    - name: Checkout cc-legal-tools-app
+      uses: actions/checkout@v4
+
+    - name: Run script to check Python versions
+      run: ./dev/check_python_versions.sh

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

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      DJANGO_SETTINGS_MODULE: cc_legal_tools.settings.ephemeral
+      DJANGO_SETTINGS_MODULE: cc_legal_tools.settings.dev
       PYTHONDONTWRITEBYTECODE: 1
       PYTHONFAULTHANDLER: 1
 
@@ -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: |

.gitignore

@@ -2,6 +2,12 @@
 # between them and this file:
 # - https://github.com/github/gitignore/blob/master/Python.gitignore
 
+# OS generated files
+.DS_Store
+.DS_Store?
+.Spotlight-V100
+.Trashes
+
 # Byte-compiled / optimized / DLL files
 *$py.class
 *.py[cod]
@@ -13,6 +19,7 @@ build/
 
 # Unit test / coverage reports
 .coverage*
+htmlcov
 
 # Django development
 */settings/local.py

.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,21 +1,21 @@
 # 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
 
 # Python: disable bytecode (.pyc) files
-# https://docs.python.org/3.9/using/cmdline.html
+# https://docs.python.org/3.11/using/cmdline.html
 ENV PYTHONDONTWRITEBYTECODE=1
 
 # Python: force the stdout and stderr streams to be unbuffered
-# https://docs.python.org/3.9/using/cmdline.html
+# https://docs.python.org/3.11/using/cmdline.html
 ENV PYTHONUNBUFFERED=1
 
 # Python: enable faulthandler to dump Python traceback on catastrophic cases
-# https://docs.python.org/3.9/library/faulthandler.html
+# https://docs.python.org/3.11/library/faulthandler.html
 ENV PYTHONFAULTHANDLER=1
 
 WORKDIR /root
@@ -26,38 +26,38 @@ RUN apt-config dump \
     | sed -e's/1/0/' \
     | tee /etc/apt/apt.conf.d/99no-recommends-no-suggests
 
-# Resynchronize the package index
-RUN apt-get update
-
-# Install apt packages missing from slim docker image
-RUN apt-get install -y git ssh
-
-# Install apt package dependencies for App
-RUN apt-get install -y gcc gettext sqlite3
+# Resynchronize the package index and install packages
+# https://docs.docker.com/build/building/best-practices/#apt-get
+RUN apt-get update && apt-get install -y \
+        gcc \
+        gettext \
+        git \
+        sqlite3 \
+        ssh \
+    && rm -rf /var/lib/apt/lists/*
 
 ## Install pipenv
-RUN pip install --upgrade pip
-RUN pip install --upgrade setuptools
-RUN pip install --upgrade pipenv
+RUN pip install --upgrade \
+    pip \
+    pipenv \
+    setuptools
 
 # Install python dependencies
-COPY Pipfile .
-COPY Pipfile.lock .
+COPY Pipfile Pipfile.lock .
 RUN pipenv sync --dev --system
 
 # Create and switch to a new "cc" user
 RUN useradd --create-home cc
 WORKDIR /home/cc
 USER cc:cc
-RUN mkdir .ssh
-RUN chmod 0700 .ssh
+RUN mkdir .ssh && chmod 0700 .ssh
 
 # Configure git for tests
-RUN git config --global user.email 'app@docker-container'
-RUN git config --global user.name 'App DockerContainer'
-RUN git config --global --add safe.directory '*'
+RUN git config --global user.email 'app@docker-container' \
+    && git config --global user.name 'App DockerContainer' \
+    && git config --global --add safe.directory '*'
 
 ## Prepare for running app
-RUN mkdir cc-legal-tools-app
-RUN mkdir cc-legal-tools-data
+RUN mkdir cc-legal-tools-app \
+    && mkdir cc-legal-tools-data
 WORKDIR /home/cc/cc-legal-tools-app

Pipfile

@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 Babel = "*"
-Django = ">=3.2.25,<3.3"
+Django = ">=4.2.17,<4.3"
 GitPython = ">=3.1.41"
 PyYAML = "*"
 beautifulsoup4 = "*"
@@ -18,25 +18,25 @@ polib = "*"
 python-dateutil = "*"
 rdflib = "*"
 transifex-python = "*"
-urllib3 = ">=2.0.7"  # Ensure dependency is secure
+urllib3 = ">=2.2.2"  # Ensure dependency is secure
 whitenoise = "*"
 
 [dev-packages]
 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"