Skip to content

Commit 71c731a

Browse files
author
Sylvain MARIE
committed
fixed travis build
1 parent 93720f1 commit 71c731a

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ before_install:
2323

2424
install:
2525
- pip list
26-
- pip install setuptools_scm # the old pytest-cases and makefun that we use are not universal wheels, this is required by their setup.py
27-
- pip install pytest_cases==1.10.1 # again just for python 2 !
26+
- pip install setuptools_scm # apparently python 2 requires this
2827
- python ci_tools/py_install.py pip ci_tools/requirements-pip.txt
2928
# this does not work anymore on python 2 so lets only do it when needed
3029
- if [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then pip install mkdocs-material mkdocs; fi;

ci_tools/requirements-pip.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ stdlib_list
66
# --- to run the tests
77
pytest #$PYTEST_VERSION
88
pytest-logging # ==2015.11.4
9-
pytest_cases==1.10.1 # we use that precise version otherwise there is a conflict with makefun 1.6.8
10-
makefun==1.6.8 # we use that precise version because it does not have the __version__ attribute.
9+
pytest_cases
10+
makefun
1111

1212
# --- to generate the reports (see scripts in ci_tools, called by .travis)
1313
# pytest-cov==2.6.0 # after 2.6.1 it requires pytest 3.6

0 commit comments

Comments
 (0)