Merge lp:~jml/testtools/update-readme-python-versions into lp:~testtools-committers/testtools/trunk

Proposed by Jonathan Lange
Status: Merged
Merged at revision: 275
Proposed branch: lp:~jml/testtools/update-readme-python-versions
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 47 lines (+9/-9)
3 files modified
README (+4/-1)
doc/hacking.rst (+1/-4)
doc/overview.rst (+4/-4)
To merge this branch: bzr merge lp:~jml/testtools/update-readme-python-versions
Reviewer Review Type Date Requested Status
testtools committers Pending
Review via email: mp+124657@code.launchpad.net

Commit message

Don't tell lies in the documentation about which Pythons we support

Description of the change

Updates docs since we don't have support for Python 2.4 or 2.5 atm.

jml

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2011-06-07 16:42:16 +0000
3+++ README 2012-09-17 11:50:29 +0000
4@@ -31,7 +31,10 @@
5 Required Dependencies
6 ---------------------
7
8- * Python 2.4+ or 3.0+
9+ * Python 2.6+ or 3.0+
10+
11+If you would like to use testtools for earlier Python's, please use testtools
12+0.9.15.
13
14
15 Optional Dependencies
16
17=== modified file 'doc/hacking.rst'
18--- doc/hacking.rst 2012-05-07 19:17:44 +0000
19+++ doc/hacking.rst 2012-09-17 11:50:29 +0000
20@@ -8,10 +8,7 @@
21 In general, follow `PEP 8`_ except where consistency with the standard
22 library's unittest_ module would suggest otherwise.
23
24-testtools currently supports Python 2.4 and later, including Python 3, so avoid
25-any 2.5-only features like the ``with`` statement. The next release will change
26-this policy to supporting on versions of Python which are maintained by the
27-Python community (e.g. receive security updates).
28+testtools currently supports Python 2.6 and later, including Python 3.
29
30 Copyright assignment
31 --------------------
32
33=== modified file 'doc/overview.rst'
34--- doc/overview.rst 2012-05-02 03:41:51 +0000
35+++ doc/overview.rst 2012-09-17 11:50:29 +0000
36@@ -96,7 +96,7 @@
37 --------------------------
38
39 testtools gives you the very latest in unit testing technology in a way that
40-will work with Python 2.4, 2.5, 2.6, 2.7 and 3.1. The next release of testtools
41-will change that to support versions that are maintained by the Python
42-community instead, to allow the use of modern language features within
43-testtools.
44+will work with Python 2.6, 2.7 and 3.1.
45+
46+If you wish to use testtools with Python 2.4 or 2.5, then please use testtools
47+0.9.15.

Subscribers

People subscribed via source and target branches