Merge remote-tracking branch 'upstream/maint/3.2.x'

Author: effigies

.github/workflows/misc.yml

@@ -2,7 +2,7 @@ name: Miscellaneous checks
 
 # This file runs doctests on the documentation and style checks
 
-on: [push]
+on: [push, pull_request]
 
 defaults:
   run:

.github/workflows/pre-release.yml

@@ -2,7 +2,7 @@ name: Pre-release checks
 
 # This file tests against pre-release wheels for dependencies
 
-on: [push]
+on: [push, pull_request]
 
 defaults:
   run:

.github/workflows/stable.yml

@@ -6,7 +6,7 @@ name: Stable tests
 # * Dependencies: minimum requirements, optional requirements
 # * Installation methods: setup.py, sdist, wheel, archive
 
-on: [push]
+on: [push, pull_request]
 
 defaults:
   run:
@@ -21,7 +21,7 @@ jobs:
         os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
         python-version: [3.6, 3.7, 3.8, 3.9]
         architecture: ['x64', 'x86']
-        install: ['setup']
+        install: ['pip']
         check: ['test']
         pip-flags: ['']
         depends: ['REQUIREMENTS']
@@ -54,7 +54,7 @@ jobs:
           # Clean install imports only with package-declared dependencies
           - os: ubuntu-latest
             python-version: 3.6
-            install: setup
+            install: pip
             check: skiptests
             pip-flags: ''
             depends: ''

nibabel/_version.py

@@ -6,7 +6,7 @@
 # that just contains the computed version number.
 
 # This file is released into the public domain. Generated by
-# versioneer-0.18 (https://github.com/warner/python-versioneer)
+# versioneer-0.19 (https://github.com/python-versioneer/python-versioneer)
 
 """Git implementation of _version.py."""
 
@@ -58,7 +58,7 @@ class NotThisMethod(Exception):
 
 
 def register_vcs_handler(vcs, method):  # decorator
-    """Decorator to mark a method as the handler for a particular VCS."""
+    """Create decorator to mark a method as the handler of a VCS."""
     def decorate(f):
         """Store f in HANDLERS[vcs][method]."""
         if vcs not in HANDLERS:
@@ -94,9 +94,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
         if verbose:
             print("unable to find command, tried %s" % (commands,))
         return None, None
-    stdout = p.communicate()[0].strip()
-    if sys.version_info[0] >= 3:
-        stdout = stdout.decode()
+    stdout = p.communicate()[0].strip().decode()
     if p.returncode != 0:
         if verbose:
             print("unable to run %s (error)" % dispcmd)
@@ -174,6 +172,10 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         raise NotThisMethod("Short version file found")
     date = keywords.get("date")
     if date is not None:
+        # Use only the last line.  Previous lines may contain GPG signature
+        # information.
+        date = date.splitlines()[-1]
+
         # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant
         # datestamp. However we prefer "%ci" (which expands to an "ISO-8601
         # -like" string, which we must then edit to make compliant), because
@@ -314,6 +316,9 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
     # commit date: see ISO-8601 comment in git_versions_from_keywords()
     date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"],
                        cwd=root)[0].strip()
+    # Use only the last line.  Previous lines may contain GPG signature
+    # information.
+    date = date.splitlines()[-1]
     pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
 
     return pieces
@@ -352,18 +357,18 @@ def render_pep440(pieces):
 
 
 def render_pep440_pre(pieces):
-    """TAG[.post.devDISTANCE] -- No -dirty.
+    """TAG[.post0.devDISTANCE] -- No -dirty.
 
     Exceptions:
-    1: no tags. 0.post.devDISTANCE
+    1: no tags. 0.post0.devDISTANCE
     """
     if pieces["closest-tag"]:
         rendered = pieces["closest-tag"]
         if pieces["distance"]:
-            rendered += ".post.dev%d" % pieces["distance"]
+            rendered += ".post0.dev%d" % pieces["distance"]
     else:
         # exception #1
-        rendered = "0.post.dev%d" % pieces["distance"]
+        rendered = "0.post0.dev%d" % pieces["distance"]
     return rendered
 
 
@@ -399,7 +404,7 @@ def render_pep440_old(pieces):
 
     The ".dev0" means dirty.
 
-    Eexceptions:
+    Exceptions:
     1: no tags. 0.postDISTANCE[.dev0]
     """
     if pieces["closest-tag"]:

tools/ci/build_archive.sh

@@ -21,6 +21,8 @@ elif [ "$INSTALL_TYPE" == "wheel" ]; then
 elif [ "$INSTALL_TYPE" == "archive" ]; then
     export ARCHIVE="package.tar.gz"
     git archive -o $ARCHIVE HEAD
+elif [ "$INSTALL_TYPE" == "pip" ]; then
+    export ARCHIVE="."
 fi
 
 set +eux