From a98151e6dd374d7234f20a8ef695478775d68b78 Mon Sep 17 00:00:00 2001 From: Adrien Barbaresi Date: Tue, 28 Jan 2020 16:31:59 +0100 Subject: [PATCH 1/7] Extended travis config - Python versions added (3.9, pypy) - OS added (MacOS, 2 different versions) --- .travis.yml | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f32ecd..9e34936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,45 @@ language: python +os: linux +cache: pip -python: - - 2.7 - - 3.5 - - 3.6 - - 3.7 - - 3.8 +matrix: + include: + - name: "Python 2.7 on Linux" + python: 2.7 + - name: "Python 3.5 on Linux" + python: 3.5 + - name: "Python 3.6 on Linux" + python: 3.6 + - name: "Python 3.7 on Linux" + python: 3.7 + - name: "Python 3.8 on Linux" + dist: xenial + python: 3.8 + - name: "Python 3.9 Nightly on Linux" + dist: bionic + python: nightly + - name: "Pypy 3 on Linux" + python: pypy3 + - name: "Python 3 on older macOS" + os: osx + osx_image: xcode9.4 + language: shell + before_install: + - sw_vers + - python3 --version + - pip3 --version + - name: "Python 3 on macOS" + os: osx + osx_image: xcode11 + language: shell + before_install: + - sw_vers + - python3 --version + - pip3 --version + allow_failures: + - python: nightly + - python: pypy3 + - os: osx install: - travis_retry pip install -U pip wheel tox-travis From 8ea6a20e01061668dbdf9287ef658019ceffa78f Mon Sep 17 00:00:00 2001 From: Adrien Barbaresi Date: Tue, 28 Jan 2020 20:33:23 +0100 Subject: [PATCH 2/7] Skip missing interpreters in tox.ini --- tox.ini | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 168ece2..a9ec295 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,10 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py35, py36, py37, py38, doc +envlist = + py{27,35,36,37,38,py,py3}, doc +skip_missing_interpreters = + True [testenv] deps = @@ -19,7 +22,8 @@ deps = # requires a Compiler and the build dependencies), you can download # it from http://www.lfd.uci.edu/~gohlke/pythonlibs/#lxml and install it via # $PYTHONDIR\Scripts\pip.exe install *.whl -sitepackages=True +sitepackages= + True commands = pip install -r requirements.txt -e ".[test]" py.test From 9a851025559ae06438a35819cbebe685f23ad536 Mon Sep 17 00:00:00 2001 From: Adrien Barbaresi Date: Tue, 28 Jan 2020 20:42:42 +0100 Subject: [PATCH 3/7] Set TOXENV for macOS tests --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9e34936..b7a013d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ matrix: os: osx osx_image: xcode9.4 language: shell + env: TOXENV=py37 before_install: - sw_vers - python3 --version @@ -32,6 +33,7 @@ matrix: os: osx osx_image: xcode11 language: shell + env: TOXENV=py37 before_install: - sw_vers - python3 --version From 44ee1c4a87e97a6076da733973cbbe745c2a7949 Mon Sep 17 00:00:00 2001 From: Yuri Baburov Date: Wed, 29 Jan 2020 17:57:54 +0700 Subject: [PATCH 4/7] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b7a013d..4e4b932 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ matrix: - name: "Python 3 on macOS" os: osx osx_image: xcode11 + python: python3 language: shell env: TOXENV=py37 before_install: From 28db33a1adb64c4bd7139ed9333849ac6f9241c7 Mon Sep 17 00:00:00 2001 From: Yuri Baburov Date: Wed, 29 Jan 2020 20:12:03 +0700 Subject: [PATCH 5/7] Update .travis.yml --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e4b932..27d9fb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ matrix: - name: "Python 3.9 Nightly on Linux" dist: bionic python: nightly + - name: "Pypy on Linux" + python: pypy - name: "Pypy 3 on Linux" python: pypy3 - name: "Python 3 on older macOS" @@ -32,15 +34,15 @@ matrix: - name: "Python 3 on macOS" os: osx osx_image: xcode11 - python: python3 language: shell - env: TOXENV=py37 + env: TOXENV=py37 PYENV_VERSION=3.7 before_install: - sw_vers - python3 --version - pip3 --version allow_failures: - python: nightly + - python: pypy - python: pypy3 - os: osx From 8c122cc862de656d2526a3fe6d244a5e930329a9 Mon Sep 17 00:00:00 2001 From: Yuri Baburov Date: Wed, 29 Jan 2020 20:36:12 +0700 Subject: [PATCH 6/7] Update .travis.yml --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 27d9fb0..231b893 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ matrix: include: - name: "Python 2.7 on Linux" python: 2.7 + env: TOXENV=py27 - name: "Python 3.5 on Linux" python: 3.5 - name: "Python 3.6 on Linux" @@ -20,6 +21,7 @@ matrix: python: nightly - name: "Pypy on Linux" python: pypy + env: TOXENV=py27 - name: "Pypy 3 on Linux" python: pypy3 - name: "Python 3 on older macOS" @@ -35,7 +37,7 @@ matrix: os: osx osx_image: xcode11 language: shell - env: TOXENV=py37 PYENV_VERSION=3.7 + env: TOXENV=py37 before_install: - sw_vers - python3 --version @@ -47,8 +49,9 @@ matrix: - os: osx install: - - travis_retry pip install -U pip wheel tox-travis - - travis_retry pip install -U -r requirements.txt -e ".[test]" + - if echo $TOXENV | grep -q py27; then PIP=pip; else PIP=pip3; fi + - travis_retry $PIP install -U pip wheel tox-travis + - travis_retry $PIP install -U -r requirements.txt -e ".[test]" script: - tox From baf03e0d8e074bf532902d2ed6fdbbcc9d7fc91c Mon Sep 17 00:00:00 2001 From: Yuri Baburov Date: Wed, 29 Jan 2020 20:44:57 +0700 Subject: [PATCH 7/7] Update .travis.yml --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 231b893..3bb9748 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ matrix: include: - name: "Python 2.7 on Linux" python: 2.7 - env: TOXENV=py27 + env: PIP=pip - name: "Python 3.5 on Linux" python: 3.5 - name: "Python 3.6 on Linux" @@ -21,10 +21,10 @@ matrix: python: nightly - name: "Pypy on Linux" python: pypy - env: TOXENV=py27 + env: PIP=pip - name: "Pypy 3 on Linux" python: pypy3 - - name: "Python 3 on older macOS" + - name: "Python 3.7 on older macOS" os: osx osx_image: xcode9.4 language: shell @@ -33,7 +33,7 @@ matrix: - sw_vers - python3 --version - pip3 --version - - name: "Python 3 on macOS" + - name: "Python 3.7 on macOS" os: osx osx_image: xcode11 language: shell @@ -49,7 +49,7 @@ matrix: - os: osx install: - - if echo $TOXENV | grep -q py27; then PIP=pip; else PIP=pip3; fi + - if [ $PIP ]; then true; else PIP=pip3; fi - travis_retry $PIP install -U pip wheel tox-travis - travis_retry $PIP install -U -r requirements.txt -e ".[test]"