From 9886130537b44ca4801f58c34d79002082385f96 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 21 Jan 2020 10:56:45 -0500 Subject: [PATCH 1/2] Fix doc/docs env name confusion --- .travis.yml | 8 ++++++-- tox.ini | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43f2a15..17ac4da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ env: - SEGFAULT_SIGNALS=all matrix: - TOXENV=check - - TOXENV=docs matrix: include: - python: '3.6' @@ -17,7 +16,12 @@ matrix: dist: xenial sudo: required env: - - TOXENV=py37,report,codecov,doc + - TOXENV=py37,report,codecov + - python: '3.7' + dist: xenial + sudo: required + env: + - TOXENV=doc before_install: - python --version - uname -a diff --git a/tox.ini b/tox.ini index ba35b7f..009d6a3 100644 --- a/tox.ini +++ b/tox.ini @@ -4,14 +4,14 @@ envlist = clean, check, - docs, + doc, {py36,py37,pypy3}, report [testenv] basepython = pypy3: {env:TOXPYTHON:pypy3} - {docs,spell}: {env:TOXPYTHON:python3.6} + {doc,spell}: {env:TOXPYTHON:python3.7} py36: {env:TOXPYTHON:python3.6} py37: {env:TOXPYTHON:python3.7} {bootstrap,clean,check,report,codecov}: {env:TOXPYTHON:python3} From 36ea7b3b42d80bad123e5da77a55cb8f65fa8cb2 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 21 Jan 2020 10:59:09 -0500 Subject: [PATCH 2/2] Update the check job on Travis to avoid losing it --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17ac4da..4dede98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ env: global: - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so - SEGFAULT_SIGNALS=all - matrix: - - TOXENV=check matrix: include: - python: '3.6' @@ -22,6 +20,11 @@ matrix: sudo: required env: - TOXENV=doc + - python: '3.7' + dist: xenial + sudo: required + env: + - TOXENV=check before_install: - python --version - uname -a