Skip to content

Commit

Permalink
Fix missing distutils log import .
Browse files Browse the repository at this point in the history
  • Loading branch information
cournape committed Apr 1, 2009
1 parent a4c5e55 commit d8fc4ad
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@

# Return the svn version as a string (copied from setuptools)
def svn_revision():
from numpy.distutils import log
revision = 0
urlre = re.compile('url="([^"]+)"')
revre = re.compile('committed-rev="(\d+)"')
Expand Down Expand Up @@ -90,13 +91,6 @@ def svn_revision():

return str(revision)

FULLVERSION = VERSION
if not ISRELEASED:
FULLVERSION += '.dev'
# If in git or something, bypass the svn rev
if os.path.exists('.svn'):
FULLVERSION += svn_revision()

# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
# update it when the contents of directories change.
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
Expand All @@ -107,6 +101,13 @@ def svn_revision():
# a lot more robust than what was previously being used.
__builtin__.__NUMPY_SETUP__ = True

FULLVERSION = VERSION
if not ISRELEASED:
FULLVERSION += '.dev'
# If in git or something, bypass the svn rev
if os.path.exists('.svn'):
FULLVERSION += svn_revision()

def write_version_py(filename='numpy/version.py'):
cnt = """
# THIS FILE IS GENERATED FROM NUMPY SETUP.PY
Expand Down

0 comments on commit d8fc4ad

Please sign in to comment.