Merge pull request #18205 from charris/update-pavement

MAINT: Update pavement.py to work with versioneer.

1 files changed, 20 insertions, 28 deletions

diff --git a/pavement.py b/pavement.py
index 373354432..66c2cf953 100644
--- a/pavement.py
+++ b/pavement.py
@@ -26,6 +26,7 @@ import os
 import sys
 import shutil
 import hashlib
+import textwrap
 
 # The paver package needs to be installed to run tasks
 import paver
@@ -49,25 +50,13 @@ options(installers=Bunch(releasedir="release",
                          installersdir=os.path.join("release", "installers")),)
 
 
-#-----------------------------
-# Generate the release version
-#-----------------------------
+#------------------------
+# Get the release version
+#------------------------
 
 sys.path.insert(0, os.path.dirname(__file__))
 try:
-    setup_py = __import__("setup")
-    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('numpy/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:
-        FULLVERSION += '.dev0+' + GIT_REVISION[:7]
+    from setup import FULLVERSION
 finally:
     sys.path.pop(0)
 
@@ -210,22 +199,25 @@ def write_release_task(options, filename='README'):
         with open(notes) as fnotes:
             freadme.write(fnotes.read())
 
-        freadme.writelines("""
-Checksums
-=========
+        freadme.writelines(textwrap.dedent(
+            """
+            Checksums
+            =========
 
-MD5
----
-::
+            MD5
+            ---
+            ::
 
-""")
+            """))
         freadme.writelines([f'    {c}\n' for c in compute_md5(idirs)])
-        freadme.writelines("""
-SHA256
-------
-::
 
-""")
+        freadme.writelines(textwrap.dedent(
+            """
+            SHA256
+            ------
+            ::
+
+            """))
         freadme.writelines([f'    {c}\n' for c in compute_sha256(idirs)])
 
     # generate md file using pandoc before signing