From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 21 Oct 2008 16:32:00 +0000 (-0700)
Subject: setup: remove the developer note about doing without GNU make (the GNU make requireme... 
X-Git-Url: https://git.rkrishnan.org/FOOURL?a=commitdiff_plain;h=26dfc33263ae8e31035ac9379e7a0111be1f884c;p=tahoe-lafs%2Ftahoe-lafs.git

setup: remove the developer note about doing without GNU make (the GNU make requirement is about to hurt Peter if he tries to follow this doc, by the way)
add classifiers showing with which versions of Python it is known to work.
---

diff --git a/docs/install.html b/docs/install.html
index 73c502e6..87c33bd3 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -25,7 +25,7 @@
       <ol>
 	<li><a href="http://gcc.gnu.org/">g++</a> &gt;= v3.3 -- the "Cygwin" version of gcc/g++ works for Cygwin and for Windows; the "Mac Developer Tools" version of gcc/g++ works for Mac</li>
 
-	<li><a href="http://gnu.org/software/make/">GNU make</a> (DEVELOPER NOTE: Oh boy, we're close to removing this dependency from this document!  See http://allmydata.org/trac/tahoe/ticket/505 and http://allmydata.org/trac/tahoe/ticket/506.  Note that Tahoe hackers may want to continue to use the Makefile even if it is no longer necessary to build and test and launch Tahoe.)</li>
+	<li><a href="http://gnu.org/software/make/">GNU make</a></li>
 
 	<li><a href="http://python.org">Python</a> &gt;= v2.4.2 including development headers i.e. "Python.h"</li>
       </ol>
diff --git a/setup.py b/setup.py
index e4773f4e..c24290cb 100644
--- a/setup.py
+++ b/setup.py
@@ -139,15 +139,18 @@ trove_classifiers=[
     "Intended Audience :: System Administrators",
     "Operating System :: Microsoft",
     "Operating System :: Microsoft :: Windows",
+    "Operating System :: Microsoft :: Windows :: Windows NT/2000",
     "Operating System :: Unix",
     "Operating System :: POSIX :: Linux",
     "Operating System :: POSIX",
     "Operating System :: MacOS :: MacOS X",
-    "Operating System :: Microsoft :: Windows :: Windows NT/2000",
     "Operating System :: OS Independent",
     "Natural Language :: English",
     "Programming Language :: C",
     "Programming Language :: Python",
+    "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 2.4",
+    "Programming Language :: Python :: 2.5",
     "Topic :: Utilities",
     "Topic :: System :: Systems Administration",
     "Topic :: System :: Filesystems",