From 68ceda6db5a3c8393b908e173bcd6c9150bd2379 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 25 Jun 2025 13:38:29 -0700 Subject: [PATCH] revert python upgrade again --- .github/actions/setup-project/action.yml | 4 +-- README.md | 16 ++++----- poetry.lock | 41 +++++++++++++----------- pyproject.toml | 2 +- runtime.txt | 2 +- 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.github/actions/setup-project/action.yml b/.github/actions/setup-project/action.yml index ad207f112..6a7d508a0 100644 --- a/.github/actions/setup-project/action.yml +++ b/.github/actions/setup-project/action.yml @@ -9,10 +9,10 @@ runs: sudo apt-get update \ && sudo apt-get install -y --no-install-recommends \ libcurl4-openssl-dev - - name: Set up Python 3.13.2 + - name: Set up Python 3.12.2 uses: actions/setup-python@v4 with: - python-version: "3.13.2" + python-version: "3.12.2" - name: Install poetry shell: bash run: pip install poetry==2.1.3 diff --git a/README.md b/README.md index 35cea487f..c8a2e44c5 100644 --- a/README.md +++ b/README.md @@ -186,12 +186,12 @@ session to make the changes take effect. Now we're ready to install the Python version we need with `pyenv`, like so: ```sh -pyenv install 3.13 +pyenv install 3.12 ``` -This will install the latest version of Python 3.13. +This will install the latest version of Python 3.12. -_NOTE: This project currently runs on Python 3.13.x._ +_NOTE: This project currently runs on Python 3.12.x._ #### [API Step] Python Dependency Installation @@ -243,12 +243,12 @@ git clone git@github.com:GSA/notifications-admin.git Now go into the project directory (`notifications-admin` by default), create a virtual environment, and set the local Python version to point to the virtual -environment (assumes version Python `3.13.2` is what is installed on your +environment (assumes version Python `3.12.2` is what is installed on your machine): ```sh cd notifications-admin -pyenv virtualenv 3.13.2 notify-admin +pyenv virtualenv 3.12.2 notify-admin pyenv local notify-admin ``` @@ -281,10 +281,10 @@ If you're upgrading an existing project to a newer version of Python, you can follow these steps to get yourself up-to-date. First, use `pyenv` to install the newer version of Python you'd like to use; -we'll use `3.13` in our example here since we recently upgraded to this version: +we'll use `3.12` in our example here since we recently upgraded to this version: ```sh -pyenv install 3.13 +pyenv install 3.12 ``` Next, delete the virtual environment you previously had set up. If you followed @@ -299,7 +299,7 @@ environment with the newer version of Python you just installed: ```sh cd notifications-admin -pyenv virtualenv 3.13.2 notify-admin +pyenv virtualenv 3.12.2 notify-admin pyenv local notify-admin ``` diff --git a/poetry.lock b/poetry.lock index d54a235ac..4152e85c4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand. [[package]] name = "ago" @@ -27,6 +27,7 @@ files = [ [package.dependencies] idna = ">=2.8" sniffio = ">=1.1" +typing_extensions = {version = ">=4.5", markers = "python_version < \"3.13\""} [package.extras] doc = ["Sphinx (>=8.2,<9.0)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx_rtd_theme"] @@ -948,6 +949,9 @@ files = [ {file = "exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88"}, ] +[package.dependencies] +typing-extensions = {version = ">=4.6.0", markers = "python_version < \"3.13\""} + [package.extras] test = ["pytest (>=6)"] @@ -1509,18 +1513,18 @@ test = ["portend", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-c [[package]] name = "jaraco-functools" -version = "4.2.1" +version = "4.1.0" description = "Functools like those found in stdlib" optional = false -python-versions = ">=3.9" +python-versions = ">=3.8" groups = ["dev"] files = [ - {file = "jaraco_functools-4.2.1-py3-none-any.whl", hash = "sha256:590486285803805f4b1f99c60ca9e94ed348d4added84b74c7a12885561e524e"}, - {file = "jaraco_functools-4.2.1.tar.gz", hash = "sha256:be634abfccabce56fa3053f8c7ebe37b682683a4ee7793670ced17bab0087353"}, + {file = "jaraco.functools-4.1.0-py3-none-any.whl", hash = "sha256:ad159f13428bc4acbf5541ad6dec511f91573b90fba04df61dafa2a1231cf649"}, + {file = "jaraco_functools-4.1.0.tar.gz", hash = "sha256:70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d"}, ] [package.dependencies] -more_itertools = "*" +more-itertools = "*" [package.extras] check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\""] @@ -1630,21 +1634,22 @@ type = ["pygobject-stubs", "pytest-mypy", "shtab", "types-pywin32"] [[package]] name = "license-expression" -version = "30.4.3" +version = "30.4.1" description = "license-expression is a comprehensive utility library to parse, compare, simplify and normalize license expressions (such as SPDX license expressions) using boolean logic." optional = false python-versions = ">=3.9" groups = ["dev"] files = [ - {file = "license_expression-30.4.3-py3-none-any.whl", hash = "sha256:fd3db53418133e0eef917606623bc125fbad3d1225ba8d23950999ee87c99280"}, - {file = "license_expression-30.4.3.tar.gz", hash = "sha256:49f439fea91c4d1a642f9f2902b58db1d42396c5e331045f41ce50df9b40b1f2"}, + {file = "license_expression-30.4.1-py3-none-any.whl", hash = "sha256:679646bc3261a17690494a3e1cada446e5ee342dbd87dcfa4a0c24cc5dce13ee"}, + {file = "license_expression-30.4.1.tar.gz", hash = "sha256:9f02105f9e0fcecba6a85dfbbed7d94ea1c3a70cf23ddbfb5adf3438a6f6fce0"}, ] [package.dependencies] "boolean.py" = ">=4.0" [package.extras] -dev = ["Sphinx (>=5.0.2)", "doc8 (>=0.11.2)", "pytest (>=7.0.1)", "pytest-xdist (>=2)", "ruff", "sphinx-autobuild", "sphinx-copybutton", "sphinx-reredirects (>=0.1.2)", "sphinx-rtd-dark-mode (>=1.3.0)", "sphinx-rtd-theme (>=1.0.0)", "sphinxcontrib-apidoc (>=0.4.0)", "twine"] +docs = ["Sphinx (>=5.0.2)", "doc8 (>=0.11.2)", "sphinx-autobuild", "sphinx-copybutton", "sphinx-reredirects (>=0.1.2)", "sphinx-rtd-dark-mode (>=1.3.0)", "sphinx-rtd-theme (>=1.0.0)", "sphinxcontrib-apidoc (>=0.4.0)"] +testing = ["black", "isort", "pytest (>=6,!=7.0.0)", "pytest-xdist (>=2)", "twine"] [[package]] name = "lml" @@ -2337,14 +2342,14 @@ install = ["zstandard (>=0.21.0)"] [[package]] name = "phonenumbers" -version = "9.0.8" +version = "9.0.7" description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers." optional = false python-versions = "*" groups = ["main"] files = [ - {file = "phonenumbers-9.0.8-py2.py3-none-any.whl", hash = "sha256:53d357111c0ead0d6408ae443613b18d3a053431ca1ddf7e881457c0969afcf9"}, - {file = "phonenumbers-9.0.8.tar.gz", hash = "sha256:16f03f2cf65b5eee99ed25827d810febcab92b5d76f977e425fcd2e4ca6d4865"}, + {file = "phonenumbers-9.0.7-py2.py3-none-any.whl", hash = "sha256:306eb14d1eaeb82230a08aa1614d04c93322b65b1ded2fff585161ed7eca39fc"}, + {file = "phonenumbers-9.0.7.tar.gz", hash = "sha256:d4cc2aa36cbf9b0004c370f406d1510ddef56bba9e5f759471ef47e998d8a2f9"}, ] [[package]] @@ -2766,14 +2771,14 @@ files = [ [[package]] name = "pygments" -version = "2.19.2" +version = "2.19.1" description = "Pygments is a syntax highlighting package written in Python." optional = false python-versions = ">=3.8" groups = ["dev"] files = [ - {file = "pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b"}, - {file = "pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887"}, + {file = "pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c"}, + {file = "pygments-2.19.1.tar.gz", hash = "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f"}, ] [package.extras] @@ -4123,5 +4128,5 @@ cffi = ["cffi (>=1.11)"] [metadata] lock-version = "2.1" -python-versions = "^3.13.2" -content-hash = "b1ce6ac60df44c9c1d5d6e6e5f2960449dba4fe9d76249384af65f6dcb08df26" +python-versions = "^3.12.2" +content-hash = "fa70b2e6e7f87bffbdb772161c6e1f5974de46306d305a3b119668ea43f13798" diff --git a/pyproject.toml b/pyproject.toml index dac2862c5..15af48fbc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ package-mode = false [tool.poetry.dependencies] axe-core-python = "^0.1.0" -python = "^3.13.2" +python = "^3.12.2" ago = "~=0.1.0" beautifulsoup4 = "^4.13.3" blinker = "~=1.8" diff --git a/runtime.txt b/runtime.txt index c94f67640..64f28603a 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.13.x +python-3.12.x