Merge pull request #232 from leif/2663.dont-test-attribute-order

Make tests work with both Nevow 0.11 and 0.12

diff --git a/NEWS.rst b/NEWS.rst
index 7182a10ba610896f43b72f87ae8096b1e01aea9f..174637e84684365135413d36e15cd5167a25245d 100644 (file)
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -4,6 +4,14 @@
 User-Visible Changes in Tahoe-LAFS
 ==================================
 
+Release ??? (???)
+
+Compatibility and Dependency Updates
+------------------------------------
+
+Tahoe now requires Python 2.7 on all platforms. (#2445)
+
+
 Release 1.10.2 (2015-07-30)
 '''''''''''''''''''''''''''
 

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index ebef68b499a82a4b412b5cbdbb412d28f9cf95dc..50f7f947377a9ff7239abaf36fcf5b36ea04448d 100644 (file)
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -31,13 +31,12 @@ Install Python
 --------------
 
 Check if you already have an adequate version of Python installed by running
-``python -V``. The latest version of Python v2.7 is recommended. Python v2.6.x
-is no longer officially supported, but might still work. Python v3 does not
-work. On Windows, we recommend the use of native Python v2.7, not Cygwin
-Python. If you don't have one of these versions of Python installed,
-`download`_ and install the latest version of Python v2.7. Make sure that the
-path to the installation directory has no spaces in it (e.g. on Windows, do not
-install Python in the "Program Files" directory).
+``python -V``. The latest version of Python v2.7 is recommended. Python
+v2.6.x and v3 do not work. On Windows, we recommend the use of native Python
+v2.7, not Cygwin Python. If you don't have one of these versions of Python
+installed, `download`_ and install the latest version of Python v2.7. Make
+sure that the path to the installation directory has no spaces in it (e.g. on
+Windows, do not install Python in the "Program Files" directory).
 
 .. _download: https://www.python.org/downloads/