Skip to content

Commit e1ba438

Browse files
Migrate back to 3.9 fully
1 parent f649c45 commit e1ba438

File tree

7 files changed

+40
-44
lines changed

7 files changed

+40
-44
lines changed

.github/workflows/format-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Python
1717
uses: actions/setup-python@v5
1818
with:
19-
python-version: '3.12'
19+
python-version: '3.9'
2020

2121
- name: Install ruff
2222
run: pip install ruff

.github/workflows/python-app.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
python-version: [3.12]
18+
python-version: [3.9]
1919

2020
steps:
2121
- name: Install ldap dependencies
@@ -38,7 +38,7 @@ jobs:
3838

3939
strategy:
4040
matrix:
41-
python-version: [3.12]
41+
python-version: [3.9]
4242

4343
steps:
4444
- name: Install ldap dependencies

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12-slim-bookworm
1+
FROM docker.io/python:3.9-slim-trixie
22

33
RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
44
RUN apt-get -yq update && \

Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12-slim-bookworm
1+
FROM docker.io/python:3.9-slim-trixie
22

33
RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
44
RUN apt-get -yq update && \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CSH Web Packet
22

3-
[![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-312/)
3+
[![Python3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python39/)
44
[![Build Status](https://travis-ci.com/ComputerScienceHouse/packet.svg?branch=develop)](https://travis-ci.com/ComputerScienceHouse/packet)
55

66
Packet is used by CSH to facilitate the freshmen packet portion of our introductory member evaluation process. This is
@@ -58,7 +58,7 @@ reliable method.
5858

5959
Use `pip3 install -r requirements.txt` to install the required python dependencies. A
6060
[venv](https://packaging.python.org/tutorials/installing-packages/#creating-virtual-environments) is *highly*
61-
recommended. To add new dependencies, add them to `requirements.in` and run `pip-compile requirements.in` to update
61+
recommended. To add new dependencies add them to `requirements.in` and run `uv pip compile requirements.in -o requirements.txt` to update
6262
the main file.
6363

6464
If 1 or more of the packages fail to install the likely issue is missing header files for the libraries with native C

requirements.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ Flask-Mail==0.10.0
33
Flask-Migrate~=2.7.0
44
Flask-pyoidc~=3.7.0
55
Flask~=1.1.4
6-
csh-ldap @ git+https://github.com/ComputerScienceHouse/csh_ldap.git@2.5.0
6+
csh-ldap==2.5.1
77
ddtrace==3.12.2
88
flask_sqlalchemy~=2.5.1
99
gunicorn~=20.0.4
1010
mypy==1.17.1
1111
onesignal-sdk~=1.0.0
1212
psycopg2-binary~=2.9.3
1313
ruff==0.12.11
14-
pylint==3.3.8
14+
pylint-quotes==0.2.3
15+
pylint~=2.8.0
1516
sentry-sdk~=1.5.12
1617
sqlalchemy[mypy]~=1.4.31
1718

1819
# Broken transitive dependency we should version
19-
MarkupSafe~=2.0.1
20-
# Tool to generate requirements.txt
21-
pip-tools~=6.6.2
20+
MarkupSafe~=2.0.1

requirements.txt

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
#
2-
# This file is autogenerated by pip-compile with Python 3.12
3-
# by the following command:
4-
#
5-
# pip-compile --cert=None --client-cert=None --index-url=None --pip-args=None requirements.in
6-
#
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile requirements.in -o requirements.txt
73
alembic==1.16.4
84
# via flask-migrate
95
annotated-types==0.7.0
106
# via pydantic
11-
astroid==3.3.11
7+
astroid==2.5.6
128
# via pylint
139
blinker==1.9.0
1410
# via flask-mail
@@ -23,19 +19,15 @@ cffi==1.17.1
2319
charset-normalizer==3.4.3
2420
# via requests
2521
click==7.1.2
26-
# via
27-
# flask
28-
# pip-tools
22+
# via flask
2923
cryptography==45.0.6
3024
# via oic
31-
csh-ldap @ git+https://github.com/ComputerScienceHouse/csh_ldap.git@2.5.0
25+
csh-ldap==2.5.1
3226
# via -r requirements.in
3327
ddtrace==3.12.2
3428
# via -r requirements.in
3529
defusedxml==0.7.1
3630
# via oic
37-
dill==0.4.0
38-
# via pylint
3931
dnspython==2.7.0
4032
# via srvlookup
4133
envier==0.6.1
@@ -72,12 +64,14 @@ importlib-metadata==8.7.0
7264
# via opentelemetry-api
7365
importlib-resources==6.5.2
7466
# via flask-pyoidc
75-
isort==6.0.1
67+
isort==5.13.2
7668
# via pylint
7769
itsdangerous==1.1.0
7870
# via flask
7971
jinja2==2.11.3
8072
# via flask
73+
lazy-object-proxy==1.12.0
74+
# via astroid
8175
mako==1.3.10
8276
# via
8377
# alembic
@@ -87,7 +81,7 @@ markupsafe==2.0.1
8781
# -r requirements.in
8882
# jinja2
8983
# mako
90-
mccabe==0.7.0
84+
mccabe==0.6.1
9185
# via pylint
9286
mypy==1.17.1
9387
# via
@@ -103,12 +97,6 @@ opentelemetry-api==1.36.0
10397
# via ddtrace
10498
pathspec==0.12.1
10599
# via mypy
106-
pep517==0.13.1
107-
# via pip-tools
108-
pip-tools==6.6.2
109-
# via -r requirements.in
110-
platformdirs==4.4.0
111-
# via pylint
112100
protobuf==6.32.0
113101
# via ddtrace
114102
psycopg2-binary==2.9.10
@@ -133,7 +121,11 @@ pydantic-settings==2.10.1
133121
# via oic
134122
pyjwkest==1.4.2
135123
# via oic
136-
pylint==3.3.8
124+
pylint==2.8.3
125+
# via
126+
# -r requirements.in
127+
# pylint-quotes
128+
pylint-quotes==0.2.3
137129
# via -r requirements.in
138130
python-dotenv==1.1.1
139131
# via pydantic-settings
@@ -149,9 +141,11 @@ ruff==0.12.11
149141
# via -r requirements.in
150142
sentry-sdk==1.5.12
151143
# via -r requirements.in
144+
setuptools==80.9.0
145+
# via gunicorn
152146
six==1.17.0
153147
# via pyjwkest
154-
sqlalchemy[mypy]==1.4.54
148+
sqlalchemy==1.4.54
155149
# via
156150
# -r requirements.in
157151
# alembic
@@ -160,11 +154,16 @@ sqlalchemy2-stubs==0.0.2a38
160154
# via sqlalchemy
161155
srvlookup==2.0.0
162156
# via csh-ldap
163-
tomlkit==0.13.3
157+
toml==0.10.2
164158
# via pylint
159+
tomli==2.3.0
160+
# via
161+
# alembic
162+
# mypy
165163
typing-extensions==4.14.1
166164
# via
167165
# alembic
166+
# bytecode
168167
# ddtrace
169168
# mypy
170169
# opentelemetry-api
@@ -182,13 +181,11 @@ urllib3==2.5.0
182181
# sentry-sdk
183182
werkzeug==1.0.1
184183
# via flask
185-
wheel==0.45.1
186-
# via pip-tools
187184
wrapt==1.12.1
188-
# via ddtrace
185+
# via
186+
# astroid
187+
# ddtrace
189188
zipp==3.23.0
190-
# via importlib-metadata
191-
192-
# The following packages are considered to be unsafe in a requirements file:
193-
# pip
194-
# setuptools
189+
# via
190+
# importlib-metadata
191+
# importlib-resources

0 commit comments

Comments
 (0)