Skip to content

Commit

Permalink
REL: forward port changes to release scripts from 0.10.x branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
rgommers committed Nov 13, 2011
1 parent 6bac494 commit f3fb76e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
18 changes: 16 additions & 2 deletions pavement.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -87,7 +87,21 @@
sys.path.insert(0, os.path.dirname(__file__)) sys.path.insert(0, os.path.dirname(__file__))
try: try:
setup_py = __import__("setup") 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: finally:
sys.path.pop(0) sys.path.pop(0)


Expand Down Expand Up @@ -630,5 +644,5 @@ def write_log():


@task @task
def write_release_and_log(): 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')) write_log_task(os.path.join(options.installers.releasedir, 'Changelog'))
2 changes: 2 additions & 0 deletions release.sh
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,8 @@
#! /bin/sh #! /bin/sh
# script to build tarballs, mac os x and windows installers on mac os x # 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. # 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 # 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. # /usr/bin/g++-4.0, while for Python 2.7 we need the default 4.2 version.
Expand Down

0 comments on commit f3fb76e

Please sign in to comment.