Skip to content

Commit 343485d

Browse files
alexwlchanbcail
authored andcommitted
Don't use pip's internal APIs to install requirements (loris-imageserver#425)
1 parent 5545d98 commit 343485d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include requirements.txt

setup.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
import shutil
1515
import stat
1616

17-
from pip.download import PipSession
18-
from pip.req import parse_requirements
19-
2017
VERSION = loris.__version__
2118

2219
EX_NOUSER = 67
@@ -222,9 +219,11 @@ def __update_and_deploy_config(self):
222219
config.write()
223220

224221

225-
install_requires = parse_requirements(
226-
local_file('requirements.txt'), session=PipSession()
227-
)
222+
# We use requirements.txt so we can provide a deterministic set of packages
223+
# to be installed, not the latest version that happens to be available.
224+
# e.g. Pillow 5 has some issues with TIFF files that we care about.
225+
with open('requirements.txt') as f:
226+
install_requires = list(f)
228227

229228

230229
def _read(fname):
@@ -242,7 +241,7 @@ def _read(fname):
242241
license='Simplified BSD',
243242
version=VERSION,
244243
packages=['loris'],
245-
install_requires=[str(ir.req) for ir in install_requires]
244+
install_requires=install_requires,
246245
)
247246

248247

0 commit comments

Comments
 (0)