diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-10-30 05:01:35 +0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-10-29 17:01:35 -0400 |
commit | aa5f7a69b0af7242d3505752daac816240247c64 (patch) | |
tree | 9e2eef9d01bb25998c7673eda90cad7caeb98a0a | |
parent | 2f15dfbd5b49ef44bc61ab8e614a48a9579d2420 (diff) | |
download | cryptography-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.yml | 10 | ||||
-rw-r--r-- | tox.ini | 6 |
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 @@ -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 |