Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

RC2 release (to deal with python 2.6 massive failures on Mac OS X).

  • Loading branch information...
commit 898d1308a9f60f9226cc1a70eb7400a8889ff825 1 parent 97fcbc3
@cournape cournape authored
Showing with 17 additions and 6 deletions.
  1. +16 −5 pavement.py
  2. +1 −1  setup.py
View
21 pavement.py
@@ -126,7 +126,11 @@
wininst=Bunch(pyver="2.5", scratch=True))
def parse_numpy_version(pyexec):
- cmd = [pyexec, "-c", "'import numpy; print numpy.version.version'"]
+ if isinstance(pyexec, str):
+ cmd = [pyexec, "-c", "'import numpy; print numpy.version.version'"]
+ else:
+ # sequence for pyexec
+ cmd = pyexec + ["-c", "'import numpy; print numpy.version.version'"]
# Execute in shell because launching python from python does not work
# (hangs)
@@ -359,14 +363,21 @@ def bdist_superpack(options):
subprocess.check_call(['makensis', 'scipy-superinstaller.nsi'],
cwd=SUPERPACK_BUILD)
+ pyver = options.wininst.pyver
+
+ numver = parse_numpy_version(WINE_PYS[pyver])
+ numverstr = ".".join(["%i" % i for i in numver])
+ if pyver == "2.5" and not numver[:2] == (1, 2):
+ raise valueerror("scipy 0.7.x should be built against numpy 1.2.x for python 2.5 (detected %s)" % numverstr)
+ elif pyver == "2.6" and not numver[:2] == (1, 3):
+ raise valueerror("scipy 0.7.x should be built against numpy 1.3.x for python 2.6 (detected %s)" % numverstr)
+
# Copy the superpack into installers dir
if not os.path.exists(INSTALLERS_DIR):
os.makedirs(INSTALLERS_DIR)
- source = os.path.join(SUPERPACK_BUILD,
- superpack_name(options.wininst.pyver, FULLVERSION))
- target = os.path.join(INSTALLERS_DIR,
- superpack_name(options.wininst.pyver, FULLVERSION))
+ source = os.path.join(SUPERPACK_BUILD, superpack_name(pyver, FULLVERSION))
+ target = os.path.join(INSTALLERS_DIR, superpack_name(pyver, FULLVERSION))
shutil.copy(source, target)
@task
View
2  setup.py
@@ -43,7 +43,7 @@
MAJOR = 0
MINOR = 7
MICRO = 1
-ISRELEASED = False
+ISRELEASED = True
VERSION = '%d.%d.%drc2' % (MAJOR, MINOR, MICRO)
# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
Please sign in to comment.
Something went wrong with that request. Please try again.