summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2013-09-15 10:41:57 -0700
committerChris Jerdonek <chris.jerdonek@gmail.com>2013-09-15 10:41:57 -0700
commit4b41dd6bec9bdfc4efa5cf8da772e2c0a38c5320 (patch)
tree0795429157832d1183366c7e4d011040487a593c
parent5d79f3273784008931938d189be8b649c5aea125 (diff)
downloadpystache-4b41dd6bec9bdfc4efa5cf8da772e2c0a38c5320.tar.gz
Remove py24 from tox.ini and add py33.
-rw-r--r--TODO.md4
-rw-r--r--tox.ini5
2 files changed, 3 insertions, 6 deletions
diff --git a/TODO.md b/TODO.md
index 0d42741..dd34b8d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,13 +7,11 @@ In development branch:
* Randomize PYTHONHASHSEED when running tests in Travis CI.
* Add a unit test for the change made in 7ea8e7180c41. This is with regard
to not requiring spec tests when running tests from a downloaded sdist.
-* End support for Python 2.4.
-* Add Python 3.3 to tox file (after deprecating 2.4).
+* Finish removing references to Python 2.4 and noting end of support.
* Look into bypassing the _PartialNode class so that partials can be loaded
and parsed at parse-time instead of at render-time.
* Turn the benchmarking script at pystache/tests/benchmark.py into a command
in pystache/commands, or make it a subcommand of one of the existing
commands (i.e. using a command argument).
* Provide support for logging in at least one of the commands.
-* Make sure command parsing to pystache-test doesn't break with Python 2.4 and earlier.
* Combine pystache-test with the main command.
diff --git a/tox.ini b/tox.ini
index 17cb5a2..a539a37 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,8 @@
# http://pypi.python.org/pypi/tox
#
[tox]
-# Tox 1.4 drops py24 and adds py33. In the current version, we want to
-# support 2.4, so we can't simultaneously support 3.3.
-envlist = py24,py25,py26,py27,py27-yaml,py27-noargs,py31,py32,pypy
+# Tox stopped supporting py24 as of version 1.4.
+envlist = py25,py26,py27,py27-yaml,py27-noargs,py31,py32,py33,pypy
[testenv]
# Change the working directory so that we don't import the pystache located