Selaa lähdekoodia

Revert "Python 2.4 is no longer supported"

This reverts commit b45eb69ba0ef076f54740b2e13e89d9f98772b96.
Mike Naberezny 12 vuotta sitten
vanhempi
commit
131509441c
6 muutettua tiedostoa jossa 8 lisäystä ja 7 poistoa
  1. 1 0
      .travis.yml
  2. 0 3
      CHANGES.txt
  3. 1 1
      README.rst
  4. 1 1
      docs/introduction.rst
  5. 2 2
      setup.py
  6. 3 0
      tox.ini

+ 1 - 0
.travis.yml

@@ -3,6 +3,7 @@
 
 language: python
 python:
+  - "2.4"
   - "2.5"
   - "2.6"
   - "2.7"

+ 0 - 3
CHANGES.txt

@@ -20,9 +20,6 @@ Next release
 - Fixed a bug where supervisord would crash if the syslog handler was used
   and supervisord received SIGUSR2 (log reopen request).
 
-- Python 2.4 is no longer supported.  The last version that supported Python
-  2.4 is Supervisor 3.0b1.
-
 3.0b1 (2012-09-10)
 ------------------
 

+ 1 - 1
README.rst

@@ -13,7 +13,7 @@ likely work fine on most UNIX systems.
 
 Supervisor will not run at all under any version of Windows.
 
-Supervisor is known to work with Python 2.5 or later but will not work
+Supervisor is known to work with Python 2.4 or later but will not work
 under any version of Python 3.
 
 Documentation

+ 1 - 1
docs/introduction.rst

@@ -162,5 +162,5 @@ It will likely work fine on most UNIX systems.
 
 Supervisor will *not* run at all under any version of Windows.
 
-Supervisor is known to work with Python 2.5 or later but will not work
+Supervisor is known to work with Python 2.4 or later but will not work
 under any version of Python 3.

+ 2 - 2
setup.py

@@ -15,8 +15,8 @@
 import os
 import sys
 
-if sys.version_info[:2] < (2, 5) or sys.version_info[0] > 2:
-    msg = ("Supervisor requires Python 2.5 or later but does not work on "
+if sys.version_info[:2] < (2, 4) or sys.version_info[0] > 2:
+    msg = ("Supervisor requires Python 2.4 or later but does not work on "
            "any version of Python 3.  You are using version %s.  Please "
            "install using a supported version." % sys.version)
     sys.stderr.write(msg)

+ 3 - 0
tox.ini

@@ -1,5 +1,8 @@
 # !!! When making changes, make sure to also edit .travis.yml !!!
 
+# Note: Supervisor supports Python 2.4 but "py24" is not listed in envlist
+# because tox has a dependency on distribute, which no longer supports 2.4.
+
 [tox]
 envlist =
     py25,py26,py27