From a9edf80328f76281853c51b07a78d4ae29b0bce9 Mon Sep 17 00:00:00 2001 From: "Noah Hanford (spaced)" Date: Mon, 13 Apr 2026 14:45:18 -0400 Subject: [PATCH 1/3] make .env not required --- docker-compose.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 06378011..a42912d5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,7 +8,8 @@ services: ports: - "127.0.0.1:8080:8080" env_file: - - .env + - path: .env + required: false volumes: - ./migrations:/opt/conditional/migrations develop: From c4a325a22198894c375573e66561394fc39db926 Mon Sep 17 00:00:00 2001 From: "Noah Hanford (spaced)" Date: Mon, 13 Apr 2026 14:46:17 -0400 Subject: [PATCH 2/3] remove ddtrace --- requirements.in | 1 - requirements.txt | 63 ++++++++++++++++-------------------------------- 2 files changed, 21 insertions(+), 43 deletions(-) diff --git a/requirements.in b/requirements.in index 2865da27..59ece638 100644 --- a/requirements.in +++ b/requirements.in @@ -5,7 +5,6 @@ boto3==1.35.13 botocore==1.35.99 click~=8.3.1 csh_ldap>=2.5.3 -ddtrace~=4.6.4 Flask~=3.1.0 Flask-Migrate~=4.1.0 Flask-Gzip~=0.2 diff --git a/requirements.txt b/requirements.txt index c960f88a..edca0eb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,5 @@ -# -# This file is autogenerated by pip-compile with Python 3.14 -# by the following command: -# -# pip-compile --cert=None --client-cert=None --index-url=None --pip-args=None requirements.in -# +# This file was autogenerated by uv via the following command: +# uv pip compile requirements.in alembic==1.18.4 # via # -r requirements.in @@ -26,37 +22,31 @@ botocore==1.35.99 # -r requirements.in # boto3 # s3transfer -build==1.4.0 +build==1.4.3 # via pip-tools -bytecode==0.17.0 - # via ddtrace certifi==2026.2.25 # via # requests # sentry-sdk cffi==2.0.0 # via cryptography -charset-normalizer==3.4.4 +charset-normalizer==3.4.7 # via requests -click==8.3.1 +click==8.3.2 # via # -r requirements.in # flask # pip-tools -cryptography==46.0.6 +cryptography==46.0.7 # via oic csh-ldap==2.5.3 # via -r requirements.in -ddtrace==4.6.4 - # via -r requirements.in defusedxml==0.7.1 # via oic dill==0.4.1 # via pylint dnspython==2.8.0 # via srvlookup -envier==0.6.1 - # via ddtrace flask==3.1.3 # via # -r requirements.in @@ -77,15 +67,13 @@ flask-sqlalchemy==3.1.1 # flask-migrate future==1.0.0 # via pyjwkest -greenlet==3.3.2 +greenlet==3.4.0 # via sqlalchemy gunicorn==25.3.0 # via -r requirements.in idna==3.11 # via requests -importlib-metadata==8.7.1 - # via opentelemetry-api -importlib-resources==6.5.2 +importlib-resources==7.1.0 # via flask-pyoidc isort==6.1.0 # via @@ -126,16 +114,16 @@ oic==1.6.1 # via # -r requirements.in # flask-pyoidc -opentelemetry-api==1.40.0 - # via ddtrace packaging==26.0 # via # build # gunicorn # wheel +pip==26.0.1 + # via pip-tools pip-tools==7.5.3 # via -r requirements.in -platformdirs==4.9.2 +platformdirs==4.9.6 # via pylint psycopg2-binary==2.9.11 # via -r requirements.in @@ -151,9 +139,9 @@ pycryptodomex==3.23.0 # via # oic # pyjwkest -pydantic==2.12.5 +pydantic==2.13.0 # via pydantic-settings -pydantic-core==2.41.5 +pydantic-core==2.46.0 # via pydantic pydantic-settings==2.13.1 # via oic @@ -165,7 +153,7 @@ pyproject-hooks==1.2.0 # via # build # pip-tools -python-dateutil==2.6.1 +python-dateutil==2.9.0.post0 # via botocore python-dotenv==1.2.2 # via pydantic-settings @@ -173,21 +161,23 @@ python-editor==1.0.4 # via -r requirements.in python-ldap==3.4.5 # via csh-ldap -requests==2.33.0 +requests==2.33.1 # via # flask-pyoidc # oic # pyjwkest s3transfer==0.10.4 # via boto3 -sentry-sdk[flask]==2.56.0 +sentry-sdk==2.56.0 # via -r requirements.in +setuptools==82.0.1 + # via pip-tools six==1.17.0 # via # -r requirements.in # pyjwkest # python-dateutil -sqlalchemy==2.0.48 +sqlalchemy==2.0.49 # via # -r requirements.in # alembic @@ -201,7 +191,6 @@ tomlkit==0.14.0 typing-extensions==4.15.0 # via # alembic - # opentelemetry-api # pydantic # pydantic-core # sqlalchemy @@ -215,21 +204,11 @@ urllib3==2.6.3 # botocore # requests # sentry-sdk -werkzeug==3.1.6 +werkzeug==3.1.8 # via # -r requirements.in # flask wheel==0.46.3 # via pip-tools wrapt==2.1.2 - # via - # -r requirements.in - # ddtrace -zipp==3.23.0 - # via importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -pip==26.0.1 - # via pip-tools -setuptools==82.0.0 - # via pip-tools + # via -r requirements.in From 7bd542bd1b675e370bf9740d4711f2bab03298fe Mon Sep 17 00:00:00 2001 From: "Noah Hanford (spaced)" Date: Mon, 13 Apr 2026 17:26:47 -0400 Subject: [PATCH 3/3] fix lint --- conditional/blueprints/gatekeep.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/conditional/blueprints/gatekeep.py b/conditional/blueprints/gatekeep.py index 8f28ee6a..1eba8668 100644 --- a/conditional/blueprints/gatekeep.py +++ b/conditional/blueprints/gatekeep.py @@ -23,7 +23,6 @@ def display_spring_evals(internal=False, user_dict=None): log.info('Display Gatekeep Status Listing') _, semester_start = get_semester_info() - active_members = ldap_get_active_members() cm_count = {row[0]: row[1] for row in MemberCommitteeAttendance.query.join( CommitteeMeeting, @@ -90,7 +89,7 @@ def display_spring_evals(internal=False, user_dict=None): ).all()} gk_members = [] - for account in active_members: + for account in ldap_get_active_members(): uid = account.uid name = account.cn @@ -142,12 +141,10 @@ def display_spring_evals(internal=False, user_dict=None): if internal: return gk_members - gatekeep_active = is_gatekeep_active() - return render_template('gatekeep.html', username=user_dict['username'], members=gk_members, - gatekeep_active=gatekeep_active, + gatekeep_active=is_gatekeep_active(), req_meetings=6, req_seminars=2, req_seminars_hosted=1)