From 62d2c9e39f8a4e2c43e27503bb52eb0376d51302 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Fri, 6 Dec 2024 09:20:22 -0600 Subject: [PATCH] Revert Python 3.12.7 to 3.11.8 This reverts commit cb75394b6e358978ea147952e619eb22cb8302d8, which is suspected to slowdown email processing. --- .circleci/config.yml | 9 ++++++++- .github/workflows/dependabot-glean-parser.yml | 2 +- .github/workflows/lint-pending-strings.yml | 2 +- Dockerfile | 2 +- README.md | 2 +- pyproject.toml | 4 ++-- runtime.txt | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69a1070f4d..8976f79e14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,7 +65,7 @@ executors: parameters: &python_parameters python_version: description: "python version tag" - default: "3.12.7" + default: "3.11.8" type: string variant: description: "image variant" @@ -679,6 +679,13 @@ workflows: update_dependency: "Django>=5.0,<5.1" filters: *default_filters + - python_job: + name: python 3.12 test + python_version: "3.12.7" + command: pytest + test_results_filename: pytest-python-3-12.xml + filters: *default_filters + - python_job: name: python 3.13 test python_version: "3.13" diff --git a/.github/workflows/dependabot-glean-parser.yml b/.github/workflows/dependabot-glean-parser.yml index d461f7ba1f..758535f373 100644 --- a/.github/workflows/dependabot-glean-parser.yml +++ b/.github/workflows/dependabot-glean-parser.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Python 3 uses: actions/setup-python@v5.3.0 with: - python-version: '3.12' + python-version: '3.11' cache: 'pip' - name: Install Python dependencies run: | diff --git a/.github/workflows/lint-pending-strings.yml b/.github/workflows/lint-pending-strings.yml index c161ab400f..9937d091a1 100644 --- a/.github/workflows/lint-pending-strings.yml +++ b/.github/workflows/lint-pending-strings.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Python 3 uses: actions/setup-python@v5.3.0 with: - python-version: '3.12' + python-version: '3.11' cache: 'pip' - name: Install Python dependencies run: | diff --git a/Dockerfile b/Dockerfile index 2ececebca5..b7b3af5c1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.7 +FROM python:3.11.10 ARG CIRCLE_BRANCH ARG CIRCLE_SHA1 diff --git a/README.md b/README.md index dbbf2cddd4..bb2792b7e3 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Please refer to our [coding standards](docs/coding-standards.md) for code styles ### Requirements -- python 3.12 (we recommend [venv](https://packaging.python.org/en/latest/guides/installing-using-pip-and-virtual-environments/)) +- python 3.11 (we recommend [venv](https://packaging.python.org/en/latest/guides/installing-using-pip-and-virtual-environments/)) - PostgreSQL - even if you are using sqlite for development, requirements.txt installs psycopg2 which [requires libpq](https://www.psycopg.org/docs/install.html#build-prerequisites) and Python header files. The following should work: diff --git a/pyproject.toml b/pyproject.toml index fb6284f28d..af4c2cc713 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -requires-python = ">= 3.12" +requires-python = ">= 3.11" [tool.coverage.report] omit = [ @@ -28,7 +28,7 @@ django_settings_module = "privaterelay.settings" exclude = "env" mypy_path = "$MYPY_CONFIG_FILE_DIR/mypy_stubs" plugins = ["mypy_django_plugin.main"] -python_version = "3.12" +python_version = "3.11" show_error_codes = true strict = true diff --git a/runtime.txt b/runtime.txt index 32905d6e0f..e345195560 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.12.7 +python-3.11.10