Skip to content

Commit e442fc5

Browse files
devinmattejabbate19
authored andcommitted
Locking and updating dependencies (#351)
* Locking and updating dependencies * Running update before install
1 parent 9788bee commit e442fc5

7 files changed

+239
-35
lines changed

.github/workflows/python-app.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Install ldap dependencies
22-
run: sudo apt-get install libldap2-dev libsasl2-dev
22+
run: sudo apt-get update && sudo apt-get install libldap2-dev libsasl2-dev
2323
- uses: actions/checkout@v2
2424
- name: Set up Python ${{ matrix.python-version }}
2525
uses: actions/setup-python@v2

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
2525

2626
RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
2727

28-
CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]
28+
CMD ["ddtrace-run", "gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ npm start
5757

5858
This will run the asset pipeline, start the Python server, and start BrowserSync. Your default web browser will open automatically. If it doesn't, navigate to `http://127.0.0.1:3000`. Any changes made to the frontend files in `frontend` or the Jinja templates in `conditional/templates` will cause the browser to reload automatically.
5959

60+
### Dependencies
61+
62+
To add new dependencies, add them to `requirements.in` and then run `pip-compile requirements.in` to produce a new locked `requirements.txt`. Do not edit `requirements.txt` directly as it will be overwritten by future PRs.
63+
6064
### Database Migrations
6165

6266
If the database schema is changed after initializing the database, you must migrate it to the new schema by running:

package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"enumify": "^1.0.4",
3838
"jquery": "^3.1.0",
3939
"load-awesome": "^1.1.0",
40-
"lodash": "4.17.19",
40+
"lodash": "4.17.21",
4141
"reveal.js": "^3.3.0",
4242
"selectize": "^0.12.2",
4343
"selectize-scss": "^0.9.1",

requirements.in

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
alembic~=0.9.8
2+
astroid~=2.4.0
3+
blinker~=1.4
4+
click~=7.1
5+
csh_ldap>=2.3.1
6+
ddtrace~=1.1.4
7+
Flask~=1.1.4
8+
Flask-Migrate~=2.1.1
9+
Flask-Gzip~=0.2
10+
Flask-pyoidc~=1.3.0
11+
Flask-SQLAlchemy~=2.3.2
12+
gunicorn~=20.1.0
13+
isort~=4.3.4
14+
itsdangerous~=0.24
15+
Jinja2~=2.10
16+
lazy-object-proxy~=1.4.0
17+
Mako~=1.0.7
18+
MarkupSafe~=1.0
19+
mccabe~=0.6.1
20+
oic~=0.11.0
21+
pip-tools~=6.6.2
22+
psycopg2-binary~=2.9.3
23+
pylint~=2.6.0
24+
python-dateutil~=2.6.1
25+
python-editor~=1.0.3
26+
sentry-sdk[flask]~=0.19.5
27+
six~=1.12.0
28+
SQLAlchemy~=1.3.22
29+
structlog~=18.1.0
30+
Werkzeug~=0.15.3
31+
wrapt~=1.11.0

requirements.txt

+198-29
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,198 @@
1-
alembic~=0.9.8
2-
astroid~=2.4.0
3-
blinker~=1.4
4-
click~=7.1
5-
csh_ldap>=2.3.1
6-
Flask~=1.1.0
7-
Flask-Migrate~=2.1.1
8-
Flask-Gzip~=0.2
9-
Flask-pyoidc~=1.3.0
10-
Flask-SQLAlchemy~=2.3.2
11-
gunicorn~=19.7.1
12-
isort~=4.3.4
13-
itsdangerous~=0.24
14-
Jinja2~=2.10
15-
lazy-object-proxy~=1.4.0
16-
Mako~=1.0.7
17-
MarkupSafe~=1.0
18-
mccabe~=0.6.1
19-
oic~=0.11.0
20-
psycopg2~=2.8.5
21-
pylint~=2.6.0
22-
python-dateutil~=2.6.1
23-
python-editor~=1.0.3
24-
sentry-sdk[flask]~=0.19.5
25-
six~=1.12.0
26-
SQLAlchemy~=1.3.22
27-
structlog~=18.1.0
28-
Werkzeug~=0.15.3
29-
wrapt~=1.11.0
1+
#
2+
# This file is autogenerated by pip-compile with python 3.8
3+
# To update, run:
4+
#
5+
# pip-compile requirements.in
6+
#
7+
alabaster==0.7.12
8+
# via oic
9+
alembic==0.9.10
10+
# via
11+
# -r requirements.in
12+
# flask-migrate
13+
astroid==2.4.2
14+
# via
15+
# -r requirements.in
16+
# pylint
17+
attrs==21.4.0
18+
# via ddtrace
19+
beaker==1.11.0
20+
# via oic
21+
blinker==1.4
22+
# via
23+
# -r requirements.in
24+
# sentry-sdk
25+
certifi==2022.5.18.1
26+
# via
27+
# requests
28+
# sentry-sdk
29+
cffi==1.15.0
30+
# via cryptography
31+
charset-normalizer==2.0.12
32+
# via requests
33+
click==7.1.2
34+
# via
35+
# -r requirements.in
36+
# flask
37+
# pip-tools
38+
cryptography==37.0.2
39+
# via pyopenssl
40+
csh-ldap==2.3.1
41+
# via -r requirements.in
42+
ddsketch==2.0.3
43+
# via ddtrace
44+
ddtrace==1.1.4
45+
# via -r requirements.in
46+
dnspython==2.2.1
47+
# via srvlookup
48+
flask==1.1.4
49+
# via
50+
# -r requirements.in
51+
# flask-gzip
52+
# flask-migrate
53+
# flask-pyoidc
54+
# flask-sqlalchemy
55+
# sentry-sdk
56+
flask-gzip==0.2
57+
# via -r requirements.in
58+
flask-migrate==2.1.1
59+
# via -r requirements.in
60+
flask-pyoidc==1.3.0
61+
# via -r requirements.in
62+
flask-sqlalchemy==2.3.2
63+
# via
64+
# -r requirements.in
65+
# flask-migrate
66+
future==0.18.2
67+
# via
68+
# oic
69+
# pyjwkest
70+
gunicorn==20.1.0
71+
# via -r requirements.in
72+
idna==3.3
73+
# via requests
74+
isort==4.3.21
75+
# via
76+
# -r requirements.in
77+
# pylint
78+
itsdangerous==0.24
79+
# via
80+
# -r requirements.in
81+
# flask
82+
jinja2==2.11.3
83+
# via
84+
# -r requirements.in
85+
# flask
86+
lazy-object-proxy==1.4.3
87+
# via
88+
# -r requirements.in
89+
# astroid
90+
mako==1.0.14
91+
# via
92+
# -r requirements.in
93+
# alembic
94+
# oic
95+
markupsafe==1.1.1
96+
# via
97+
# -r requirements.in
98+
# jinja2
99+
# mako
100+
mccabe==0.6.1
101+
# via
102+
# -r requirements.in
103+
# pylint
104+
oic==0.11.0.1
105+
# via
106+
# -r requirements.in
107+
# flask-pyoidc
108+
packaging==21.3
109+
# via ddtrace
110+
pep517==0.12.0
111+
# via pip-tools
112+
pip-tools==6.6.2
113+
# via -r requirements.in
114+
protobuf==3.20.1
115+
# via
116+
# ddsketch
117+
# ddtrace
118+
psycopg2-binary==2.9.3
119+
# via -r requirements.in
120+
pyasn1==0.4.8
121+
# via
122+
# pyasn1-modules
123+
# python-ldap
124+
pyasn1-modules==0.2.8
125+
# via python-ldap
126+
pycparser==2.21
127+
# via cffi
128+
pycryptodomex==3.14.1
129+
# via
130+
# oic
131+
# pyjwkest
132+
pyjwkest==1.4.2
133+
# via oic
134+
pylint==2.6.2
135+
# via -r requirements.in
136+
pyopenssl==22.0.0
137+
# via oic
138+
pyparsing==3.0.9
139+
# via packaging
140+
python-dateutil==2.6.1
141+
# via
142+
# -r requirements.in
143+
# alembic
144+
python-editor==1.0.4
145+
# via
146+
# -r requirements.in
147+
# alembic
148+
python-ldap==3.0.0
149+
# via csh-ldap
150+
requests==2.27.1
151+
# via
152+
# oic
153+
# pyjwkest
154+
sentry-sdk[flask]==0.19.5
155+
# via -r requirements.in
156+
six==1.12.0
157+
# via
158+
# -r requirements.in
159+
# astroid
160+
# ddsketch
161+
# ddtrace
162+
# oic
163+
# pyjwkest
164+
# python-dateutil
165+
# structlog
166+
sqlalchemy==1.3.24
167+
# via
168+
# -r requirements.in
169+
# alembic
170+
# flask-sqlalchemy
171+
srvlookup==2.0.0
172+
# via csh-ldap
173+
structlog==18.1.0
174+
# via -r requirements.in
175+
tenacity==8.0.1
176+
# via ddtrace
177+
toml==0.10.2
178+
# via pylint
179+
tomli==2.0.1
180+
# via pep517
181+
urllib3==1.26.9
182+
# via
183+
# requests
184+
# sentry-sdk
185+
werkzeug==0.15.6
186+
# via
187+
# -r requirements.in
188+
# flask
189+
wheel==0.37.1
190+
# via pip-tools
191+
wrapt==1.11.2
192+
# via
193+
# -r requirements.in
194+
# astroid
195+
196+
# The following packages are considered to be unsafe in a requirements file:
197+
# pip
198+
# setuptools

0 commit comments

Comments
 (0)