Merge from main

This commit is contained in:
Kenneth Kehl
2025-09-03 10:34:30 -07:00
7 changed files with 966 additions and 973 deletions
+2 -2
View File
@@ -9,10 +9,10 @@ runs:
sudo apt-get update \ sudo apt-get update \
&& sudo apt-get install -y --no-install-recommends \ && sudo apt-get install -y --no-install-recommends \
libcurl4-openssl-dev libcurl4-openssl-dev
- name: Set up Python 3.12.9 - name: Set up Python 3.13.2
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
python-version: "3.12.9" python-version: "3.13.2"
- name: Install poetry - name: Install poetry
shell: bash shell: bash
run: pip install poetry==2.1.3 run: pip install poetry==2.1.3
+4
View File
@@ -13,3 +13,7 @@ updates:
- "dependabot" # Custom label to identify Dependabot PRs - "dependabot" # Custom label to identify Dependabot PRs
assignees: assignees:
- "alexjanousekGSA" - "alexjanousekGSA"
ignore:
# gevent 25.8+ breaks Celery/Kombu compatibility (potentially)
- dependency-name: "gevent"
versions: [">=25.8.0"]
+9 -9
View File
@@ -39,7 +39,7 @@ You will need the following items:
This project currently works with these major versions of the following main This project currently works with these major versions of the following main
components: components:
- Python 3.12.x - Python 3.13.x
- PostgreSQL 15.x (version 12.x is used in the hosted environments) - PostgreSQL 15.x (version 12.x is used in the hosted environments)
These instructions will walk you through how to set your machine up with all of These instructions will walk you through how to set your machine up with all of
@@ -178,12 +178,12 @@ session to make the changes take effect.
Now we're ready to install the Python version we need with `pyenv`, like so: Now we're ready to install the Python version we need with `pyenv`, like so:
```sh ```sh
pyenv install 3.12 pyenv install 3.13
``` ```
This will install the latest version of Python 3.12. This will install the latest version of Python 3.13.
_NOTE: This project currently runs on Python 3.12.x._ _NOTE: This project currently runs on Python 3.13.x._
#### Python Dependency Installation #### Python Dependency Installation
@@ -264,12 +264,12 @@ git clone git@github.com:GSA/notifications-api.git
Now go into the project directory (`notifications-api` by default), create a Now go into the project directory (`notifications-api` by default), create a
virtual environment, and set the local Python version to point to the virtual virtual environment, and set the local Python version to point to the virtual
environment (assumes version Python `3.12.9` is what is installed on your environment (assumes version Python `3.13.2` is what is installed on your
machine): machine):
```sh ```sh
cd notifications-api cd notifications-api
pyenv virtualenv 3.12.9 notify-api pyenv virtualenv 3.13.2 notify-api
pyenv local notify-api pyenv local notify-api
``` ```
@@ -317,10 +317,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. follow these steps to get yourself up-to-date.
First, use `pyenv` to install the newer version of Python you'd like to use; First, use `pyenv` to install the newer version of Python you'd like to use;
we'll use `3.12` in our example here since we recently upgraded to this version: we'll use `3.13` in our example here since we recently upgraded to this version:
```sh ```sh
pyenv install 3.12 pyenv install 3.13
``` ```
Next, delete the virtual environment you previously had set up. If you followed Next, delete the virtual environment you previously had set up. If you followed
@@ -335,7 +335,7 @@ environment with the newer version of Python you just installed:
```sh ```sh
cd notifications-api cd notifications-api
pyenv virtualenv 3.12.9 notify-api pyenv virtualenv 3.13.2 notify-api
pyenv local notify-api pyenv local notify-api
``` ```
-1
View File
@@ -2,7 +2,6 @@ import json
import logging import logging
import time import time
import urllib.parse import urllib.parse
from os import getenv from os import getenv
import requests import requests
Generated
+944 -954
View File
File diff suppressed because it is too large Load Diff
+6 -6
View File
@@ -8,7 +8,7 @@ readme = "README.md"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.12.9" python = "^3.13.2"
alembic = "==1.16.5" alembic = "==1.16.5"
amqp = "==5.3.1" amqp = "==5.3.1"
beautifulsoup4 = "==4.13.5" beautifulsoup4 = "==4.13.5"
@@ -25,7 +25,7 @@ click-didyoumean = "==0.3.1"
click-plugins = "==1.1.1.2" click-plugins = "==1.1.1.2"
click-repl = "==0.3.0" click-repl = "==0.3.0"
deprecated = "==1.2.18" deprecated = "==1.2.18"
gevent = "==25.8.1" gevent = "==25.5.1"
expiringdict = "==1.2.2" expiringdict = "==1.2.2"
flask = "~=3.1" flask = "~=3.1"
flask-bcrypt = "==1.0.1" flask-bcrypt = "==1.0.1"
@@ -52,14 +52,14 @@ bleach = "^6.1.0"
geojson = "^3.2.0" geojson = "^3.2.0"
numpy = "^2.3.2" numpy = "^2.3.2"
ordered-set = "^4.1.0" ordered-set = "^4.1.0"
phonenumbers = "^9.0.12" phonenumbers = "^9.0.13"
python-json-logger = "^3.3.0" python-json-logger = "^3.3.0"
regex = "^2025.7.34" regex = "^2025.9.1"
shapely = "^2.1.1" shapely = "^2.1.1"
smartypants = "^2.0.1" smartypants = "^2.0.1"
mistune = "^3.1.3" mistune = "^3.1.4"
blinker = "^1.9.0" blinker = "^1.9.0"
cryptography = "^45.0.6" cryptography = "^45.0.7"
idna = "^3.7" idna = "^3.7"
jmespath = "^1.0.1" jmespath = "^1.0.1"
markupsafe = "^3.0.2" markupsafe = "^3.0.2"
+1 -1
View File
@@ -1 +1 @@
python-3.12.x python-3.13.x