Skip to content

Commit

Permalink
Remove py26 oldest tests (certbot#4856)
Browse files Browse the repository at this point in the history
* Remove py26 oldest tests.

The only systems where we support Python 2.6 use certbot-auto so the oldest
supported versions of our dependencies are never used when using supported
installation methods. Let's remove this unnecessary and slow test.

* Make tox.ini happy

* Remove py26-oldest from Travis
  • Loading branch information
bmw authored and pde committed Jun 21, 2017
1 parent 93f094a commit 1e6ea09
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 22 deletions.
7 changes: 0 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ matrix:
- sudo cat /var/log/mysql/error.log
- ps aux | grep mysql
services: docker
- python: "2.6"
env: TOXENV=py26-oldest BOULDER_INTEGRATION=1
sudo: required
after_failure:
- sudo cat /var/log/mysql/error.log
- ps aux | grep mysql
services: docker
- python: "2.7"
env: TOXENV=py27_install BOULDER_INTEGRATION=1
sudo: required
Expand Down
27 changes: 12 additions & 15 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,20 @@ commands =
{[base]install_and_test} {[base]py26_packages}
python tests/lock_test.py

[testenv:py26-oldest]
[testenv]
commands =
{[testenv:py26]commands}
{[base]install_and_test} {[base]non_py26_packages}
setenv =
PYTHONPATH = {toxinidir}
PYTHONHASHSEED = 0

[testenv:py27-oldest]
commands =
{[testenv]commands}
setenv =
{[testenv]setenv}
CERTBOT_NO_PIN=1
# cffi<=1.7 is required for oldest tests due to
# https://bitbucket.org/cffi/cffi/commits/18cdf37d6b2691301a15b0e54f49757ebd4ed0f2?at=default
# requests<=2.11.1 required for oldest tests due to
Expand All @@ -78,20 +89,6 @@ deps =
requests<=2.11.1
zope.component==4.0.2
zope.interface==4.0.5
setenv =
CERTBOT_NO_PIN=1

[testenv]
commands =
{[testenv:py26]commands}
{[base]install_and_test} {[base]non_py26_packages}
setenv =
PYTHONPATH = {toxinidir}
PYTHONHASHSEED = 0
py27-oldest: {[testenv:py26-oldest]setenv}
# https://testrun.org/tox/latest/example/basic.html#special-handling-of-pythonhas
deps =
py27-oldest: {[testenv:py26-oldest]deps}

[testenv:py27_install]
basepython = python2.7
Expand Down

0 comments on commit 1e6ea09

Please sign in to comment.