aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-10-30 05:01:35 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2018-10-29 17:01:35 -0400
commitaa5f7a69b0af7242d3505752daac816240247c64 (patch)
tree9e2eef9d01bb25998c7673eda90cad7caeb98a0a
parent2f15dfbd5b49ef44bc61ab8e614a48a9579d2420 (diff)
downloadcryptography-aa5f7a69b0af7242d3505752daac816240247c64.tar.gz
cryptography-aa5f7a69b0af7242d3505752daac816240247c64.tar.bz2
cryptography-aa5f7a69b0af7242d3505752daac816240247c64.zip
Simplify build matrix (#4543)
* simplify pep8 * remove buster/sid 2.7 jobs
-rw-r--r--.travis.yml10
-rw-r--r--tox.ini6
2 files changed, 1 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml
index 5b8bbbbc..de90b06d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,15 +74,9 @@ matrix:
- python: 3.5
services: docker
env: TOXENV=py35 DOCKER=pyca/cryptography-runner-stretch
- - python: 2.7
- services: docker
- env: TOXENV=py27 DOCKER=pyca/cryptography-runner-buster
- python: 3.6
services: docker
env: TOXENV=py36 DOCKER=pyca/cryptography-runner-buster
- - python: 2.7
- services: docker
- env: TOXENV=py27 DOCKER=pyca/cryptography-runner-sid
- python: 3.6
services: docker
env: TOXENV=py36 DOCKER=pyca/cryptography-runner-sid
@@ -111,10 +105,8 @@ matrix:
apt:
packages:
- libenchant-dev
- - python: 2.7
- env: TOXENV=pep8
- python: 3.4
- env: TOXENV=py3pep8
+ env: TOXENV=pep8
- python: 2.7
env: DOWNSTREAM=pyopenssl
diff --git a/tox.ini b/tox.ini
index ea5995e9..7e6b56ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,12 +56,6 @@ commands =
sphinx-build -W -b linkcheck docs docs/_build/html
[testenv:pep8]
-extras =
- pep8test
-commands =
- flake8 .
-
-[testenv:py3pep8]
basepython = python3
extras =
pep8test