Skip to content

Commit 459ce5e

Browse files
techtonikjasonamyers
authored andcommitted
Merged in techtonik/virtualenvwrapper/techtonik/toxini-edited-online-with-bitbucket-1525341850929 (pull request #69)
Drop Python 2.6 support in tox * tox.ini: get dependencies from requirements.txt * Fix tox tests for Python 2.6 They fail because of missing NullHandler (#289) * Python 2.6 support is dropped https://bitbucket.org/virtualenvwrapper/virtualenvwrapper/pull-requests/69/fix-tests-with-python-26/diff#comment-63267802 * tox.ini: drop Python 2.6 support * developers.rst: update supported Python versions Approved-by: Jason Myers <[email protected]>
1 parent 9f30ada commit 459ce5e

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

docs/source/developers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The test suite for virtualenvwrapper uses shunit2_ and tox_. The
6969
shunit2 source is included in the ``tests`` directory, but tox must be
7070
installed separately (``pip install tox``).
7171

72-
To run the tests under bash, zsh, and ksh for Python 2.4 through 2.7,
72+
To run the tests under bash, zsh, and ksh for Python 2.7 through 3.6,
7373
run ``tox`` from the top level directory of the hg repository.
7474

7575
To run individual test scripts, use a command like::

tox.ini

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
[tox]
2-
envlist = py27,py26,py33,py34,py35,py36,zsh,ksh,style
2+
envlist = py27,py33,py34,py35,py36,zsh,ksh,style
33

44
[testenv]
55
install_command = pip install -U {opts} {packages}
66
commands = bash ./tests/run_tests {envdir} []
7-
deps = virtualenv
8-
virtualenv-clone
9-
stevedore
7+
deps = -rrequirements.txt
108
setenv =
119
TOXIC = true
1210
SHELL = /bin/bash
@@ -19,18 +17,6 @@ whitelist_externals =
1917
deps = flake8
2018
commands = flake8 virtualenvwrapper docs/source/conf.py
2119

22-
# Not sure why the basepython setting is needed, but on my system if
23-
# it isn't included then the python version picked up for 2.6 is
24-
# actually 2.7.
25-
#
26-
# IF THIS CAUSES YOU A PROBLEM COMMENT IT OUT BEFORE RUNNING THE TESTS.
27-
#
28-
[testenv:py26]
29-
basepython=python2.6
30-
setenv =
31-
SHELL = /bin/bash
32-
commands = bash ./tests/run_tests {envdir} []
33-
3420
[testenv:zsh]
3521
basepython=python2.7
3622
setenv =

0 commit comments

Comments
 (0)