Skip to content

Commit 47bc80b

Browse files
authored
[deps] Move dependency pins to requirements.txt (#63)
That way, we have a single place where all of our dependency versions are pinned, and setup.py only mentions which packages the tool depends on, without requiring specific versions. Also drop packages that are not depend upon directly from setup.py: some of those like `pytz` are still pinned in requirements.txt for stability, but they don't need to be in setup.py because we don't depend on them directly. The `six` package was dropped entirely since it wasn't used anymore. Finally, this patch pins the versions used when running `tox` by installing via requirements.txt, otherwise we end up using unpinned versions from setup.py when running the tests, which creates obvious issues.
1 parent bec9e50 commit 47bc80b

File tree

3 files changed

+26
-16
lines changed

3 files changed

+26
-16
lines changed

requirements.server.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
# These requirements are what you would install on a production server.
22
.
3-
psycopg2==2.9.10
3+
aniso8601==1.2.0
4+
click==6.7
5+
Flask-RESTful==0.3.4
6+
Flask-WTF==0.12
7+
Flask==0.12.2
48
gunicorn==19.9.0
9+
itsdangerous==0.24
510
Jinja2==2.11.3
11+
MarkupSafe==1.1.1
612
progressbar2
13+
psycopg2==2.9.10
14+
python-gnupg==0.3.7
15+
pytz==2016.10
716
pyyaml==5.1.2
17+
SQLAlchemy==1.3.24
18+
Werkzeug==0.15.6
19+
WTForms==2.0.2

setup.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,21 @@
115115
],
116116
},
117117
install_requires=[
118-
"six",
119-
"aniso8601==1.2.0",
120-
"Flask==0.12.2",
121-
"Flask-RESTful==0.3.4",
118+
"aniso8601",
119+
"certifi",
120+
"click",
121+
"Flask-RESTful",
122+
"Flask-WTF",
123+
"Flask",
122124
"Jinja2",
123-
"MarkupSafe==1.1.1",
124-
"SQLAlchemy==1.3.24",
125-
"Werkzeug==0.15.6",
126-
"itsdangerous==0.24",
127-
"python-gnupg==0.3.7",
128-
"pytz==2016.10",
125+
"MarkupSafe",
126+
"python-gnupg",
129127
"pyyaml",
130-
"WTForms==2.0.2",
131-
"Flask-WTF==0.12",
132-
"typing",
133-
"click==6.7",
134128
"requests",
135-
"certifi"
129+
"SQLAlchemy",
130+
"typing",
131+
"Werkzeug",
132+
"WTForms",
136133
],
137134

138135
ext_modules=[cPerf],

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ commands =
4949

5050
[testenv:py3]
5151
deps =
52+
-r requirements.txt
5253
filecheck
5354
lit
5455

0 commit comments

Comments
 (0)