Skip to content

Commit 886a1bf

Browse files
Remove ddtrace (#554)
* make .env not required * remove ddtrace * fix lint
1 parent 241afaf commit 886a1bf

File tree

4 files changed

+25
-49
lines changed

4 files changed

+25
-49
lines changed

conditional/blueprints/gatekeep.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def display_spring_evals(internal=False, user_dict=None):
2323
log.info('Display Gatekeep Status Listing')
2424

2525
_, semester_start = get_semester_info()
26-
active_members = ldap_get_active_members()
2726

2827
cm_count = {row[0]: row[1] for row in MemberCommitteeAttendance.query.join(
2928
CommitteeMeeting,
@@ -90,7 +89,7 @@ def display_spring_evals(internal=False, user_dict=None):
9089
).all()}
9190

9291
gk_members = []
93-
for account in active_members:
92+
for account in ldap_get_active_members():
9493
uid = account.uid
9594
name = account.cn
9695

@@ -142,12 +141,10 @@ def display_spring_evals(internal=False, user_dict=None):
142141
if internal:
143142
return gk_members
144143

145-
gatekeep_active = is_gatekeep_active()
146-
147144
return render_template('gatekeep.html',
148145
username=user_dict['username'],
149146
members=gk_members,
150-
gatekeep_active=gatekeep_active,
147+
gatekeep_active=is_gatekeep_active(),
151148
req_meetings=6,
152149
req_seminars=2,
153150
req_seminars_hosted=1)

docker-compose.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ services:
88
ports:
99
- "127.0.0.1:8080:8080"
1010
env_file:
11-
- .env
11+
- path: .env
12+
required: false
1213
volumes:
1314
- ./migrations:/opt/conditional/migrations
1415
develop:

requirements.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ boto3==1.35.13
55
botocore==1.35.99
66
click~=8.3.1
77
csh_ldap>=2.5.3
8-
ddtrace~=4.6.4
98
Flask~=3.1.0
109
Flask-Migrate~=4.1.0
1110
Flask-Gzip~=0.2

requirements.txt

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
#
2-
# This file is autogenerated by pip-compile with Python 3.14
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
73
alembic==1.18.4
84
# via
95
# -r requirements.in
@@ -26,37 +22,31 @@ botocore==1.35.99
2622
# -r requirements.in
2723
# boto3
2824
# s3transfer
29-
build==1.4.0
25+
build==1.4.3
3026
# via pip-tools
31-
bytecode==0.17.0
32-
# via ddtrace
3327
certifi==2026.2.25
3428
# via
3529
# requests
3630
# sentry-sdk
3731
cffi==2.0.0
3832
# via cryptography
39-
charset-normalizer==3.4.4
33+
charset-normalizer==3.4.7
4034
# via requests
41-
click==8.3.1
35+
click==8.3.2
4236
# via
4337
# -r requirements.in
4438
# flask
4539
# pip-tools
46-
cryptography==46.0.6
40+
cryptography==46.0.7
4741
# via oic
4842
csh-ldap==2.5.3
4943
# via -r requirements.in
50-
ddtrace==4.6.4
51-
# via -r requirements.in
5244
defusedxml==0.7.1
5345
# via oic
5446
dill==0.4.1
5547
# via pylint
5648
dnspython==2.8.0
5749
# via srvlookup
58-
envier==0.6.1
59-
# via ddtrace
6050
flask==3.1.3
6151
# via
6252
# -r requirements.in
@@ -77,15 +67,13 @@ flask-sqlalchemy==3.1.1
7767
# flask-migrate
7868
future==1.0.0
7969
# via pyjwkest
80-
greenlet==3.3.2
70+
greenlet==3.4.0
8171
# via sqlalchemy
8272
gunicorn==25.3.0
8373
# via -r requirements.in
8474
idna==3.11
8575
# via requests
86-
importlib-metadata==8.7.1
87-
# via opentelemetry-api
88-
importlib-resources==6.5.2
76+
importlib-resources==7.1.0
8977
# via flask-pyoidc
9078
isort==6.1.0
9179
# via
@@ -126,16 +114,16 @@ oic==1.6.1
126114
# via
127115
# -r requirements.in
128116
# flask-pyoidc
129-
opentelemetry-api==1.40.0
130-
# via ddtrace
131117
packaging==26.0
132118
# via
133119
# build
134120
# gunicorn
135121
# wheel
122+
pip==26.0.1
123+
# via pip-tools
136124
pip-tools==7.5.3
137125
# via -r requirements.in
138-
platformdirs==4.9.2
126+
platformdirs==4.9.6
139127
# via pylint
140128
psycopg2-binary==2.9.11
141129
# via -r requirements.in
@@ -151,9 +139,9 @@ pycryptodomex==3.23.0
151139
# via
152140
# oic
153141
# pyjwkest
154-
pydantic==2.12.5
142+
pydantic==2.13.0
155143
# via pydantic-settings
156-
pydantic-core==2.41.5
144+
pydantic-core==2.46.0
157145
# via pydantic
158146
pydantic-settings==2.13.1
159147
# via oic
@@ -165,29 +153,31 @@ pyproject-hooks==1.2.0
165153
# via
166154
# build
167155
# pip-tools
168-
python-dateutil==2.6.1
156+
python-dateutil==2.9.0.post0
169157
# via botocore
170158
python-dotenv==1.2.2
171159
# via pydantic-settings
172160
python-editor==1.0.4
173161
# via -r requirements.in
174162
python-ldap==3.4.5
175163
# via csh-ldap
176-
requests==2.33.0
164+
requests==2.33.1
177165
# via
178166
# flask-pyoidc
179167
# oic
180168
# pyjwkest
181169
s3transfer==0.10.4
182170
# via boto3
183-
sentry-sdk[flask]==2.56.0
171+
sentry-sdk==2.56.0
184172
# via -r requirements.in
173+
setuptools==82.0.1
174+
# via pip-tools
185175
six==1.17.0
186176
# via
187177
# -r requirements.in
188178
# pyjwkest
189179
# python-dateutil
190-
sqlalchemy==2.0.48
180+
sqlalchemy==2.0.49
191181
# via
192182
# -r requirements.in
193183
# alembic
@@ -201,7 +191,6 @@ tomlkit==0.14.0
201191
typing-extensions==4.15.0
202192
# via
203193
# alembic
204-
# opentelemetry-api
205194
# pydantic
206195
# pydantic-core
207196
# sqlalchemy
@@ -215,21 +204,11 @@ urllib3==2.6.3
215204
# botocore
216205
# requests
217206
# sentry-sdk
218-
werkzeug==3.1.6
207+
werkzeug==3.1.8
219208
# via
220209
# -r requirements.in
221210
# flask
222211
wheel==0.46.3
223212
# via pip-tools
224213
wrapt==2.1.2
225-
# via
226-
# -r requirements.in
227-
# ddtrace
228-
zipp==3.23.0
229-
# via importlib-metadata
230-
231-
# The following packages are considered to be unsafe in a requirements file:
232-
pip==26.0.1
233-
# via pip-tools
234-
setuptools==82.0.0
235-
# via pip-tools
214+
# via -r requirements.in

0 commit comments

Comments
 (0)