Skip to content

Commit

Permalink
Revert "Python 2.4 is no longer supported"
Browse files Browse the repository at this point in the history
This reverts commit b45eb69.
  • Loading branch information
mnaberez committed Feb 16, 2013
1 parent b45eb69 commit 1315094
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

language: python
python:
- "2.4"
- "2.5"
- "2.6"
- "2.7"
Expand Down
3 changes: 0 additions & 3 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
------------------

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 1315094

Please sign in to comment.