Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

REL: forward port changes to release scripts from 0.10.x branch.

  • Loading branch information...
commit f3fb76ed3ef6cc237a79102509a6d93fabce1d1d 1 parent 6bac494
@rgommers rgommers authored
Showing with 18 additions and 2 deletions.
  1. +16 −2 pavement.py
  2. +2 −0  release.sh
View
18 pavement.py
@@ -87,7 +87,21 @@
sys.path.insert(0, os.path.dirname(__file__))
try:
setup_py = __import__("setup")
- FULLVERSION = setup_py.FULLVERSION
+ FULLVERSION = setup_py.VERSION
+ # This is duplicated from setup.py
+ if os.path.exists('.git'):
+ GIT_REVISION = setup_py.git_version()
+ elif os.path.exists('scipy/version.py'):
+ # must be a source distribution, use existing version file
+ from numpy.version import git_revision as GIT_REVISION
+ else:
+ GIT_REVISION = "Unknown"
+
+ if not setup_py.ISRELEASED:
+ if GIT_REVISION == "Unknown":
+ FULLVERSION += '.dev'
+ else:
+ FULLVERSION += '.dev-' + GIT_REVISION[:7]
finally:
sys.path.pop(0)
@@ -630,5 +644,5 @@ def write_log():
@task
def write_release_and_log():
- write_release_task(os.path.join(options.installers.releasedir, 'NOTES.txt'))
+ write_release_task(os.path.join(options.installers.releasedir, 'README.txt'))
write_log_task(os.path.join(options.installers.releasedir, 'Changelog'))
View
2  release.sh
@@ -1,6 +1,8 @@
#! /bin/sh
# script to build tarballs, mac os x and windows installers on mac os x
+export PYTHONPATH=''
+
# Check we're using the correct g++/c++ for the 64-bit 2.7 dmg.
# 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.
Please sign in to comment.
Something went wrong with that request. Please try again.