Skip to content

Commit

Permalink
version lock on Python 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mikedh committed Feb 5, 2020
1 parent 3e7ba77 commit b6f4392
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -100,8 +100,6 @@ script:
# pyembree, scikit-image, python-fcl not available everywhere
- if [[ "$PYTHON_VERSION" == "3.6" ]]; then conda install pyembree scikit-image; fi;
- if [[ "$PYTHON_VERSION" == "3.6" ]]; then pip install python-fcl; fi;
# lxml stopped supporting EOL Python
- if [[ "$PYTHON_VERSION" == "3.4" ]]; then pip install lxml==4.3.5 shapely==1.6.4; fi;

# install most deps here
- pip install -q .[easy]
Expand Down
13 changes: 12 additions & 1 deletion setup.py
Expand Up @@ -62,6 +62,17 @@
'pyinstrument', # profile code
'coveralls']) # report coverage stats


# python 3.4 support has been dropped from upstream packages
# version lock those packages here so install succeeds
if (sys.version_info.major, sys.version_info.minor) == (3, 4):
# remove version-free requirements
requirements_easy.remove('lxml')
requirements_easy.remove('shapely')
# add working version locked requirements
requirements_easy.add('lxml==4.3.5')
requirements_easy.add('shapely==1.6.4')

# if someone wants to output a requirements file
# `python setup.py --list-all > requirements.txt`
if '--list-all' in sys.argv:
Expand Down Expand Up @@ -115,4 +126,4 @@
extras_require={'test': list(requirements_test),
'easy': list(requirements_easy),
'all': list(requirements_all)}
)
)

0 comments on commit b6f4392

Please sign in to comment.