From 151b3729d86a52a85949fb53db4d37ef7ca0d6f5 Mon Sep 17 00:00:00 2001 From: James Vega Date: Sun, 22 Mar 2009 14:47:51 -0400 Subject: [PATCH] Bump our minimum required version to 2.4 Signed-off-by: James Vega --- INSTALL | 25 +++++++++---------------- scripts/supybot | 5 +++-- scripts/supybot-plugin-create | 4 ++-- scripts/supybot-wizard | 5 +++-- setup.py | 5 +++-- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/INSTALL b/INSTALL index 595b7a492..1d463f25d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,14 +1,7 @@ Common - First things first: Supybot *requires* at least Python 2.3. There -ain't no getting around it. We do not require any version greater than -2.3, but we will be compatible with any version of Python >= 2.3. If -you're a Python developer, you probably know how superior 2.3 is to -previous incarnations. If you're not, just think about the difference -between a bowl of plain vanilla ice cream and a banana split. Or -something like that. Either way, *We're* Python developers and we like -banana splits. So, be sure to install python2.3 or greater before -continuing. You can get it from http://www.python.org/. + First things first: Supybot *requires* at least Python 2.4. There +ain't no getting around it. You can get it from http://www.python.org/. Recommended Software @@ -30,8 +23,8 @@ UNIX/Linux/*BSD If you're installing Python using your distributor's packages, you may need a python-dev package installed, too. If you don't have a -'/usr/lib/python2.3/distutils' directory or -'/usr/lib/python2.3/config/Makefile' (assuming '/usr/lib/python2.3' is +'/usr/lib/python2.4/distutils' directory or +'/usr/lib/python2.4/config/Makefile' (assuming '/usr/lib/python2.4' is where your Python libs are installed), then you will need a python-dev package. @@ -57,9 +50,9 @@ registry file for your bot. Supybot libraries. It is also recommended that you setup a proper PYTHONPATH environment variable in your shell's init file. - bash -- 'export PYTHONPATH=$HOME/lib/python2.3/site-packages' + bash -- 'export PYTHONPATH=$HOME/lib/python2.4/site-packages' - (t)csh -- 'setenv PYTHONPATH $HOME/lib/python2.3/site-packages' + (t)csh -- 'setenv PYTHONPATH $HOME/lib/python2.4/site-packages' Windows @@ -76,15 +69,15 @@ Python's directory to your path. If you installed Python using the default settings, you would then do the following in the command prompt (otherwise change the path to match your settings):: - set PATH=C:\Python23\;%PATH% + set PATH=C:\Python24\;%PATH% You should now be able to type 'python' to start the Python interpreter. Exit by pressing CTRL-Z and then Return. Now that that's setup, you'll want to cd into the directory that was created when you unzipped Supybot; I'll assume you unzipped it to 'C:\Supybot' for these instructions. From 'C:\Supybot', run 'python setup.py install'. This -will install Supybot under 'C:\Python23\'. You will now have several new -programs installed in 'C:\Python23\Scripts\'. The two that might be of +will install Supybot under 'C:\Python24\'. You will now have several new +programs installed in 'C:\Python24\Scripts\'. The two that might be of particular interest to you, the new user, are 'supybot' and 'supybot-wizard'. The former, 'supybot', is the script to run an actual bot; the latter, 'supybot-wizard', is an in-depth wizard that provides a nice user interface for diff --git a/scripts/supybot b/scripts/supybot index b3e03edc3..6804f62f0 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -2,6 +2,7 @@ ### # Copyright (c) 2003-2004, Jeremiah Fincher +# Copyright (c) 2009, James Vega # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -43,8 +44,8 @@ import shutil import signal import cStringIO as StringIO -if sys.version_info < (2, 3, 0): - sys.stderr.write('This program requires Python >= 2.3.0\n') +if sys.version_info < (2, 4, 0): + sys.stderr.write('This program requires Python >= 2.4.0\n') sys.exit(-1) def _termHandler(signalNumber, stackFrame): diff --git a/scripts/supybot-plugin-create b/scripts/supybot-plugin-create index 6fcab9256..92aa431ae 100644 --- a/scripts/supybot-plugin-create +++ b/scripts/supybot-plugin-create @@ -43,8 +43,8 @@ def error(s): sys.stderr.write(os.linesep) sys.exit(-1) -if sys.version_info < (2, 3, 0): - error('This script requires Python 2.3 or newer.') +if sys.version_info < (2, 4, 0): + error('This script requires Python 2.4 or newer.') import supybot.conf as conf from supybot.questions import * diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index 1723afef1..dc334cddd 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -2,6 +2,7 @@ ### # Copyright (c) 2003-2004, Jeremiah Fincher +# Copyright (c) 2009, James Vega # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -38,8 +39,8 @@ def error(s): sys.stderr.write(os.linesep) sys.exit(-1) -if sys.version_info < (2, 3, 0): - error('This program requires Python >= 2.3.0') +if sys.version_info < (2, 4, 0): + error('This program requires Python >= 2.4.0') import supybot diff --git a/setup.py b/setup.py index f5d24445d..0e2d83253 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher +# Copyright (c) 2009, James Vega # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -31,8 +32,8 @@ import sys -if sys.version_info < (2, 3, 0): - sys.stderr.write("Supybot requires Python 2.3 or newer.\n") +if sys.version_info < (2, 4, 0): + sys.stderr.write("Supybot requires Python 2.4 or newer.\n") sys.exit(-1) import textwrap