Skip to content

Commit

Permalink
Fix failing CI for python 3.4 and 3.5
Browse files Browse the repository at this point in the history
- Matplotlib 3.1+ requires python 3.6+.
- Pillow 6.0+ requires python 3.5+.
  • Loading branch information
wookayin committed Aug 2, 2019
1 parent 05c562c commit c5c4b1b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ matrix:
install:

script:
- pip install -U setuptools pip
# pytest --verbose -s (print stdouts, etc.)
- PYTEST_ADDOPTS="-s -v" python setup.py pytest
- pip install -e .
13 changes: 8 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ def read_version():
]

tests_requires = [
'pytest',
'pytest<5.0',
'numpy',
'Pillow',
'matplotlib' if sys.version_info >= (3, 5) \
else 'matplotlib<3.0'
]
if sys.version_info >= (3, 6):
tests_requires += ['matplotlib>=3.1', 'Pillow']
elif sys.version_info >= (3, 5):
tests_requires += ['matplotlib~=3.0.3', 'Pillow']
else: # <= Python 3.4
tests_requires += ['matplotlib<3.0', 'Pillow<6.0']

__version__ = read_version()

Expand Down Expand Up @@ -105,7 +108,7 @@ def run(self):
packages=['imgcat'],
install_requires=install_requires,
extras_require={'test': tests_requires},
setup_requires=['pytest-runner'],
setup_requires=['pytest-runner<5.0'],
tests_require=tests_requires,
entry_points={
'console_scripts': ['imgcat=imgcat:main'],
Expand Down

0 comments on commit c5c4b1b

Please sign in to comment.