From 55f54dc2990739ad155f06bcee40293b4adba302 Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Sun, 5 Oct 2025 23:27:28 -0400 Subject: [PATCH 1/3] bump: docker image and python deps --- Dockerfile | 2 +- requirements.in | 27 ++++---- requirements.txt | 168 +++++++++++++++++++++++------------------------ 3 files changed, 96 insertions(+), 101 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0bf688c..b42a221 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim-buster +FROM python:3.13-slim-trixie MAINTAINER Galen Guyer RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime diff --git a/requirements.in b/requirements.in index 4962986..3fb3d34 100644 --- a/requirements.in +++ b/requirements.in @@ -1,18 +1,17 @@ -csh_ldap~=2.4.0 -ddtrace~=2.13.0 -Flask==1.1.4 -Flask-Migrate==4.0.7 -flask-optimize==0.2.9.8 +csh-ldap @ git+https://github.com/ComputerScienceHouse/csh_ldap@2.5.0 +ddtrace==3.15.0 +Flask==3.1.2 +Flask-Migrate==4.1.0 Flask-pyoidc==3.14.3 -Flask-SQLAlchemy==2.5.1 +Flask-SQLAlchemy==3.1.1 gunicorn==23.0.0 -pip-tools~=6.6.2 -PyMySQL==1.1.1 +pip-tools==7.5.1 +PyMySQL==1.1.2 pyGravatar==0.0.6 git+https://github.com/maxcountryman/flask-uploads@master -pylint~=3.2.7 -Pillow==10.3.0 -requests~=2.32.3 -sentry-sdk[flask]~=2.14.0 -markupsafe==2.1.2 -Werkzeug==1.0.1 +pylint==3.3.9 +pillow==11.3.0 +requests==2.32.5 +sentry-sdk[flask]==2.39.0 +markupsafe==3.0.3 +Werkzeug==3.1.3 diff --git a/requirements.txt b/requirements.txt index 82fbf1d..0ed9b0c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,199 +1,195 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.13 +# by the following command: # # pip-compile requirements.in # -alembic==1.13.3 +alembic==1.16.5 # via flask-migrate annotated-types==0.7.0 # via pydantic -astroid==3.2.4 +astroid==3.3.11 # via pylint -blinker==1.4 - # via sentry-sdk -bytecode==0.15.1 +blinker==1.9.0 + # via + # flask + # sentry-sdk +build==1.3.0 + # via pip-tools +bytecode==0.17.0 # via ddtrace -certifi==2024.7.4 +certifi==2025.10.5 # via # requests # sentry-sdk -cffi==1.15.0 +cffi==2.0.0 # via cryptography -charset-normalizer==2.0.12 +charset-normalizer==3.4.3 # via requests -click==7.1.2 +click==8.3.0 # via # flask # pip-tools -cryptography==43.0.1 +cryptography==46.0.2 # via oic -csh-ldap==2.4.0 +csh-ldap @ git+https://github.com/ComputerScienceHouse/csh_ldap@2.5.0 # via -r requirements.in -ddtrace==2.13.0 +ddtrace==3.15.0 # via -r requirements.in defusedxml==0.7.1 # via oic -deprecated==1.2.14 - # via opentelemetry-api -dill==0.3.5.1 +dill==0.4.0 # via pylint -dnspython==2.6.1 +dnspython==2.8.0 # via srvlookup -envier==0.5.2 +envier==0.6.1 # via ddtrace -flask==1.1.4 +flask==3.1.2 # via # -r requirements.in # flask-migrate - # flask-optimize # flask-pyoidc # flask-sqlalchemy # flask-uploads # sentry-sdk -flask-migrate==4.0.7 - # via -r requirements.in -flask-optimize==0.2.9.8 +flask-migrate==4.1.0 # via -r requirements.in flask-pyoidc==3.14.3 # via -r requirements.in -flask-sqlalchemy==2.5.1 +flask-sqlalchemy==3.1.1 # via # -r requirements.in # flask-migrate flask-uploads @ git+https://github.com/maxcountryman/flask-uploads@master # via -r requirements.in -future==0.18.3 +future==1.0.0 # via pyjwkest -greenlet==2.0.2 +greenlet==3.2.4 # via sqlalchemy gunicorn==23.0.0 # via -r requirements.in -htmlmin==0.1.12 - # via flask-optimize -idna==3.7 +idna==3.10 # via requests -importlib-metadata==8.4.0 +importlib-metadata==8.7.0 # via opentelemetry-api -importlib-resources==6.4.5 +importlib-resources==6.5.2 # via flask-pyoidc -isort==5.10.1 +isort==6.1.0 # via pylint -itsdangerous==1.1.0 +itsdangerous==2.2.0 # via flask -jinja2==2.11.3 +jinja2==3.1.6 # via flask -mako==1.2.2 +legacy-cgi==2.6.3 + # via ddtrace +mako==1.3.10 # via # alembic # oic -markupsafe==2.0.1 +markupsafe==3.0.3 # via # -r requirements.in + # flask # jinja2 # mako # sentry-sdk + # werkzeug mccabe==0.7.0 # via pylint oic==1.6.1 # via flask-pyoidc -opentelemetry-api==1.27.0 +opentelemetry-api==1.37.0 # via ddtrace -packaging==21.3 - # via gunicorn -pep517==0.12.0 - # via pip-tools -pillow==10.3.0 +packaging==25.0 + # via + # build + # gunicorn +pillow==11.3.0 # via -r requirements.in -pip-tools==6.6.2 +pip-tools==7.5.1 # via -r requirements.in -platformdirs==2.5.2 +platformdirs==4.4.0 # via pylint -protobuf==3.20.2 +protobuf==6.32.1 # via ddtrace -pyasn1==0.4.8 +pyasn1==0.6.1 # via # pyasn1-modules # python-ldap -pyasn1-modules==0.2.8 +pyasn1-modules==0.4.2 # via python-ldap -pycparser==2.21 +pycparser==2.23 # via cffi -pycryptodomex==3.19.1 +pycryptodomex==3.23.0 # via # oic # pyjwkest -pydantic==2.9.2 +pydantic==2.11.10 # via pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.33.2 # via pydantic -pydantic-settings==2.5.2 +pydantic-settings==2.11.0 # via oic pygravatar==0.0.6 # via -r requirements.in -pyjwkest==1.4.2 +pyjwkest==1.4.4 # via oic -pylint==3.2.7 +pylint==3.3.9 # via -r requirements.in -pymysql==1.1.1 +pymysql==1.1.2 # via -r requirements.in -pyparsing==3.0.9 - # via packaging -python-dotenv==1.0.1 +pyproject-hooks==1.2.0 + # via + # build + # pip-tools +python-dotenv==1.1.1 # via pydantic-settings -python-ldap==3.4.0 +python-ldap==3.4.4 # via csh-ldap -requests==2.32.3 +requests==2.32.5 # via # -r requirements.in # flask-pyoidc # oic # pyjwkest -sentry-sdk[flask]==2.14.0 +sentry-sdk[flask]==2.39.0 # via -r requirements.in -six==1.16.0 +six==1.17.0 # via pyjwkest -sqlalchemy==1.4.36 +sqlalchemy==2.0.43 # via # alembic # flask-sqlalchemy srvlookup==2.0.0 # via csh-ldap -tomli==2.0.1 - # via - # pep517 - # pylint -tomlkit==0.13.2 +tomlkit==0.13.3 # via pylint -typing-extensions==4.12.2 +typing-extensions==4.15.0 # via # alembic - # astroid - # bytecode - # ddtrace + # opentelemetry-api # pydantic # pydantic-core - # pylint -urllib3==1.26.19 + # sqlalchemy + # typing-inspection +typing-inspection==0.4.2 + # via + # pydantic + # pydantic-settings +urllib3==2.5.0 # via # requests # sentry-sdk -werkzeug==1.0.1 +werkzeug==3.1.3 # via # -r requirements.in # flask -wheel==0.38.1 +wheel==0.45.1 # via pip-tools -wrapt==1.16.0 - # via - # ddtrace - # deprecated -xmltodict==0.13.0 +wrapt==1.17.3 # via ddtrace -zipp==3.20.2 - # via - # importlib-metadata - # importlib-resources +zipp==3.23.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip From c5ec3efd892abc2a326270823e3200c5a33a465f Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Sun, 5 Oct 2025 23:32:05 -0400 Subject: [PATCH 2/3] bump: ci --- .github/workflows/python-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 0395205..b647c64 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -18,10 +18,10 @@ jobs: - name: Install ldap dependencies run: sudo apt-get update && sudo apt-get install libldap2-dev libsasl2-dev - uses: actions/checkout@v2 - - name: Set up Python 3.9 + - name: Set up Python 3.13 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.13 - name: Install dependencies run: | python -m pip install --upgrade pip From 7cdcd1d438ace560cbedfe1d298402e494bd63f1 Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Mon, 6 Oct 2025 18:47:05 -0400 Subject: [PATCH 3/3] bump: .tool-versions --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index f213b52..a75f84a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -python 3.9.7 +python 3.13.3