Skip to content

Commit 278bcf6

Browse files
author
Sylvain MARIE
committed
Trying to make travis builds work on python 3.5: moving macimum number of packages to pip.
1 parent 0ec1d84 commit 278bcf6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ci_tools/requirements-conda.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# --- to execute setup.py whatever the goal
22
# pytest-runner
3-
setuptools_scm
43
pandoc
5-
pypandoc
64

75
# --- to install
86

@@ -13,11 +11,9 @@ pypandoc
1311

1412
# --- to generate the reports (see scripts in ci_tools, called by .travis)
1513
# (pip) pytest-html$PYTEST_HTML_VERSION
16-
requests
1714
# (pip) xunitparser
1815
# pytest-cov # ==2.5
19-
coverage
20-
pylint
16+
# pylint
2117

2218
# --- to generate the doc (see .travis)
2319
# (pip) mkdocs-material==2.7.3

ci_tools/requirements-pip.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# --- to execute setup.py whatever the goal
22
pytest-runner
3+
setuptools_scm
4+
pypandoc
35

46
# -- to install
57
makefun
@@ -9,6 +11,7 @@ wrapt
911
# --- to generate the reports (see scripts in ci_tools, called by .travis)
1012
pytest-html$PYTEST_HTML_VERSION
1113
xunitparser
14+
requests
1215

1316
# --- to run the tests
1417
pytest$PYTEST_VERSION
@@ -18,6 +21,7 @@ pytest-harvest
1821

1922
# --- to generate the reports (see scripts in ci_tools, called by .travis)
2023
pytest-cov$PYTEST_COV_VERSION # after 2.6.1 it requires pytest 3.6
24+
coverage
2125

2226
# --- to generate the doc (see .travis)
2327
mkdocs-material # ==2.7.3

0 commit comments

Comments
 (0)