aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2020-04-30 15:15:14 +1000
committerBen Sturmfels <ben@sturm.com.au>2020-04-30 16:45:42 +1000
commit663d052c70a6281dc76d12884a6b9f1447056b0c (patch)
tree16fcbc4efff63b8821a6da8f402eb45f22205c7a
parent06d8fc891778600ad282aa92f7eb143bad8ccb55 (diff)
downloadmediagoblin-663d052c70a6281dc76d12884a6b9f1447056b0c.tar.lz
mediagoblin-663d052c70a6281dc76d12884a6b9f1447056b0c.tar.xz
mediagoblin-663d052c70a6281dc76d12884a6b9f1447056b0c.zip
Fix Python 2 package dependencies and sub-dependencies [#5595].
This fixes the installation process *right now* on Python 2. The problem is that packages are dropping Python 2 support all over the place and due to our (deliberate) loose dependency version specifications and the loose sub-dependency version specifications, it's one horrible mess. But it works right now. Next up I'll be pinning all the currently installed Python 2 packages and all dependencies.
-rw-r--r--setup.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index b2f2074e..f1de81fc 100644
--- a/setup.py
+++ b/setup.py
@@ -45,9 +45,14 @@ if PY2:
pyversion_install_requires.append('sqlalchemy-migrate>=0.9.6')
pyversion_install_requires.append('mock==1.0.1') # mock is in the stdlib for 3.3+
# PyPI version (1.4.2) does not have proper Python 3 support
- pyversion_install_requires.append('ExifRead')
pyversion_install_requires.append('Markdown<3.2')
- pyversion_install_requires.append('billiard<3.6.0,>=3.5.0.2')
+ pyversion_install_requires.append('billiard<3.6.0,>=3.5.0.2') # Celery
+ pyversion_install_requires.append('Sphinx<2.0.0')
+ pyversion_install_requires.append('MarkupSafe<2.0.0') # Jinja2
+ pyversion_install_requires.append('pyparsing<3.0.0') # Sphinx
+ pyversion_install_requires.append('pytest<5.0.0')
+ pyversion_install_requires.append('pygments<2.6.0') # Sphinx?
+ pyversion_install_requires.append('zipp<2.0.0') # jsonschema
install_requires = [
'waitress',