From 18708e4ad51e32ef0aa09e15aaa5bfa7240cf2c9 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Fri, 19 Oct 2018 18:09:33 +0200 Subject: travis: preemptively switch to VM-based jobs Rational: https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 63d0333a..fba548e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ dist: trusty -sudo: false language: python python: - &latest_py2 2.7 -- cgit v1.2.3 From 544f4b939943c80bdaf468e72c4cbeddd6cfe585 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Fri, 19 Oct 2018 18:17:51 +0200 Subject: travis: fix support for Python 3.7 and add support for 3.8 --- .travis.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index fba548e9..627c1f63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,29 @@ dist: trusty language: python -python: -- &latest_py2 2.7 -- 3.4 -- 3.5 -- &latest_py3 3.6 -- nightly -- pypy -- pypy3 jobs: fast_finish: true include: - - python: *latest_py3 + - &latest_py2 + python: 2.7 + - <<: *latest_py2 env: LANG=C - - python: *latest_py2 + - python: pypy + - python: pypy3 + - python: 3.4 + - python: 3.5 + - &default_py + python: 3.6 + - &latest_py3 + python: 3.7 + dist: xenial + - <<: *latest_py3 env: LANG=C - - stage: deploy (to PyPI for tagged commits) + - python: 3.8-dev + dist: xenial + - <<: *default_py + stage: deploy (to PyPI for tagged commits) if: tag IS present - python: *latest_py3 install: skip script: skip after_success: true -- cgit v1.2.3 From d6c05b4b63c337b6280496cd6a9e63b6a99ce53f Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Fri, 19 Oct 2018 18:24:18 +0200 Subject: travis: ensure test requirements are installed and up-to-date Particularly: update pip so PEP 518 support is available. --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 627c1f63..7e61d8a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,12 +43,14 @@ jobs: cache: pip install: -# ensure we have recent pip/setuptools -- pip install --upgrade pip setuptools + +# ensure we have recent pip/setuptools/wheel +- pip install --disable-pip-version-check --upgrade pip setuptools wheel # need tox to get started -- pip install tox tox-venv +- pip install --upgrade tox tox-venv # Output the env, to verify behavior +- pip freeze --all - env # update egg_info based on setup.py in checkout -- cgit v1.2.3 From 5a9fd0f4110e2ff3e914b186fd4d9dcd46c4da92 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Fri, 19 Oct 2018 19:33:16 +0200 Subject: appveyor: ensure test requirements are installed and up-to-date --- appveyor.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f50f8386..b90de892 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,9 +21,12 @@ cache: - '%LOCALAPPDATA%\pip\Cache' test_script: - - "python bootstrap.py" - - "python -m pip install tox" - - "tox -- --cov" + - python --version + - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel + - pip install --upgrade tox tox-venv + - pip freeze --all + - python bootstrap.py + - tox -- --cov after_test: - tox -e coverage,codecov -- cgit v1.2.3 From c562f10429782b23b62df038b78350efeb54291c Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Fri, 19 Oct 2018 19:45:23 +0200 Subject: appveyor: only clone the first 50 commits --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index b90de892..ef4a9f7e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +clone_depth: 50 + environment: APPVEYOR: True -- cgit v1.2.3 From 32bbe849d9427f1c3ef7c7d93ced324c4d90a2ad Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Sun, 21 Oct 2018 16:28:04 +0200 Subject: coverage: disable gcov processing We don't need it and it generates a couple of error messages on AppVeyor: FIND: Parameter format not correct [...] Error running `find 'C:\projects\setuptools' -not - [...] --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 3b03b7db..a2f850df 100644 --- a/tox.ini +++ b/tox.ini @@ -37,7 +37,7 @@ commands=coverage erase description=[Only run on CI]: Upload coverage data to codecov deps=codecov skip_install=True -commands=codecov --file {toxworkdir}/coverage.xml +commands=codecov -X gcov --file {toxworkdir}/coverage.xml [testenv:docs] deps = -r{toxinidir}/docs/requirements.txt -- cgit v1.2.3 From 604fc1ec955db2ce6e0c021073462cb3f4fac667 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Sun, 21 Oct 2018 17:16:31 +0200 Subject: coverage: ignore invalid Python 3.8 coverage data --- .travis.yml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e61d8a4..0e53bd29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,9 @@ jobs: - <<: *latest_py2 env: LANG=C - python: pypy + env: DISABLE_COVERAGE=1 # Don't run coverage on pypy (too slow). - python: pypy3 + env: DISABLE_COVERAGE=1 - python: 3.4 - python: 3.5 - &default_py @@ -21,6 +23,7 @@ jobs: env: LANG=C - python: 3.8-dev dist: xenial + env: DISABLE_COVERAGE=1 # Ignore invalid coverage data. - <<: *default_py stage: deploy (to PyPI for tagged commits) if: tag IS present @@ -59,28 +62,20 @@ install: script: - | ( # Run testsuite. - set -ex - case $TRAVIS_PYTHON_VERSION in - pypy*) - # Don't run coverage on pypy (too slow). - tox - ;; - *) + if [ -z "$DISABLE_COVERAGE" ] + then tox -- --cov - ;; - esac + else + tox + fi ) after_success: - | ( # Upload coverage data. - set -ex - case $TRAVIS_PYTHON_VERSION in - pypy*) - ;; - *) + if [ -z "$DISABLE_COVERAGE" ] + then export TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME tox -e coverage,codecov - ;; - esac + fi ) -- cgit v1.2.3