From b9eec5c2466c84e9a1427af077d49b198b1b5d8d Mon Sep 17 00:00:00 2001 From: Johan Walles Date: Sun, 29 May 2022 18:40:13 +0200 Subject: [PATCH 1/3] Try fixing CI failure Inspired by https://github.com/tensorflow/tensorflow/pull/56071/files --- tox.ini | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index d880c1d..7f8d97c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ # For more information about tox, see https://tox.readthedocs.io/en/latest/ [tox] -envlist = py27,py35,py36,py37,py38,py39,pypy,flake8,mypy2,mypy3,wheel,py27-testwheel,py37-testwheel +envlist = py27,py35,py36,py37,py38,py39,pypy,flake8,mypy2,mypy3,wheel,py27-testwheel,py3-testwheel [flake8] # At the time of adding this value, it's what makes us pass. @@ -9,7 +9,12 @@ max-line-length = 146 [testenv] setenv = GITDIR = {toxinidir} -deps = pytest>=3.0 +deps = + # See . + # Must happen first! + importlib-metadata > 4 + + pytest>=3.0 commands = pytest -p no:avoidance {posargs:tests} whitelist_externals = /bin/sh @@ -61,7 +66,7 @@ commands = pip uninstall --yes pytest-avoidance sh -c "pip install dist/*-py2.py3-*.whl" -[testenv:py37-testwheel] +[testenv:py3-testwheel] depends = wheel commands = pip uninstall --yes pytest-avoidance From 473735682ab09a6243cef4b734730d72fb8a88c8 Mon Sep 17 00:00:00 2001 From: Johan Walles Date: Sun, 29 May 2022 21:44:19 +0200 Subject: [PATCH 2/3] Attempt 2, just bump to a newer Python version --- .travis.yml | 12 +++++------- tox.ini | 9 ++------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37367a9..a270b31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,19 +11,17 @@ matrix: env: TOX_ENV=py27 - python: 2.7 env: TOX_ENV=wheel,py27-testwheel - - python: 3.5 - env: TOX_ENV=py35 - - python: 3.6 - env: TOX_ENV=py36 - python: 3.7 env: TOX_ENV=py37 - python: 3.8 env: TOX_ENV=py38 - python: 3.9 env: TOX_ENV=py39 - - python: 3.7 - env: TOX_ENV=wheel,py37-testwheel - - python: 3.6 + - python: 3.10 + env: TOX_ENV=py310 + - python: 3.10 + env: TOX_ENV=wheel,py3-testwheel + - python: 3.10 env: TOX_ENV=flake8 - python: 3.8 env: TOX_ENV=mypy2 diff --git a/tox.ini b/tox.ini index 7f8d97c..b205590 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ # For more information about tox, see https://tox.readthedocs.io/en/latest/ [tox] -envlist = py27,py35,py36,py37,py38,py39,pypy,flake8,mypy2,mypy3,wheel,py27-testwheel,py3-testwheel +envlist = py27,py37,py38,py39,py310,pypy,flake8,mypy2,mypy3,wheel,py27-testwheel,py3-testwheel [flake8] # At the time of adding this value, it's what makes us pass. @@ -9,12 +9,7 @@ max-line-length = 146 [testenv] setenv = GITDIR = {toxinidir} -deps = - # See . - # Must happen first! - importlib-metadata > 4 - - pytest>=3.0 +deps = pytest>=3.0 commands = pytest -p no:avoidance {posargs:tests} whitelist_externals = /bin/sh From 99714b529d0ae22db121241e621807ad300d7958 Mon Sep 17 00:00:00 2001 From: Johan Walles Date: Sun, 29 May 2022 21:49:31 +0200 Subject: [PATCH 3/3] Use a 3.10 supporting Linux distro --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a270b31..0f7dc91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ -# Required for Python 3.7 as of: 2019feb14 +# Required for Python 3.10 as of: 2022may29 # https://docs.travis-ci.com/user/languages/python/ -dist: xenial +os: linux +dist: focal -sudo: false language: python -matrix: +jobs: include: - python: 2.7 env: TOX_ENV=py27