Skip to content

Commit 388c0a7

Browse files
committed
Unpin versions in setup.py (2nd attempt)
This patch unpins versions in setup.py since they are pinned in requirements.txt. This is effectively a revert of 11c2d9e and 8fc27f4. When we originally unpinned versions from setup.py, some clients were running `setup.py` directly to install `lnt`, which means they started fetching untested and incompatible versions of packages. Since then, we've documented the new installation procedure based on pip and our pinned requirements (in #70).
1 parent 77e8659 commit 388c0a7

File tree

1 file changed

+13
-23
lines changed

1 file changed

+13
-23
lines changed

setup.py

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
os.environ["CXX"] = "xcrun --sdk macosx clang"
1515
cflags += ['-stdlib=libc++', '-mmacosx-version-min=10.7']
1616

17-
# TODO: Remove this once we assume that setup.py isn't called directly to install lnt
18-
# setuptools expects to be invoked from within the directory of setup.py, but
19-
# it is nice to allow:
20-
# python path/to/setup.py install
21-
# to work (for scripts, etc.)
22-
os.chdir(os.path.dirname(os.path.abspath(__file__)))
23-
2417
cPerf = Extension('lnt.testing.profile.cPerf',
2518
sources=['lnt/testing/profile/cPerf.cpp'],
2619
extra_compile_args=['-std=c++11'] + cflags)
@@ -116,24 +109,21 @@
116109
],
117110
},
118111
install_requires=[
119-
"six",
120-
"aniso8601==1.2.0",
121-
"Flask==0.12.2",
122-
"Flask-RESTful==0.3.4",
123-
"Jinja2==2.11.3",
124-
"MarkupSafe==1.1.1",
125-
"SQLAlchemy==1.3.24",
126-
"Werkzeug==0.15.6",
127-
"itsdangerous==0.24",
128-
"python-gnupg==0.3.7",
129-
"pytz==2016.10",
112+
"aniso8601",
113+
"certifi",
114+
"click",
115+
"Flask-RESTful",
116+
"Flask-WTF",
117+
"Flask",
118+
"Jinja2",
119+
"MarkupSafe",
120+
"python-gnupg",
130121
"pyyaml",
131-
"WTForms==2.0.2",
132-
"Flask-WTF==0.12",
133-
"typing",
134-
"click==6.7",
135122
"requests",
136-
"certifi"
123+
"SQLAlchemy",
124+
"typing",
125+
"Werkzeug",
126+
"WTForms",
137127
],
138128

139129
ext_modules=[cPerf],

0 commit comments

Comments
 (0)