Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

REL: set version to 1.6.0rc1

Also a small update to the release scripts.
  • Loading branch information...
commit 65bcb41240e260e5f8c85e4e30a8f6bc68c72567 1 parent 215c97e
@rgommers rgommers authored
Showing with 22 additions and 3 deletions.
  1. +1 −1  pavement.py
  2. +19 −0 release.sh
  3. +2 −2 setup.py
View
2  pavement.py
@@ -102,7 +102,7 @@
# Start/end of the log (from git)
LOG_START = 'v1.5.0'
-LOG_END = 'v1.6.0b1'
+LOG_END = 'v1.6.0rc1'
#-------------------------------------------------------
View
19 release.sh
@@ -5,6 +5,17 @@
# downloads, i.e. two versions for Python 2.7. The Intel 32/64-bit version is
# for OS X 10.6+, the other dmg installers are for 10.3+ and are built on 10.5
+# Check we're using the correct g++/c++ for the 32-bit 2.6 version we build for
+# the docs and the 64-bit 2.7 dmg installer.
+# We do this because for Python 2.6 we use a symlink on the PATH to select
+# /usr/bin/g++-4.0, while for Python 2.7 we need the default 4.2 version.
+export PATH=~/Code/tmp/gpp40temp/:$PATH
+gpp="$(g++ --version | grep "4.0")"
+if [ -z "$gpp" ]; then
+ echo "Wrong g++ version, we need 4.0 to compile scipy with Python 2.6"
+ exit 1
+fi
+
# bootstrap needed to ensure we build the docs from the right scipy version
paver bootstrap
source bootstrap/bin/activate
@@ -19,6 +30,14 @@ paver pdf
paver sdist
export MACOSX_DEPLOYMENT_TARGET=10.6
+# Use GCC 4.2 for 64-bit OS X installer for Python 2.7
+export PATH=~/Code/tmp/gpp42temp/:$PATH
+gpp="$(g++ --version | grep "4.2")"
+if [ -z "$gpp" ]; then
+ echo "Wrong g++ version, we need 4.2 for 64-bit binary for Python 2.7"
+ exit 1
+fi
+
paver dmg -p 2.7 # 32/64-bit version
paver bdist_superpack -p 3.2
View
4 setup.py
@@ -57,8 +57,8 @@
MAJOR = 1
MINOR = 6
MICRO = 0
-ISRELEASED = False
-VERSION = '%d.%d.%db3' % (MAJOR, MINOR, MICRO)
+ISRELEASED = True
+VERSION = '%d.%d.%rc1' % (MAJOR, MINOR, MICRO)
# Return the git revision as a string
def git_version():
Please sign in to comment.
Something went wrong with that request. Please try again.