From f84a01bfa8a83a9afa9e885b997715c940be2cb7 Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Tue, 9 Apr 2019 11:27:49 -0700 Subject: [PATCH 1/2] remove duplicate CPython3.5 CI --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 738b6f3d..96815b78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,17 +33,6 @@ matrix: - python: 3.4 env: TOXENV=py34-compatibility # CPython 3.5 - - python: 3.5 - env: TOXENV=py35-base - - python: 3.5 - env: TOXENV=py35-cryptography-only - - python: 3.5 - env: TOXENV=py35-pycryptodome-norsa - - python: 3.5 - env: TOXENV=py35-pycrypto-norsa - - python: 3.5 - env: TOXENV=py35-compatibility - # CPython 3.5 - python: 3.5 env: TOXENV=py35-base - python: 3.5 From 89ca3380ef6e4baaffe17a3af5a7e5a411229c08 Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Tue, 9 Apr 2019 11:28:21 -0700 Subject: [PATCH 2/2] fix CI configuration to actually use the intended CPython versions --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96815b78..8a100592 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,36 +45,36 @@ matrix: env: TOXENV=py35-compatibility # CPython 3.6 - python: 3.6 - env: TOXENV=py35-base + env: TOXENV=py36-base - python: 3.6 - env: TOXENV=py35-cryptography-only + env: TOXENV=py36-cryptography-only - python: 3.6 - env: TOXENV=py35-pycryptodome-norsa + env: TOXENV=py36-pycryptodome-norsa - python: 3.6 - env: TOXENV=py35-pycrypto-norsa + env: TOXENV=py36-pycrypto-norsa - python: 3.6 - env: TOXENV=py35-compatibility + env: TOXENV=py36-compatibility # CPython 3.7 # xenial + sudo are currently needed to get 3.7 # https://github.com/travis-ci/travis-ci/issues/9815 - python: 3.7 - env: TOXENV=py35-base + env: TOXENV=py37-base dist: xenial sudo: true - python: 3.7 - env: TOXENV=py35-cryptography-only + env: TOXENV=py37-cryptography-only dist: xenial sudo: true - python: 3.7 - env: TOXENV=py35-pycryptodome-norsa + env: TOXENV=py37-pycryptodome-norsa dist: xenial sudo: true - python: 3.7 - env: TOXENV=py35-pycrypto-norsa + env: TOXENV=py37-pycrypto-norsa dist: xenial sudo: true - python: 3.7 - env: TOXENV=py35-compatibility + env: TOXENV=py37-compatibility dist: xenial sudo: true # PyPy 5.3.1