summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-12-09 15:28:06 +0100
committerholger krekel <holger@merlinux.eu>2013-12-09 15:28:06 +0100
commitb05f70be1296bf9c00af1020faeb8a8209e23066 (patch)
tree0855fed98e42046abd597ce6b977572fb742d56d
parentcfc835360b33f3cc9eabecd24f5d04b3d1c25a1c (diff)
downloadtox-b05f70be1296bf9c00af1020faeb8a8209e23066.tar.gz
remove training note
-rwxr-xr-xCHANGELOG2
-rw-r--r--doc/index.txt2
-rw-r--r--tests/test_config.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bcd2387..1bd4117 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@
- drop Python2.5 compatibility because it became too hard due
to the setuptools-2.0 dropping support. tox now has no
- support for creating python2.5 virtualenv environments anymore.
+ support for creating python2.5 based environments anymore.
- merged PR81: new option --force-dep which allows to
override tox.ini specified dependencies in setuptools-style.
diff --git a/doc/index.txt b/doc/index.txt
index 3e5aa99..7fcc310 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -1,8 +1,6 @@
Welcome to the tox automation project
===============================================
-.. note:: second training: `professional testing with Python <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 25-27th November 2013, Leipzig.
-
vision: standardize testing in Python
---------------------------------------------
diff --git a/tests/test_config.py b/tests/test_config.py
index 9cd9d44..5d11d88 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -868,7 +868,7 @@ class TestGlobalOptions:
assert str(env.basepython) == sys.executable
def test_default_environments(self, tmpdir, newconfig, monkeypatch):
- envs = "py24,py25,py26,py27,py31,py32,jython,pypy"
+ envs = "py26,py27,py31,py32,py33,jython,pypy"
inisource = """
[tox]
envlist = %s