diff options
| -rw-r--r-- | doc/release/1.5.0-notes.rst | 6 | ||||
| -rw-r--r-- | pavement.py | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/doc/release/1.5.0-notes.rst b/doc/release/1.5.0-notes.rst index 5f814e057..94cf89ff7 100644 --- a/doc/release/1.5.0-notes.rst +++ b/doc/release/1.5.0-notes.rst @@ -12,7 +12,11 @@ Python 3 compatibility This is the first NumPy release which is compatible with Python 3. Support for Python 3 and Python 2 is done from a single code base. Extensive notes on changes can be found at -`<http://projects.scipy.org/numpy/browser/trunk/doc/Py3K.txt>`_. +`<http://projects.scipy.org/numpy/browser/trunk/doc/Py3K.txt>`_. + +Note that the Numpy testing framework relies on nose, which does not have a +Python 3 compatible release yet. A working Python 3 branch of nose can be found +at `<http://bitbucket.org/jpellerin/nose3/>`_ however. Porting of SciPy to Python 3 is expected to be completed soon. diff --git a/pavement.py b/pavement.py index 47076cc19..5bef2253b 100644 --- a/pavement.py +++ b/pavement.py @@ -106,7 +106,9 @@ options(bootstrap=Bunch(bootstrap_dir="bootstrap"), MPKG_PYTHON = { "2.5": ["/Library/Frameworks/Python.framework/Versions/2.5/bin/python"], - "2.6": ["/Library/Frameworks/Python.framework/Versions/2.6/bin/python"] + "2.6": ["/Library/Frameworks/Python.framework/Versions/2.6/bin/python"], + "2.7": ["/Library/Frameworks/Python.framework/Versions/2.7/bin/python"], + "3.1": ["/Library/Frameworks/Python.framework/Versions/3.1/bin/python3"], } SSE3_CFG = {'ATLAS': r'C:\local\lib\yop\sse3'} @@ -117,6 +119,8 @@ SITECFG = {"sse2" : SSE2_CFG, "sse3" : SSE3_CFG, "nosse" : NOSSE_CFG} if sys.platform =="darwin": WINDOWS_PYTHON = { + "3.1": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python31/python.exe"], + "2.7": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python27/python.exe"], "2.6": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python26/python.exe"], "2.5": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python25/python.exe"] } @@ -125,6 +129,8 @@ if sys.platform =="darwin": MAKENSIS = ["wine", "makensis"] elif sys.platform == "win32": WINDOWS_PYTHON = { + "3.1": ["C:\Python31\python3.exe"], + "2.7": ["C:\Python27\python.exe"], "2.6": ["C:\Python26\python.exe"], "2.5": ["C:\Python25\python.exe"], } @@ -134,6 +140,8 @@ elif sys.platform == "win32": MAKENSIS = ["makensis"] else: WINDOWS_PYTHON = { + "3.1": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python31/python.exe"], + "2.7": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python27/python.exe"], "2.6": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python26/python.exe"], "2.5": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python25/python.exe"] } @@ -194,7 +202,7 @@ def bdist_superpack(options): pyver = options.python_version def copy_bdist(arch): # Copy the wininst in dist into the release directory - if pyver[0] >= 3: + if int(pyver[0]) >= 3: source = os.path.join('build', 'py3k', 'dist', wininst_name(pyver)) else: source = os.path.join('dist', wininst_name(pyver)) |