[Numpy-svn] r8687 - in trunk: . doc/release

numpy-svn@scip... numpy-svn@scip...
Sat Sep 4 05:10:42 CDT 2010


Author: rgommers
Date: 2010-09-04 05:10:42 -0500 (Sat, 04 Sep 2010)
New Revision: 8687

Modified:
   trunk/doc/release/1.5.0-notes.rst
   trunk/pavement.py
Log:
REL: Apply changes to release notes and paver script in 1.5.x branch to trunk.

Modified: trunk/doc/release/1.5.0-notes.rst
===================================================================
--- trunk/doc/release/1.5.0-notes.rst	2010-09-04 09:53:01 UTC (rev 8686)
+++ trunk/doc/release/1.5.0-notes.rst	2010-09-04 10:10:42 UTC (rev 8687)
@@ -12,8 +12,12 @@
 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.
 
 :pep:`3118` compatibility

Modified: trunk/pavement.py
===================================================================
--- trunk/pavement.py	2010-09-04 09:53:01 UTC (rev 8686)
+++ trunk/pavement.py	2010-09-04 10:10:42 UTC (rev 8687)
@@ -106,7 +106,9 @@
 
 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 @@
 
 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 @@
     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 @@
     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 @@
     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))



More information about the Numpy-svn mailing list