orf · Jul 23, 2019 · Jul 23, 2019 · Jul 24, 2019 · Aug 15, 2019 · Aug 16, 2019
diff --git a/.azure.yml b/.azure.yml
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,3 @@
 .git/
-.dockerignore/
-django
+.dockerignore
+output/
diff --git a/.editorconfig b/.editorconfig
@@ -1,12 +1,12 @@
 root = true
 
 [*]
-indent_style = space
+charset = utf-8
+end_of_line = lf
 indent_size = 4
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-end_of_line = lf
-charset = utf-8
 
-[*.yml]
+[*.{yaml,yml}]
 indent_size = 2
diff --git a/.env b/.env
@@ -1,6 +1,7 @@
-PYTHON_VERSION=3.6
-POSTGRES_VERSION=9.6
-POSTGIS_VERSION=2.5
-MYSQL_VERSION=8
-MARIADB_VERSION=10.3
-PIP_CACHE_VOLUME=pip-cache
+PYTHON_IMPLEMENTATION=python
+PYTHON_VERSION=3.12
+MARIADB_VERSION=10.6
+MYSQL_VERSION=8.0
+ORACLE_VERSION=23.5.0.0
+POSTGRESQL_VERSION=14
+POSTGIS_VERSION=3.1
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,40 @@
+---
+name: Lint
+
+on:  # yamllint disable-line rule:truthy
+  pull_request:
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  COLUMNS: '120'
+  FORCE_COLOR: '1'
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    name: pre-commit
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+          cache: pip
+      - name: Install packages
+        run: python -m pip install --upgrade pip pre-commit
+      - name: Run linting tools
+        run: pre-commit run --all-files
+        env:
+          PRE_COMMIT_COLOR: always
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
+__pycache__/
 .idea/
-oracle/*.zip
+.mypy_cache/
+.ruff_cache/
diff --git a/.hadolint.yml b/.hadolint.yml
@@ -0,0 +1,5 @@
+---
+ignored:
+  - DL3013  # Don't complain when upgrading to latest version of pip
+  - DL3022  # Due to use of additional_contexts in compose.yaml
+  - DL3042  # Caching is desired with RUN --mount=type=cache
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,53 @@
+---
+ci:
+  autoupdate_schedule: weekly
+repos:
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-builtin-literals
+      - id: check-case-conflict
+      - id: check-docstring-first
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: check-shebang-scripts-are-executable
+      # - id: check-toml
+      - id: check-vcs-permalinks
+      - id: check-yaml
+      - id: debug-statements
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: file-contents-sorter
+        args: [--unique]
+        files: ^(?:packages|requirements)\.txt$
+      - id: fix-byte-order-marker
+      - id: fix-encoding-pragma
+        args: [--remove]
+      - id: requirements-txt-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.2
+    hooks:
+      - id: ruff
+        args: [--exit-non-zero-on-fix, --fix]
+      - id: ruff-format
+        args: [--check]
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.35.1
+    hooks:
+      - id: yamllint
+        args: [--strict]
+  - repo: https://github.com/hadolint/hadolint
+    rev: v2.12.0
+    hooks:
+      - id: hadolint-docker
+        name: hadolint
+  - repo: https://github.com/woodruffw/zizmor-pre-commit
+    rev: v0.9.2
+    hooks:
+      - id: zizmor
diff --git a/.travis.yml b/.travis.yml
diff --git a/Containerfile b/Containerfile
@@ -0,0 +1,66 @@
+# syntax=docker/dockerfile:1.12
+
+ARG PYTHON_IMPLEMENTATION=python
+ARG PYTHON_VERSION=3.12
+FROM ${PYTHON_IMPLEMENTATION}:${PYTHON_VERSION}-slim-bookworm
+
+LABEL org.opencontainers.image.authors="Django Software Foundation"
+LABEL org.opencontainers.image.url="https://github.com/django/django-docker-box"
+LABEL org.opencontainers.image.documentation="https://github.com/django/django-docker-box"
+LABEL org.opencontainers.image.source="https://github.com/django/django-docker-box"
+LABEL org.opencontainers.image.vendor="Django Software Foundation"
+LABEL org.opencontainers.image.licenses="BSD-3-Clause"
+LABEL org.opencontainers.image.title="Django Docker Box"
+LABEL org.opencontainers.image.description="Container image for developing and testing Django."
+
+SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-o", "xtrace", "-c"]
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PYTHONUNBUFFERED=1
+
+# Force colored output for various tooling in CI.
+ENV COLUMNS=120
+ENV FORCE_COLOR=1
+ENV TERM="xterm-256color"
+
+# Create user and prepare directories.
+RUN <<EOF
+    useradd --home-dir=/django --no-create-home --no-log-init django
+    mkdir --parents /django/{.cache,output,source}
+    chown --recursive django:django /django
+EOF
+
+# Install system dependencies from package manager.
+COPY --chown=django:django packages.txt /django/
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked <<EOF
+    rm --force /etc/apt/apt.conf.d/docker-clean
+    echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
+    apt-get update --quiet --yes
+    xargs --arg-file=/django/packages.txt apt-get install --no-install-recommends --yes
+EOF
+
+# Install all Python requirements in a single command.
+COPY --chown=django:django requirements.txt /django/requirements/extra.txt
+COPY --chown=django:django --from=src tests/requirements/ /django/requirements/
+COPY --chown=django:django --from=src docs/requirements.txt /django/requirements/docs.txt
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/
+RUN --mount=type=cache,target=/root/.cache/uv <<EOF
+    cat /django/requirements/*.txt \
+        | grep --invert-match '^#' \
+        | sort --unique --version-sort \
+        | tee /django/requirements.txt
+    uv pip install --requirement=/django/requirements.txt --system
+EOF
+
+COPY --chown=django:django entrypoint.bash /django/
+
+SHELL ["/bin/bash", "-c"]
+
+ENV DJANGO_SETTINGS_MODULE=settings
+ENV PYTHONPATH="${PYTHONPATH}:/django/source/"
+USER django:django
+VOLUME /django/output
+VOLUME /django/source
+WORKDIR /django/source/tests
+ENTRYPOINT ["/django/entrypoint.bash"]
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile-postgis b/Dockerfile-postgis