Skip to content
Browse files

REL: update release scripts for 0.13.1, fix some minor OS X issues.

Numpy 1.5.1 doesn't work for Python 3.x with scipy, use 1.7.1 instead.
Note that this was also done for the 0.13.0 release.
  • Loading branch information...
1 parent f2aa4e1 commit cca51810e7268dca86a1e657d7b5a33d5a332259 @rgommers rgommers committed Nov 16, 2013
Showing with 7 additions and 7 deletions.
  1. +6 −6 pavement.py
  2. +1 −1 tools/scipy-macosx-installer/new-create-dmg
View
12 pavement.py
@@ -112,11 +112,11 @@
#-----------------------------------
# Source of the release notes
-RELEASE = 'doc/release/0.13.0-notes.rst'
+RELEASE = 'doc/release/0.13.1-notes.rst'
# Start/end of the log (from git)
LOG_START = 'v0.12.0'
-LOG_END = 'v0.13.0'
+LOG_END = 'v0.13.1'
#-------------------------------------------------------
@@ -491,8 +491,10 @@ def bdist_mpkg():
def _build_mpkg(pyver):
numver = parse_numpy_version(MPKG_PYTHON[pyver])
numverstr = ".".join(["%i" % i for i in numver])
- if not numver == (1, 5, 1):
- raise ValueError("Scipy 0.9.x should be built against numpy 1.5.1, (detected %s)" % numverstr)
+ if pyver[0] == '2' and (not numver == (1, 5, 1)):
+ raise ValueError("Scipy 0.13.x should be built against numpy 1.5.1, (detected %s)" % numverstr)
+ elif pyver[0] == '3' and (not numver == (1, 7, 1)):
+ raise ValueError("Scipy 0.13.x should be built against numpy 1.7.1, (detected %s)" % numverstr)
prepare_static_gfortran_runtime("build")
# account for differences between Python 2.7.1 versions from python.org
@@ -502,8 +504,6 @@ def _build_mpkg(pyver):
ldflags = "-undefined dynamic_lookup -bundle -arch i386 -arch ppc -Wl,-search_paths_first"
ldflags += " -L%s" % os.path.join(os.path.dirname(__file__), "build")
- if pyver == "2.5":
- sh("CC=gcc-4.0 LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, MPKG_PYTHON[pyver]))
sh("LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, MPKG_PYTHON[pyver]))
View
2 tools/scipy-macosx-installer/new-create-dmg
@@ -60,7 +60,7 @@ DMG_DIR="$(cd $DMG_DIRNAME > /dev/null; pwd)"
DMG_NAME="$(basename "$DMG_PATH")"
DMG_TEMP_NAME="$DMG_DIR/rw.${DMG_NAME}"
SRC_FOLDER="$(cd "$2" > /dev/null; pwd)"
-DMG_SIZE=34m
+DMG_SIZE=40m
test -z "$VOLUME_NAME" && VOLUME_NAME="$(basename "$DMG_PATH" .dmg)"
# Create the image

0 comments on commit cca5181

Please sign in to comment.
Something went wrong with that request. Please try again.