Updated for 2.1b2 distribution.
diff --git a/Mac/Build/PythonInterpreter.mcp b/Mac/Build/PythonInterpreter.mcp
index 1ba83c1..7d9430c 100644
--- a/Mac/Build/PythonInterpreter.mcp
+++ b/Mac/Build/PythonInterpreter.mcp
Binary files differ
diff --git a/Mac/Build/PythonStandSmall.mcp b/Mac/Build/PythonStandSmall.mcp
index b28cb22..1178ff3 100644
--- a/Mac/Build/PythonStandSmall.mcp
+++ b/Mac/Build/PythonStandSmall.mcp
Binary files differ
diff --git "a/Mac/Distributions/\050vise\051/Python 2.0.vct" "b/Mac/Distributions/\050vise\051/Python 2.0.vct"
index 6acd929..27a9a35 100644
--- "a/Mac/Distributions/\050vise\051/Python 2.0.vct"
+++ "b/Mac/Distributions/\050vise\051/Python 2.0.vct"
Binary files differ
diff --git "a/Mac/Distributions/\050vise\051/Python 2.1.vct" "b/Mac/Distributions/\050vise\051/Python 2.1.vct"
index 78cab79..bd4bb99 100644
--- "a/Mac/Distributions/\050vise\051/Python 2.1.vct"
+++ "b/Mac/Distributions/\050vise\051/Python 2.1.vct"
Binary files differ
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index b74df4b..4fae0e1 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -424,6 +424,7 @@
(':PythonStandSmallThreading', None)
(':PythonStandalone', None)
(':README', None)
+(':RISCOS', None)
(':Tools:README', None)
(':Tools:audiopy', None)
(':Tools:bgen', '')
@@ -451,4 +452,6 @@
(':readmefiles', None)
(':setup.py', None)
(':site-packages', None)
-(':RISCOS', None)
+(':Mac:Build:_dummy_tkinter.old.mcp', None)
+(':Mac:Build:_dummy_tkinter.mcp.exp', None)
+(':Mac:Build:_dummy_tkinter.mcp', None)
diff --git a/Mac/Distributions/readme.txt b/Mac/Distributions/readme.txt
index d05a15a..5ee1441 100644
--- a/Mac/Distributions/readme.txt
+++ b/Mac/Distributions/readme.txt
@@ -2,7 +2,7 @@
----------------------------------
These notes are mainly for myself, or for whoever tries to make a MacPython
-distribution when I'm fed up with it. They were last updated for 2.1a2.
+distribution when I'm fed up with it. They were last updated for 2.1b2.
- Increase fragment version number in PythonCore and PythonCoreCarbon.
the fragment number is Python's sys.hexversion, it should be set in the
@@ -13,9 +13,27 @@
- Make sure tkresources.rsrc is up-to-date
- fullbuild everything with increase-buildno
- Run configurepython
-- set "no console" on all applets
-- remove alis resource from all applets
- mkdistr binary.include
- mkdistr dev.include
- make distribution archive with Installer Vise
-- test on virgin system. Make sure to test tkinter too.
+ Things to make sure of:
+ - Finder icon positions
+ - Version numbers in "Packages..." window
+ - Version number in "Installer Settings" -> "Easy Install Text"
+ - Version number in "Project" -> Attributes
+ - Version number in "Project" -> PostProcess
+ - Version number in "Internet" -> "Download Sites"
+ - Version number in "Internet" -> "File Groups".
+- test on virgin systems (OSX, OS9, OS8 without Carbon). Make sure to test
+ tkinter too.
+- Upload
+- Update README file in ftp directory
+- Change version number in public_html/macpythonversion.txt .
+- Update macpython.html
+- Send an announcement to:
+ pythonmac-sig@python.org
+ python-dev@python.org
+ python-announce@python.org
+ archivist@info-mac.org
+ http://guide.apple.com/usindex.html
+ http://www.versiontracker.com/ Jack.Jansen@oratrix.com
\ No newline at end of file
diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index d699374..392ec97 100644
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 87
+#define BUILD 90
diff --git a/Mac/ReadMe b/Mac/ReadMe
index f95a940..aa38579 100644
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -1,7 +1,7 @@
-How to install Python 2.1b1 on your Macintosh
+How to install Python 2.1b2 on your Macintosh
---------------------------------------------
-This is the first beta for a MacPython that can run on classic MacOS (from 8.1
+This is a beta MacPython that can run on classic MacOS (from 8.1
onwards) and natively on MacOSX. The installer tries to work out whether you can
use the Carbon version or not. This is also the first MacPython distribution
to be packaged as an active installer, which only downloads the parts you actually
@@ -10,7 +10,8 @@
You should definitely read the Relnotes file too.
A special note about the active installer: do not background it, it will hang
-your machine.
+your machine. This is a general problem with Vise active installers, MindVision
+are working on it.
------
@@ -35,7 +36,7 @@
configuration. By selecting custom install you can bypass these tests and
install what you want.
-If you want 68k support you will have to stay with 1.5.2.
+If you want 68k support you will have to stay with MacPython 1.5.2.
What to install
---------------
@@ -44,6 +45,8 @@
- TK+PIL: Tkinter and support modules, plus Imaging, the Python image manipulation
package (allows you to read, write and display images and do lots of operations on them).
For Carbon MacPython you only get PIL: there is no Tcl/Tk for Carbon yet.
+ This is the reason Classic MacPython is also installed on MacOSX: it allows you
+ to run Tkinter applications, albeit in the MacOS9 box.
- img: another imaging package. Has more file format support and is faster
than imaging, but has only limited operations on images. There is a bridge
between the packages.
@@ -56,7 +59,7 @@
All these except the DevKit are installed with Easy Install.
After the installer finishes it automatically launches the appropriate
-ConfigurePython applet, to finish configuration of your Python. If you run MacOS9
+ConfigurePython applet, to finish configuration of your Python. If you run MacOS9 or later
(or 8 with CarbonLib installed) you can switch back and forth between the classic and
Carbon versions of Python by running either ConfigurePythonClassic or ConfigurePythonCarbon.
@@ -77,10 +80,11 @@
It is probably a good idea to run the automatic tests. Start
Python and "import test.autotest".
-Three tests will fail on MacOS9, all with MemoryErrors: test_sha,
+Two tests will fail on MacOS9, both with MemoryErrors:
test_longexp and test_zlib (on MacOSX nothing should fail).
+
If you increase the PythonInterpreter memory
-partition size they will pass (but for longexp you have to increas it by an
+partition size they will pass (but for longexp you have to increase it by an
incredible amount). It will, however, print some messages
about optional features not supported. You should not worry about these,
they are modules that are supported by Python on other platforms. Also,
@@ -147,6 +151,11 @@
anything in the system folder that has "python" in the name and not
"2.1".
+As of 2.1 the ConfigurePython applets will try to detect incompatible preferences
+files and offer to remove them. This means that re-running ConfigurePython after
+a second install of the same MacPython version (or after moving the Python folder)
+should fix things up correctly.
+
The installer
-------------
diff --git a/Mac/Relnotes b/Mac/Relnotes
index 0adac32..73e2015 100644
--- a/Mac/Relnotes
+++ b/Mac/Relnotes
@@ -6,7 +6,9 @@
marked with [*] and at the bottom of the list.
- This release is Carbon-based, so it runs natively on MacOS 8.6 or
- later and MacOSX.
+ later and MacOSX. (Note that on MacOSX MacPython will run as a normal Mac application,
+ if you want to run Python from the BSD commandline get a unix-Python distribution
+ from www.python.org).
- Alternatively there is a classic PPC interpreter as well. There are two reasons you
might want to use this: (a) you have a pre-MacOS9 system and don't want to install
CarbonLib, or (b) you need Tkinter, for which no Carbon version is available yet.
@@ -14,6 +16,9 @@
- There's a new module (package, actually) mkcwproject which builds CodeWarrior
projects from simple templates. See Distutils or :Mac:scripts:genpluginprojects.py
for examples of use.
+- The Numerical extension has moved to :Lib:site-python from :Extensions. As Numerical
+ is now distutils-based you can easily install newer versions when they become
+ available.
- Windows and Dialogs can now be different beasts, so you may have to call
dlg.GetDialogWindow() where you used to be able to call window methods straight
on the dialog. This also has consequences for code using FrameWork.DialogWindow.
diff --git a/Mac/_checkversion.py b/Mac/_checkversion.py
index 22ffc02..5c017f4 100644
--- a/Mac/_checkversion.py
+++ b/Mac/_checkversion.py
@@ -5,7 +5,7 @@
import pyversioncheck
_PACKAGE="MacPython"
-_VERSION="2.0"
+_VERSION="2.1b2"
_URL="http://www.cwi.nl/~jack/macpythonversion.txt"
try: