Skip to content

Commit fab8e75

Browse files
author
Sylvain MARIE
committed
Now travis should only deploy on python 3.7. Fixed deployment error with travis not compliant with python 3.5
1 parent e74d4cc commit fab8e75

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ matrix:
6767
sudo: true
6868
- name: "Python 3.7 Pytest latest"
6969
python: 3.7
70-
env: PYTEST_VERSION="" PYTEST_HTML_VERSION="==1.9.0"
70+
env: PYTEST_VERSION="" PYTEST_HTML_VERSION="==1.9.0" SHOULD_DEPLOY="true"
7171
dist: xenial
7272
sudo: true
7373

@@ -101,7 +101,7 @@ install:
101101
- python ci_tools/py_install.py conda ci_tools/requirements-conda.txt
102102
- python ci_tools/py_install.py pip ci_tools/requirements-pip.txt
103103
# mkdocs does not work anymore on python 2 so lets only do it when needed
104-
- if [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then pip install mkdocs-material mkdocs; fi;
104+
- if [ "${SHOULD_DEPLOY}" = "true" ]; then pip install mkdocs-material mkdocs; fi;
105105
# travis-specific installs
106106
- pip install PyGithub # for ci_tools/github_release.py
107107
- pip install codecov # See https://github.com/codecov/example-python.
@@ -110,7 +110,7 @@ install:
110110
- python -m pytest --version # - pytest --version
111111

112112
script:
113-
#- if [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then python ci_tools/headers_check.py; fi;
113+
#- if [ "${SHOULD_DEPLOY}" = "true" ]; then python ci_tools/headers_check.py; fi;
114114
# - coverage run tests.py
115115
- pip install .
116116
- python -c "import os; os.chdir('..'); import pytest_cases"
@@ -147,7 +147,7 @@ after_success:
147147
# push but only if this is not a build triggered by a pull request
148148
# note: here we use the --dirty flag so that mkdocs does not clean the additional reports that we copied in the site
149149
# note: do not use the --dirty flag as it breaks client-side search
150-
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ] && [ "${PYTEST_VERSION}" = "<3" ]; then echo "Pushing to github"; PYTHONPATH=pytest_cases/ mkdocs gh-deploy -v -f docs/mkdocs.yml --remote-name gh-remote; git push gh-remote gh-pages; fi;
150+
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${SHOULD_DEPLOY}" = "true" ]; then echo "Pushing to github"; PYTHONPATH=pytest_cases/ mkdocs gh-deploy -v -f docs/mkdocs.yml --remote-name gh-remote; git push gh-remote gh-pages; fi;
151151
else
152152
echo "File 'ci_tools/github_travis_rsa' has not been created, please check your encrypted repo token in .travis.yml, on the line starting with 'openssl aes-256-cbc...'"
153153
fi
@@ -160,8 +160,8 @@ deploy:
160160
secure: "iWtaX7rsW1e1dQGMEo4nAa6O9cv27rT7pZMrHe2sN/oODf1CErBLD5MarReA1XLXEcqdO/Qvsx6+djl0Z3daVa6Pk7FMt+5lKBuw1QPUNuU56/MAty36nnH06H4627GZK5gEFbV107BNqnt+1eR7QIlndFVtImdA1m61JyW/5ydCgCy4ppCTNGxwxpkPWimxXMVVwS/vMT/TNzTIUIJfAXObDoBra2bVvyymjPAIJoJWghE/FG1mbsLIhMUq/HWE5k22LwcFWNHRzVddfSCzh6Qw2NyFJaV4QjCLxK3Ia6AmrF7gjpC8GqTSnoClgiW1N9Cl6+h8099BLq46FSAw4eJjkD5BrWzKxtdHg1TBWhoqEPmP4gxTbk/3lT5nYl0Vo0xdXsvjIuiHmy3RGQVNutTUT7ms1w7It0ioX2wPLaTseafOWzf4y1CQceB6AKEXCAFKA0zsj5oxDXokVTSgLpvgFaKHFfy1zz60Ga8TqJY2GD70oxA31NgmGRO+Quamas8iIsFwTmKEjLRtRt/ShTG96wYvZNlOMU4DQ4X5h0BHc5HbZLl8CVWY3NNXISbtH48E+mdvVvw5fJMnan6aK3AGLmn3i+pPX9dfn25avQ2+ulPJbvrxK/x8Ys/ZD2zDlZUdZRS8ffqfeyYFVbMwlt60DkP98zZYibdkGYPcwno="
161161
on:
162162
tags: true
163-
python: 3.5 #only one of the builds have to be deployed
164-
condition: $PYTEST_VERSION = "<3"
163+
# python: 3.5 #only one of the builds have to be deployed
164+
condition: $SHOULD_DEPLOY = "true"
165165
# server: https://test.pypi.org/legacy/
166166
distributions: "sdist bdist_wheel"
167167

@@ -171,8 +171,8 @@ deploy:
171171
skip_cleanup: true
172172
on:
173173
tags: true
174-
python: 3.5 #only one of the builds have to be deployed
175-
condition: $PYTEST_VERSION = "<3"
174+
# only one of the builds have to be deployed
175+
condition: $SHOULD_DEPLOY = "true"
176176

177177
# TODO update zenodo record
178178

ci_tools/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cleanup() {
1212

1313
trap "cleanup" INT TERM EXIT
1414

15-
if [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then
15+
if [ "${SHOULD_DEPLOY}" = "true" ]; then
1616
# full
1717
# Run tests with "python -m pytest" to use the correct version of pytest
1818
echo -e "\n\n****** Running tests ******\n\n"

0 commit comments

Comments
 (0)