[rpms/python-xnat4tests] rawhide: Update to 0.4.1

[Filipe Rosset <rosset.filipe@gmail.com>]

A new commit has been pushed.

Repo   : rpms/python-xnat4tests
Branch : rawhide
Commit : 7bcdedb046e99c8793cd7b0b97754b68f99c71d1
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-08-16T01:22:51-03:00
Stats  : +8/-1835 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/python-xnat4tests/c/7bcdedb046e99c8793cd7b0b97754b68f99c71d1?branch=rawhide

Log:
Update to 0.4.1

---
diff --git a/.gitignore b/.gitignore
index 7d8f067..1146023 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xnat4tests-0.3.14.tar.gz
+/xnat4tests-0.4.1.tar.gz

diff --git a/0001-Update-Versioneer-and-fix-config.patch b/0001-Update-Versioneer-and-fix-config.patch
deleted file mode 100644
index 6496b0a..0000000
--- a/0001-Update-Versioneer-and-fix-config.patch
+++ /dev/null
@@ -1,1820 +0,0 @@
-From de1f80941c7fab587d09ccd664b19e848ff86635 Mon Sep 17 00:00:00 2001
-From: Sandro <devel@penguinpee.nl>
-Date: Sun, 20 Apr 2025 17:37:38 +0200
-Subject: [PATCH] Update Versioneer and fix config
-
-Set `tag_prefix` in `setup.cfg`.
-Updating to version 0.29 changes the license of `versioneer.py` as
-well as the produced `_version.py` from CC0-1.0 to Unlicense.
----
- setup.cfg              |   4 +-
- versioneer.py          | 558 +++++++++++++++++++++++++++--------------
- xnat4tests/_version.py | 258 +++++++++----------
- 3 files changed, 497 insertions(+), 323 deletions(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index 670e591..5683494 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,6 +1,6 @@
- [metadata]
- # This includes the license file in the wheel.
--license_file = LICENSE
-+license_files = LICENSE
- 
- [bdist_wheel]
- # This flag says to generate wheels that support both Python 2 and Python
-@@ -16,7 +16,7 @@ VCS = git
- style = pep440
- versionfile_source = xnat4tests/_version.py
- versionfile_build = xnat4tests/_version.py
--tag_prefix =
-+tag_prefix = v
- 
- [flake8]
- doctests = True
-diff --git a/versioneer.py b/versioneer.py
-index b4cd1d6..1e3753e 100644
---- a/versioneer.py
-+++ b/versioneer.py
-@@ -1,5 +1,5 @@
- 
--# Version: 0.21
-+# Version: 0.29
- 
- """The Versioneer - like a rocketeer, but for versions.
- 
-@@ -9,12 +9,12 @@ The Versioneer
- * like a rocketeer, but for versions!
- * https://github.com/python-versioneer/python-versioneer
- * Brian Warner
--* License: Public Domain
--* Compatible with: Python 3.6, 3.7, 3.8, 3.9 and pypy3
-+* License: Public Domain (Unlicense)
-+* Compatible with: Python 3.7, 3.8, 3.9, 3.10, 3.11 and pypy3
- * [![Latest Version][pypi-image]][pypi-url]
- * [![Build Status][travis-image]][travis-url]
- 
--This is a tool for managing a recorded version number in distutils-based
-+This is a tool for managing a recorded version number in setuptools-based
- python projects. The goal is to remove the tedious and error-prone "update
- the embedded version string" step from your release process. Making a new
- release should be as easy as recording a new tag in your version-control
-@@ -23,10 +23,38 @@ system, and maybe making new tarballs.
- 
- ## Quick Install
- 
-+Versioneer provides two installation modes. The "classic" vendored mode installs
-+a copy of versioneer into your repository. The experimental build-time dependency mode
-+is intended to allow you to skip this step and simplify the process of upgrading.
-+
-+### Vendored mode
-+
- * `pip install versioneer` to somewhere in your $PATH
--* add a `[versioneer]` section to your setup.cfg (see [Install](INSTALL.md))
--* run `versioneer install` in your source tree, commit the results
--* Verify version information with `python setup.py version`
-+   * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is
-+     available, so you can also use `conda install -c conda-forge versioneer`
-+* add a `[tool.versioneer]` section to your `pyproject.toml` or a
-+  `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md))
-+   * Note that you will need to add `tomli; python_version < "3.11"` to your
-+     build-time dependencies if you use `pyproject.toml`
-+* run `versioneer install --vendor` in your source tree, commit the results
-+* verify version information with `python setup.py version`
-+
-+### Build-time dependency mode
-+
-+* `pip install versioneer` to somewhere in your $PATH
-+   * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is
-+     available, so you can also use `conda install -c conda-forge versioneer`
-+* add a `[tool.versioneer]` section to your `pyproject.toml` or a
-+  `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md))
-+* add `versioneer` (with `[toml]` extra, if configuring in `pyproject.toml`)
-+  to the `requires` key of the `build-system` table in `pyproject.toml`:
-+  ```toml
-+  [build-system]
-+  requires = ["setuptools", "versioneer[toml]"]
-+  build-backend = "setuptools.build_meta"
-+  ```
-+* run `versioneer install --no-vendor` in your source tree, commit the results
-+* verify version information with `python setup.py version`
- 
- ## Version Identifiers
- 
-@@ -231,9 +259,10 @@ resolve it.
- To upgrade your project to a new release of Versioneer, do the following:
- 
- * install the new Versioneer (`pip install -U versioneer` or equivalent)
--* edit `setup.cfg`, if necessary, to include any new configuration settings
--  indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details.
--* re-run `versioneer install` in your source tree, to replace
-+* edit `setup.cfg` and `pyproject.toml`, if necessary,
-+  to include any new configuration settings indicated by the release notes.
-+  See [UPGRADING](./UPGRADING.md) for details.
-+* re-run `versioneer install --[no-]vendor` in your source tree, to replace
-   `SRC/_version.py`
- * commit any changed files
- 
-@@ -263,9 +292,8 @@ number of intermediate scripts.
- 
- To make Versioneer easier to embed, all its code is dedicated to the public
- domain. The `_version.py` that it creates is also in the public domain.
--Specifically, both are released under the Creative Commons "Public Domain
--Dedication" license (CC0-1.0), as described in
--https://creativecommons.org/publicdomain/zero/1.0/ .
-+Specifically, both are released under the "Unlicense", as described in
-+https://unlicense.org/.
- 
- [pypi-image]: https://img.shields.io/pypi/v/versioneer.svg
- [pypi-url]: https://pypi.python.org/pypi/versioneer/
-@@ -287,14 +315,34 @@ import os
- import re
- import subprocess
- import sys
--from typing import Callable, Dict
-+from pathlib import Path
-+from typing import Any, Callable, cast, Dict, List, Optional, Tuple, Union
-+from typing import NoReturn
-+import functools
-+
-+have_tomllib = True
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    try:
-+        import tomli as tomllib
-+    except ImportError:
-+        have_tomllib = False
- 
- 
- class VersioneerConfig:
-     """Container for Versioneer configuration parameters."""
- 
-+    VCS: str
-+    style: str
-+    tag_prefix: str
-+    versionfile_source: str
-+    versionfile_build: Optional[str]
-+    parentdir_prefix: Optional[str]
-+    verbose: Optional[bool]
-+
- 
--def get_root():
-+def get_root() -> str:
-     """Get the project root directory.
- 
-     We require that all commands are run from the project root, i.e. the
-@@ -302,13 +350,23 @@ def get_root():
-     """
-     root = os.path.realpath(os.path.abspath(os.getcwd()))
-     setup_py = os.path.join(root, "setup.py")
-+    pyproject_toml = os.path.join(root, "pyproject.toml")
-     versioneer_py = os.path.join(root, "versioneer.py")
--    if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)):
-+    if not (
-+        os.path.exists(setup_py)
-+        or os.path.exists(pyproject_toml)
-+        or os.path.exists(versioneer_py)
-+    ):
-         # allow 'python path/to/setup.py COMMAND'
-         root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
-         setup_py = os.path.join(root, "setup.py")
-+        pyproject_toml = os.path.join(root, "pyproject.toml")
-         versioneer_py = os.path.join(root, "versioneer.py")
--    if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)):
-+    if not (
-+        os.path.exists(setup_py)
-+        or os.path.exists(pyproject_toml)
-+        or os.path.exists(versioneer_py)
-+    ):
-         err = ("Versioneer was unable to run the project root directory. "
-                "Versioneer requires setup.py to be executed from "
-                "its immediate directory (like 'python setup.py COMMAND'), "
-@@ -325,7 +383,7 @@ def get_root():
-         my_path = os.path.realpath(os.path.abspath(__file__))
-         me_dir = os.path.normcase(os.path.splitext(my_path)[0])
-         vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0])
--        if me_dir != vsr_dir:
-+        if me_dir != vsr_dir and "VERSIONEER_PEP518" not in globals():
-             print("Warning: build in %s is using versioneer.py from %s"
-                   % (os.path.dirname(my_path), versioneer_py))
-     except NameError:
-@@ -333,31 +391,51 @@ def get_root():
-     return root
- 
- 
--def get_config_from_root(root):
-+def get_config_from_root(root: str) -> VersioneerConfig:
-     """Read the project setup.cfg file to determine Versioneer config."""
-     # This might raise OSError (if setup.cfg is missing), or
-     # configparser.NoSectionError (if it lacks a [versioneer] section), or
-     # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
-     # the top of versioneer.py for instructions on writing your setup.cfg .
--    setup_cfg = os.path.join(root, "setup.cfg")
--    parser = configparser.ConfigParser()
--    with open(setup_cfg, "r") as cfg_file:
--        parser.read_file(cfg_file)
--    VCS = parser.get("versioneer", "VCS")  # mandatory
--
--    # Dict-like interface for non-mandatory entries
--    section = parser["versioneer"]
-+    root_pth = Path(root)
-+    pyproject_toml = root_pth / "pyproject.toml"
-+    setup_cfg = root_pth / "setup.cfg"
-+    section: Union[Dict[str, Any], configparser.SectionProxy, None] = None
-+    if pyproject_toml.exists() and have_tomllib:
-+        try:
-+            with open(pyproject_toml, 'rb') as fobj:
-+                pp = tomllib.load(fobj)
-+            section = pp['tool']['versioneer']
-+        except (tomllib.TOMLDecodeError, KeyError) as e:
-+            print(f"Failed to load config from {pyproject_toml}: {e}")
-+            print("Try to load it from setup.cfg")
-+    if not section:
-+        parser = configparser.ConfigParser()
-+        with open(setup_cfg) as cfg_file:
-+            parser.read_file(cfg_file)
-+        parser.get("versioneer", "VCS")  # raise error if missing
-+
-+        section = parser["versioneer"]
-+
-+    # `cast`` really shouldn't be used, but its simplest for the
-+    # common VersioneerConfig users at the moment. We verify against
-+    # `None` values elsewhere where it matters
- 
-     cfg = VersioneerConfig()
--    cfg.VCS = VCS
-+    cfg.VCS = section['VCS']
-     cfg.style = section.get("style", "")
--    cfg.versionfile_source = section.get("versionfile_source")
-+    cfg.versionfile_source = cast(str, section.get("versionfile_source"))
-     cfg.versionfile_build = section.get("versionfile_build")
--    cfg.tag_prefix = section.get("tag_prefix")
--    if cfg.tag_prefix in ("''", '""'):
-+    cfg.tag_prefix = cast(str, section.get("tag_prefix"))
-+    if cfg.tag_prefix in ("''", '""', None):
-         cfg.tag_prefix = ""
-     cfg.parentdir_prefix = section.get("parentdir_prefix")
--    cfg.verbose = section.get("verbose")
-+    if isinstance(section, configparser.SectionProxy):
-+        # Make sure configparser translates to bool
-+        cfg.verbose = section.getboolean("verbose")
-+    else:
-+        cfg.verbose = section.get("verbose")
-+
-     return cfg
- 
- 
-@@ -370,20 +448,34 @@ LONG_VERSION_PY: Dict[str, str] = {}
- HANDLERS: Dict[str, Dict[str, Callable]] = {}
- 
- 
--def register_vcs_handler(vcs, method):  # decorator
-+def register_vcs_handler(vcs: str, method: str) -> Callable:  # decorator
-     """Create decorator to mark a method as the handler of a VCS."""
--    def decorate(f):
-+    def decorate(f: Callable) -> Callable:
-         """Store f in HANDLERS[vcs][method]."""
-         HANDLERS.setdefault(vcs, {})[method] = f
-         return f
-     return decorate
- 
- 
--def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
--                env=None):
-+def run_command(
-+    commands: List[str],
-+    args: List[str],
-+    cwd: Optional[str] = None,
-+    verbose: bool = False,
-+    hide_stderr: bool = False,
-+    env: Optional[Dict[str, str]] = None,
-+) -> Tuple[Optional[str], Optional[int]]:
-     """Call the given command(s)."""
-     assert isinstance(commands, list)
-     process = None
-+
-+    popen_kwargs: Dict[str, Any] = {}
-+    if sys.platform == "win32":
-+        # This hides the console window if pythonw.exe is used
-+        startupinfo = subprocess.STARTUPINFO()
-+        startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
-+        popen_kwargs["startupinfo"] = startupinfo
-+
-     for command in commands:
-         try:
-             dispcmd = str([command] + args)
-@@ -391,10 +483,9 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
-             process = subprocess.Popen([command] + args, cwd=cwd, env=env,
-                                        stdout=subprocess.PIPE,
-                                        stderr=(subprocess.PIPE if hide_stderr
--                                               else None))
-+                                               else None), **popen_kwargs)
-             break
--        except OSError:
--            e = sys.exc_info()[1]
-+        except OSError as e:
-             if e.errno == errno.ENOENT:
-                 continue
-             if verbose:
-@@ -421,8 +512,9 @@ LONG_VERSION_PY['git'] = r'''
- # directories (produced by setup.py build) will contain a much shorter file
- # that just contains the computed version number.
- 
--# This file is released into the public domain. Generated by
--# versioneer-0.21 (https://github.com/python-versioneer/python-versioneer)
-+# This file is released into the public domain.
-+# Generated by versioneer-0.29
-+# https://github.com/python-versioneer/python-versioneer
- 
- """Git implementation of _version.py."""
- 
-@@ -431,10 +523,11 @@ import os
- import re
- import subprocess
- import sys
--from typing import Callable, Dict
-+from typing import Any, Callable, Dict, List, Optional, Tuple
-+import functools
- 
- 
--def get_keywords():
-+def get_keywords() -> Dict[str, str]:
-     """Get the keywords needed to look up the version information."""
-     # these strings will be replaced by git during git-archive.
-     # setup.py/versioneer.py will grep for the variable names, so they must
-@@ -450,8 +543,15 @@ def get_keywords():
- class VersioneerConfig:
-     """Container for Versioneer configuration parameters."""
- 
-+    VCS: str
-+    style: str
-+    tag_prefix: str
-+    parentdir_prefix: str
-+    versionfile_source: str
-+    verbose: bool
-+
- 
--def get_config():
-+def get_config() -> VersioneerConfig:
-     """Create, populate and return the VersioneerConfig() object."""
-     # these strings are filled in when 'setup.py versioneer' creates
-     # _version.py
-@@ -473,9 +573,9 @@ LONG_VERSION_PY: Dict[str, str] = {}
- HANDLERS: Dict[str, Dict[str, Callable]] = {}
- 
- 
--def register_vcs_handler(vcs, method):  # decorator
-+def register_vcs_handler(vcs: str, method: str) -> Callable:  # decorator
-     """Create decorator to mark a method as the handler of a VCS."""
--    def decorate(f):
-+    def decorate(f: Callable) -> Callable:
-         """Store f in HANDLERS[vcs][method]."""
-         if vcs not in HANDLERS:
-             HANDLERS[vcs] = {}
-@@ -484,11 +584,25 @@ def register_vcs_handler(vcs, method):  # decorator
-     return decorate
- 
- 
--def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
--                env=None):
-+def run_command(
-+    commands: List[str],
-+    args: List[str],
-+    cwd: Optional[str] = None,
-+    verbose: bool = False,
-+    hide_stderr: bool = False,
-+    env: Optional[Dict[str, str]] = None,
-+) -> Tuple[Optional[str], Optional[int]]:
-     """Call the given command(s)."""
-     assert isinstance(commands, list)
-     process = None
-+
-+    popen_kwargs: Dict[str, Any] = {}
-+    if sys.platform == "win32":
-+        # This hides the console window if pythonw.exe is used
-+        startupinfo = subprocess.STARTUPINFO()
-+        startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
-+        popen_kwargs["startupinfo"] = startupinfo
-+
-     for command in commands:
-         try:
-             dispcmd = str([command] + args)
-@@ -496,10 +610,9 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
-             process = subprocess.Popen([command] + args, cwd=cwd, env=env,
-                                        stdout=subprocess.PIPE,
-                                        stderr=(subprocess.PIPE if hide_stderr
--                                               else None))
-+                                               else None), **popen_kwargs)
-             break
--        except OSError:
--            e = sys.exc_info()[1]
-+        except OSError as e:
-             if e.errno == errno.ENOENT:
-                 continue
-             if verbose:
-@@ -519,7 +632,11 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
-     return stdout, process.returncode
- 
- 
--def versions_from_parentdir(parentdir_prefix, root, verbose):
-+def versions_from_parentdir(
-+    parentdir_prefix: str,
-+    root: str,
-+    verbose: bool,
-+) -> Dict[str, Any]:
-     """Try to determine the version from the parent directory name.
- 
-     Source tarballs conventionally unpack into a directory that includes both
-@@ -544,13 +661,13 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
- 
- 
- @register_vcs_handler("git", "get_keywords")
--def git_get_keywords(versionfile_abs):
-+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]:
-     """Extract version information from the given file."""
-     # the code embedded in _version.py can just fetch the value of these
-     # keywords. When used from setup.py, we don't want to import _version.py,
-     # so we do it with a regexp instead. This function is not used from
-     # _version.py.
--    keywords = {}
-+    keywords: Dict[str, str] = {}
-     try:
-         with open(versionfile_abs, "r") as fobj:
-             for line in fobj:
-@@ -572,7 +689,11 @@ def git_get_keywords(versionfile_abs):
- 
- 
- @register_vcs_handler("git", "keywords")
--def git_versions_from_keywords(keywords, tag_prefix, verbose):
-+def git_versions_from_keywords(
-+    keywords: Dict[str, str],
-+    tag_prefix: str,
-+    verbose: bool,
-+) -> Dict[str, Any]:
-     """Get version information from git keywords."""
-     if "refnames" not in keywords:
-         raise NotThisMethod("Short version file found")
-@@ -636,7 +757,12 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
- 
- 
- @register_vcs_handler("git", "pieces_from_vcs")
--def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-+def git_pieces_from_vcs(
-+    tag_prefix: str,
-+    root: str,
-+    verbose: bool,
-+    runner: Callable = run_command
-+) -> Dict[str, Any]:
-     """Get version from 'git describe' in the root of the source tree.
- 
-     This only gets called if the git-archive 'subst' keywords were *not*
-@@ -644,13 +770,18 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     version string, meaning we're inside a checked out source tree.
-     """
-     GITS = ["git"]
--    TAG_PREFIX_REGEX = "*"
-     if sys.platform == "win32":
-         GITS = ["git.cmd", "git.exe"]
--        TAG_PREFIX_REGEX = r"\*"
-+
-+    # GIT_DIR can interfere with correct operation of Versioneer.
-+    # It may be intended to be passed to the Versioneer-versioned project,
-+    # but that should not change where we get our version from.
-+    env = os.environ.copy()
-+    env.pop("GIT_DIR", None)
-+    runner = functools.partial(runner, env=env)
- 
-     _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
--                   hide_stderr=True)
-+                   hide_stderr=not verbose)
-     if rc != 0:
-         if verbose:
-             print("Directory %%s not under git control" %% root)
-@@ -658,11 +789,10 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
- 
-     # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
-     # if there isn't one, this yields HEX[-dirty] (no NUM)
--    describe_out, rc = runner(GITS, ["describe", "--tags", "--dirty",
--                                     "--always", "--long",
--                                     "--match",
--                                     "%%s%%s" %% (tag_prefix, TAG_PREFIX_REGEX)],
--                              cwd=root)
-+    describe_out, rc = runner(GITS, [
-+        "describe", "--tags", "--dirty", "--always", "--long",
-+        "--match", f"{tag_prefix}[[:digit:]]*"
-+    ], cwd=root)
-     # --long was added in git-1.5.5
-     if describe_out is None:
-         raise NotThisMethod("'git describe' failed")
-@@ -672,7 +802,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-         raise NotThisMethod("'git rev-parse' failed")
-     full_out = full_out.strip()
- 
--    pieces = {}
-+    pieces: Dict[str, Any] = {}
-     pieces["long"] = full_out
-     pieces["short"] = full_out[:7]  # maybe improved later
-     pieces["error"] = None
-@@ -751,8 +881,8 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     else:
-         # HEX: no tags
-         pieces["closest-tag"] = None
--        count_out, rc = runner(GITS, ["rev-list", "HEAD", "--count"], cwd=root)
--        pieces["distance"] = int(count_out)  # total number of commits
-+        out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root)
-+        pieces["distance"] = len(out.split())  # total number of commits
- 
-     # commit date: see ISO-8601 comment in git_versions_from_keywords()
-     date = runner(GITS, ["show", "-s", "--format=%%ci", "HEAD"], cwd=root)[0].strip()
-@@ -764,14 +894,14 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     return pieces
- 
- 
--def plus_or_dot(pieces):
-+def plus_or_dot(pieces: Dict[str, Any]) -> str:
-     """Return a + if we don't already have one, else return a ."""
-     if "+" in pieces.get("closest-tag", ""):
-         return "."
-     return "+"
- 
- 
--def render_pep440(pieces):
-+def render_pep440(pieces: Dict[str, Any]) -> str:
-     """Build up version string, with post-release "local version identifier".
- 
-     Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
-@@ -796,7 +926,7 @@ def render_pep440(pieces):
-     return rendered
- 
- 
--def render_pep440_branch(pieces):
-+def render_pep440_branch(pieces: Dict[str, Any]) -> str:
-     """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] .
- 
-     The ".dev0" means not master branch. Note that .dev0 sorts backwards
-@@ -826,7 +956,7 @@ def render_pep440_branch(pieces):
-     return rendered
- 
- 
--def pep440_split_post(ver):
-+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]:
-     """Split pep440 version string at the post-release segment.
- 
-     Returns the release segments before the post-release and the
-@@ -836,7 +966,7 @@ def pep440_split_post(ver):
-     return vc[0], int(vc[1] or 0) if len(vc) == 2 else None
- 
- 
--def render_pep440_pre(pieces):
-+def render_pep440_pre(pieces: Dict[str, Any]) -> str:
-     """TAG[.postN.devDISTANCE] -- No -dirty.
- 
-     Exceptions:
-@@ -848,7 +978,7 @@ def render_pep440_pre(pieces):
-             tag_version, post_version = pep440_split_post(pieces["closest-tag"])
-             rendered = tag_version
-             if post_version is not None:
--                rendered += ".post%%d.dev%%d" %% (post_version+1, pieces["distance"])
-+                rendered += ".post%%d.dev%%d" %% (post_version + 1, pieces["distance"])
-             else:
-                 rendered += ".post0.dev%%d" %% (pieces["distance"])
-         else:
-@@ -860,7 +990,7 @@ def render_pep440_pre(pieces):
-     return rendered
- 
- 
--def render_pep440_post(pieces):
-+def render_pep440_post(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]+gHEX] .
- 
-     The ".dev0" means dirty. Note that .dev0 sorts backwards
-@@ -887,7 +1017,7 @@ def render_pep440_post(pieces):
-     return rendered
- 
- 
--def render_pep440_post_branch(pieces):
-+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] .
- 
-     The ".dev0" means not master branch.
-@@ -916,7 +1046,7 @@ def render_pep440_post_branch(pieces):
-     return rendered
- 
- 
--def render_pep440_old(pieces):
-+def render_pep440_old(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]] .
- 
-     The ".dev0" means dirty.
-@@ -938,7 +1068,7 @@ def render_pep440_old(pieces):
-     return rendered
- 
- 
--def render_git_describe(pieces):
-+def render_git_describe(pieces: Dict[str, Any]) -> str:
-     """TAG[-DISTANCE-gHEX][-dirty].
- 
-     Like 'git describe --tags --dirty --always'.
-@@ -958,7 +1088,7 @@ def render_git_describe(pieces):
-     return rendered
- 
- 
--def render_git_describe_long(pieces):
-+def render_git_describe_long(pieces: Dict[str, Any]) -> str:
-     """TAG-DISTANCE-gHEX[-dirty].
- 
-     Like 'git describe --tags --dirty --always -long'.
-@@ -978,7 +1108,7 @@ def render_git_describe_long(pieces):
-     return rendered
- 
- 
--def render(pieces, style):
-+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]:
-     """Render the given version pieces into the requested style."""
-     if pieces["error"]:
-         return {"version": "unknown",
-@@ -1014,7 +1144,7 @@ def render(pieces, style):
-             "date": pieces.get("date")}
- 
- 
--def get_versions():
-+def get_versions() -> Dict[str, Any]:
-     """Get version information or return default if unable to do so."""
-     # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
-     # __file__, we can work backwards from there to the root. Some
-@@ -1062,13 +1192,13 @@ def get_versions():
- 
- 
- @register_vcs_handler("git", "get_keywords")
--def git_get_keywords(versionfile_abs):
-+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]:
-     """Extract version information from the given file."""
-     # the code embedded in _version.py can just fetch the value of these
-     # keywords. When used from setup.py, we don't want to import _version.py,
-     # so we do it with a regexp instead. This function is not used from
-     # _version.py.
--    keywords = {}
-+    keywords: Dict[str, str] = {}
-     try:
-         with open(versionfile_abs, "r") as fobj:
-             for line in fobj:
-@@ -1090,7 +1220,11 @@ def git_get_keywords(versionfile_abs):
- 
- 
- @register_vcs_handler("git", "keywords")
--def git_versions_from_keywords(keywords, tag_prefix, verbose):
-+def git_versions_from_keywords(
-+    keywords: Dict[str, str],
-+    tag_prefix: str,
-+    verbose: bool,
-+) -> Dict[str, Any]:
-     """Get version information from git keywords."""
-     if "refnames" not in keywords:
-         raise NotThisMethod("Short version file found")
-@@ -1154,7 +1288,12 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
- 
- 
- @register_vcs_handler("git", "pieces_from_vcs")
--def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-+def git_pieces_from_vcs(
-+    tag_prefix: str,
-+    root: str,
-+    verbose: bool,
-+    runner: Callable = run_command
-+) -> Dict[str, Any]:
-     """Get version from 'git describe' in the root of the source tree.
- 
-     This only gets called if the git-archive 'subst' keywords were *not*
-@@ -1162,13 +1301,18 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     version string, meaning we're inside a checked out source tree.
-     """
-     GITS = ["git"]
--    TAG_PREFIX_REGEX = "*"
-     if sys.platform == "win32":
-         GITS = ["git.cmd", "git.exe"]
--        TAG_PREFIX_REGEX = r"\*"
-+
-+    # GIT_DIR can interfere with correct operation of Versioneer.
-+    # It may be intended to be passed to the Versioneer-versioned project,
-+    # but that should not change where we get our version from.
-+    env = os.environ.copy()
-+    env.pop("GIT_DIR", None)
-+    runner = functools.partial(runner, env=env)
- 
-     _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
--                   hide_stderr=True)
-+                   hide_stderr=not verbose)
-     if rc != 0:
-         if verbose:
-             print("Directory %s not under git control" % root)
-@@ -1176,11 +1320,10 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
- 
-     # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
-     # if there isn't one, this yields HEX[-dirty] (no NUM)
--    describe_out, rc = runner(GITS, ["describe", "--tags", "--dirty",
--                                     "--always", "--long",
--                                     "--match",
--                                     "%s%s" % (tag_prefix, TAG_PREFIX_REGEX)],
--                              cwd=root)
-+    describe_out, rc = runner(GITS, [
-+        "describe", "--tags", "--dirty", "--always", "--long",
-+        "--match", f"{tag_prefix}[[:digit:]]*"
-+    ], cwd=root)
-     # --long was added in git-1.5.5
-     if describe_out is None:
-         raise NotThisMethod("'git describe' failed")
-@@ -1190,7 +1333,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-         raise NotThisMethod("'git rev-parse' failed")
-     full_out = full_out.strip()
- 
--    pieces = {}
-+    pieces: Dict[str, Any] = {}
-     pieces["long"] = full_out
-     pieces["short"] = full_out[:7]  # maybe improved later
-     pieces["error"] = None
-@@ -1269,8 +1412,8 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     else:
-         # HEX: no tags
-         pieces["closest-tag"] = None
--        count_out, rc = runner(GITS, ["rev-list", "HEAD", "--count"], cwd=root)
--        pieces["distance"] = int(count_out)  # total number of commits
-+        out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root)
-+        pieces["distance"] = len(out.split())  # total number of commits
- 
-     # commit date: see ISO-8601 comment in git_versions_from_keywords()
-     date = runner(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[0].strip()
-@@ -1282,7 +1425,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     return pieces
- 
- 
--def do_vcs_install(manifest_in, versionfile_source, ipy):
-+def do_vcs_install(versionfile_source: str, ipy: Optional[str]) -> None:
-     """Git-specific installation logic for Versioneer.
- 
-     For Git, this means creating/changing .gitattributes to mark _version.py
-@@ -1291,17 +1434,18 @@ def do_vcs_install(manifest_in, versionfile_source, ipy):
-     GITS = ["git"]
-     if sys.platform == "win32":
-         GITS = ["git.cmd", "git.exe"]
--    files = [manifest_in, versionfile_source]
-+    files = [versionfile_source]
-     if ipy:
-         files.append(ipy)
--    try:
--        my_path = __file__
--        if my_path.endswith(".pyc") or my_path.endswith(".pyo"):
--            my_path = os.path.splitext(my_path)[0] + ".py"
--        versioneer_file = os.path.relpath(my_path)
--    except NameError:
--        versioneer_file = "versioneer.py"
--    files.append(versioneer_file)
-+    if "VERSIONEER_PEP518" not in globals():
-+        try:
-+            my_path = __file__
-+            if my_path.endswith((".pyc", ".pyo")):
-+                my_path = os.path.splitext(my_path)[0] + ".py"
-+            versioneer_file = os.path.relpath(my_path)
-+        except NameError:
-+            versioneer_file = "versioneer.py"
-+        files.append(versioneer_file)
-     present = False
-     try:
-         with open(".gitattributes", "r") as fobj:
-@@ -1319,7 +1463,11 @@ def do_vcs_install(manifest_in, versionfile_source, ipy):
-     run_command(GITS, ["add", "--"] + files)
- 
- 
--def versions_from_parentdir(parentdir_prefix, root, verbose):
-+def versions_from_parentdir(
-+    parentdir_prefix: str,
-+    root: str,
-+    verbose: bool,
-+) -> Dict[str, Any]:
-     """Try to determine the version from the parent directory name.
- 
-     Source tarballs conventionally unpack into a directory that includes both
-@@ -1344,7 +1492,7 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
- 
- 
- SHORT_VERSION_PY = """
--# This file was generated by 'versioneer.py' (0.21) from
-+# This file was generated by 'versioneer.py' (0.29) from
- # revision-control system data, or from the parent directory name of an
- # unpacked source archive. Distribution tarballs contain a pre-generated copy
- # of this file.
-@@ -1361,7 +1509,7 @@ def get_versions():
- """
- 
- 
--def versions_from_file(filename):
-+def versions_from_file(filename: str) -> Dict[str, Any]:
-     """Try to determine the version from _version.py if present."""
-     try:
-         with open(filename) as f:
-@@ -1378,9 +1526,8 @@ def versions_from_file(filename):
-     return json.loads(mo.group(1))
- 
- 
--def write_to_version_file(filename, versions):
-+def write_to_version_file(filename: str, versions: Dict[str, Any]) -> None:
-     """Write the given version number to the given _version.py file."""
--    os.unlink(filename)
-     contents = json.dumps(versions, sort_keys=True,
-                           indent=1, separators=(",", ": "))
-     with open(filename, "w") as f:
-@@ -1389,14 +1536,14 @@ def write_to_version_file(filename, versions):
-     print("set %s to '%s'" % (filename, versions["version"]))
- 
- 
--def plus_or_dot(pieces):
-+def plus_or_dot(pieces: Dict[str, Any]) -> str:
-     """Return a + if we don't already have one, else return a ."""
-     if "+" in pieces.get("closest-tag", ""):
-         return "."
-     return "+"
- 
- 
--def render_pep440(pieces):
-+def render_pep440(pieces: Dict[str, Any]) -> str:
-     """Build up version string, with post-release "local version identifier".
- 
-     Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
-@@ -1421,7 +1568,7 @@ def render_pep440(pieces):
-     return rendered
- 
- 
--def render_pep440_branch(pieces):
-+def render_pep440_branch(pieces: Dict[str, Any]) -> str:
-     """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] .
- 
-     The ".dev0" means not master branch. Note that .dev0 sorts backwards
-@@ -1451,7 +1598,7 @@ def render_pep440_branch(pieces):
-     return rendered
- 
- 
--def pep440_split_post(ver):
-+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]:
-     """Split pep440 version string at the post-release segment.
- 
-     Returns the release segments before the post-release and the
-@@ -1461,7 +1608,7 @@ def pep440_split_post(ver):
-     return vc[0], int(vc[1] or 0) if len(vc) == 2 else None
- 
- 
--def render_pep440_pre(pieces):
-+def render_pep440_pre(pieces: Dict[str, Any]) -> str:
-     """TAG[.postN.devDISTANCE] -- No -dirty.
- 
-     Exceptions:
-@@ -1473,7 +1620,7 @@ def render_pep440_pre(pieces):
-             tag_version, post_version = pep440_split_post(pieces["closest-tag"])
-             rendered = tag_version
-             if post_version is not None:
--                rendered += ".post%d.dev%d" % (post_version+1, pieces["distance"])
-+                rendered += ".post%d.dev%d" % (post_version + 1, pieces["distance"])
-             else:
-                 rendered += ".post0.dev%d" % (pieces["distance"])
-         else:
-@@ -1485,7 +1632,7 @@ def render_pep440_pre(pieces):
-     return rendered
- 
- 
--def render_pep440_post(pieces):
-+def render_pep440_post(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]+gHEX] .
- 
-     The ".dev0" means dirty. Note that .dev0 sorts backwards
-@@ -1512,7 +1659,7 @@ def render_pep440_post(pieces):
-     return rendered
- 
- 
--def render_pep440_post_branch(pieces):
-+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] .
- 
-     The ".dev0" means not master branch.
-@@ -1541,7 +1688,7 @@ def render_pep440_post_branch(pieces):
-     return rendered
- 
- 
--def render_pep440_old(pieces):
-+def render_pep440_old(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]] .
- 
-     The ".dev0" means dirty.
-@@ -1563,7 +1710,7 @@ def render_pep440_old(pieces):
-     return rendered
- 
- 
--def render_git_describe(pieces):
-+def render_git_describe(pieces: Dict[str, Any]) -> str:
-     """TAG[-DISTANCE-gHEX][-dirty].
- 
-     Like 'git describe --tags --dirty --always'.
-@@ -1583,7 +1730,7 @@ def render_git_describe(pieces):
-     return rendered
- 
- 
--def render_git_describe_long(pieces):
-+def render_git_describe_long(pieces: Dict[str, Any]) -> str:
-     """TAG-DISTANCE-gHEX[-dirty].
- 
-     Like 'git describe --tags --dirty --always -long'.
-@@ -1603,7 +1750,7 @@ def render_git_describe_long(pieces):
-     return rendered
- 
- 
--def render(pieces, style):
-+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]:
-     """Render the given version pieces into the requested style."""
-     if pieces["error"]:
-         return {"version": "unknown",
-@@ -1643,7 +1790,7 @@ class VersioneerBadRootError(Exception):
-     """The project root directory is unknown or missing key files."""
- 
- 
--def get_versions(verbose=False):
-+def get_versions(verbose: bool = False) -> Dict[str, Any]:
-     """Get the project version from whatever source is available.
- 
-     Returns dict with two keys: 'version' and 'full'.
-@@ -1658,7 +1805,7 @@ def get_versions(verbose=False):
-     assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg"
-     handlers = HANDLERS.get(cfg.VCS)
-     assert handlers, "unrecognized VCS '%s'" % cfg.VCS
--    verbose = verbose or cfg.verbose
-+    verbose = verbose or bool(cfg.verbose)  # `bool()` used to avoid `None`
-     assert cfg.versionfile_source is not None, \
-         "please set versioneer.versionfile_source"
-     assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix"
-@@ -1719,13 +1866,13 @@ def get_versions(verbose=False):
-             "date": None}
- 
- 
--def get_version():
-+def get_version() -> str:
-     """Get the short version string for this project."""
-     return get_versions()["version"]
- 
- 
--def get_cmdclass(cmdclass=None):
--    """Get the custom setuptools/distutils subclasses used by Versioneer.
-+def get_cmdclass(cmdclass: Optional[Dict[str, Any]] = None):
-+    """Get the custom setuptools subclasses used by Versioneer.
- 
-     If the package uses a different cmdclass (e.g. one from numpy), it
-     should be provide as an argument.
-@@ -1747,21 +1894,21 @@ def get_cmdclass(cmdclass=None):
- 
-     cmds = {} if cmdclass is None else cmdclass.copy()
- 
--    # we add "version" to both distutils and setuptools
--    from distutils.core import Command
-+    # we add "version" to setuptools
-+    from setuptools import Command
- 
-     class cmd_version(Command):
-         description = "report generated version string"
--        user_options = []
--        boolean_options = []
-+        user_options: List[Tuple[str, str, str]] = []
-+        boolean_options: List[str] = []
- 
--        def initialize_options(self):
-+        def initialize_options(self) -> None:
-             pass
- 
--        def finalize_options(self):
-+        def finalize_options(self) -> None:
-             pass
- 
--        def run(self):
-+        def run(self) -> None:
-             vers = get_versions(verbose=True)
-             print("Version: %s" % vers["version"])
-             print(" full-revisionid: %s" % vers.get("full-revisionid"))
-@@ -1771,7 +1918,7 @@ def get_cmdclass(cmdclass=None):
-                 print(" error: %s" % vers["error"])
-     cmds["version"] = cmd_version
- 
--    # we override "build_py" in both distutils and setuptools
-+    # we override "build_py" in setuptools
-     #
-     # most invocation pathways end up running build_py:
-     #  distutils/build -> build_py
-@@ -1786,20 +1933,25 @@ def get_cmdclass(cmdclass=None):
-     #   then does setup.py bdist_wheel, or sometimes setup.py install
-     #  setup.py egg_info -> ?
- 
-+    # pip install -e . and setuptool/editable_wheel will invoke build_py
-+    # but the build_py command is not expected to copy any files.
-+
-     # we override different "build_py" commands for both environments
-     if 'build_py' in cmds:
--        _build_py = cmds['build_py']
--    elif "setuptools" in sys.modules:
--        from setuptools.command.build_py import build_py as _build_py
-+        _build_py: Any = cmds['build_py']
-     else:
--        from distutils.command.build_py import build_py as _build_py
-+        from setuptools.command.build_py import build_py as _build_py
- 
-     class cmd_build_py(_build_py):
--        def run(self):
-+        def run(self) -> None:
-             root = get_root()
-             cfg = get_config_from_root(root)
-             versions = get_versions()
-             _build_py.run(self)
-+            if getattr(self, "editable_mode", False):
-+                # During editable installs `.py` and data files are
-+                # not copied to build_lib
-+                return
-             # now locate _version.py in the new build/ directory and replace
-             # it with an updated value
-             if cfg.versionfile_build:
-@@ -1810,14 +1962,12 @@ def get_cmdclass(cmdclass=None):
-     cmds["build_py"] = cmd_build_py
- 
-     if 'build_ext' in cmds:
--        _build_ext = cmds['build_ext']
--    elif "setuptools" in sys.modules:
--        from setuptools.command.build_ext import build_ext as _build_ext
-+        _build_ext: Any = cmds['build_ext']
-     else:
--        from distutils.command.build_ext import build_ext as _build_ext
-+        from setuptools.command.build_ext import build_ext as _build_ext
- 
-     class cmd_build_ext(_build_ext):
--        def run(self):
-+        def run(self) -> None:
-             root = get_root()
-             cfg = get_config_from_root(root)
-             versions = get_versions()
-@@ -1830,14 +1980,21 @@ def get_cmdclass(cmdclass=None):
-                 return
-             # now locate _version.py in the new build/ directory and replace
-             # it with an updated value
-+            if not cfg.versionfile_build:
-+                return
-             target_versionfile = os.path.join(self.build_lib,
-                                               cfg.versionfile_build)
-+            if not os.path.exists(target_versionfile):
-+                print(f"Warning: {target_versionfile} does not exist, skipping "
-+                      "version update. This can happen if you are running build_ext "
-+                      "without first running build_py.")
-+                return
-             print("UPDATING %s" % target_versionfile)
-             write_to_version_file(target_versionfile, versions)
-     cmds["build_ext"] = cmd_build_ext
- 
-     if "cx_Freeze" in sys.modules:  # cx_freeze enabled?
--        from cx_Freeze.dist import build_exe as _build_exe
-+        from cx_Freeze.dist import build_exe as _build_exe  # type: ignore
-         # nczeczulin reports that py2exe won't like the pep440-style string
-         # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g.
-         # setup(console=[{
-@@ -1846,7 +2003,7 @@ def get_cmdclass(cmdclass=None):
-         #   ...
- 
-         class cmd_build_exe(_build_exe):
--            def run(self):
-+            def run(self) -> None:
-                 root = get_root()
-                 cfg = get_config_from_root(root)
-                 versions = get_versions()
-@@ -1869,10 +2026,13 @@ def get_cmdclass(cmdclass=None):
-         del cmds["build_py"]
- 
-     if 'py2exe' in sys.modules:  # py2exe enabled?
--        from py2exe.distutils_buildexe import py2exe as _py2exe
-+        try:
-+            from py2exe.setuptools_buildexe import py2exe as _py2exe  # type: ignore
-+        except ImportError:
-+            from py2exe.distutils_buildexe import py2exe as _py2exe  # type: ignore
- 
-         class cmd_py2exe(_py2exe):
--            def run(self):
-+            def run(self) -> None:
-                 root = get_root()
-                 cfg = get_config_from_root(root)
-                 versions = get_versions()
-@@ -1893,16 +2053,51 @@ def get_cmdclass(cmdclass=None):
-                              })
-         cmds["py2exe"] = cmd_py2exe
- 
-+    # sdist farms its file list building out to egg_info
-+    if 'egg_info' in cmds:
-+        _egg_info: Any = cmds['egg_info']
-+    else:
-+        from setuptools.command.egg_info import egg_info as _egg_info
-+
-+    class cmd_egg_info(_egg_info):
-+        def find_sources(self) -> None:
-+            # egg_info.find_sources builds the manifest list and writes it
-+            # in one shot
-+            super().find_sources()
-+
-+            # Modify the filelist and normalize it
-+            root = get_root()
-+            cfg = get_config_from_root(root)
-+            self.filelist.append('versioneer.py')
-+            if cfg.versionfile_source:
-+                # There are rare cases where versionfile_source might not be
-+                # included by default, so we must be explicit
-+                self.filelist.append(cfg.versionfile_source)
-+            self.filelist.sort()
-+            self.filelist.remove_duplicates()
-+
-+            # The write method is hidden in the manifest_maker instance that
-+            # generated the filelist and was thrown away
-+            # We will instead replicate their final normalization (to unicode,
-+            # and POSIX-style paths)
-+            from setuptools import unicode_utils
-+            normalized = [unicode_utils.filesys_decode(f).replace(os.sep, '/')
-+                          for f in self.filelist.files]
-+
-+            manifest_filename = os.path.join(self.egg_info, 'SOURCES.txt')
-+            with open(manifest_filename, 'w') as fobj:
-+                fobj.write('\n'.join(normalized))
-+
-+    cmds['egg_info'] = cmd_egg_info
-+
-     # we override different "sdist" commands for both environments
-     if 'sdist' in cmds:
--        _sdist = cmds['sdist']
--    elif "setuptools" in sys.modules:
--        from setuptools.command.sdist import sdist as _sdist
-+        _sdist: Any = cmds['sdist']
-     else:
--        from distutils.command.sdist import sdist as _sdist
-+        from setuptools.command.sdist import sdist as _sdist
- 
-     class cmd_sdist(_sdist):
--        def run(self):
-+        def run(self) -> None:
-             versions = get_versions()
-             self._versioneer_generated_versions = versions
-             # unless we update this, the command will keep using the old
-@@ -1910,7 +2105,7 @@ def get_cmdclass(cmdclass=None):
-             self.distribution.metadata.version = versions["version"]
-             return _sdist.run(self)
- 
--        def make_release_tree(self, base_dir, files):
-+        def make_release_tree(self, base_dir: str, files: List[str]) -> None:
-             root = get_root()
-             cfg = get_config_from_root(root)
-             _sdist.make_release_tree(self, base_dir, files)
-@@ -1975,7 +2170,7 @@ __version__ = {0}.get_versions()['version']
- """
- 
- 
--def do_setup():
-+def do_setup() -> int:
-     """Do main VCS-independent setup function for installing Versioneer."""
-     root = get_root()
-     try:
-@@ -2002,6 +2197,7 @@ def do_setup():
- 
-     ipy = os.path.join(os.path.dirname(cfg.versionfile_source),
-                        "__init__.py")
-+    maybe_ipy: Optional[str] = ipy
-     if os.path.exists(ipy):
-         try:
-             with open(ipy, "r") as f:
-@@ -2022,48 +2218,16 @@ def do_setup():
-             print(" %s unmodified" % ipy)
-     else:
-         print(" %s doesn't exist, ok" % ipy)
--        ipy = None
--
--    # Make sure both the top-level "versioneer.py" and versionfile_source
--    # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so
--    # they'll be copied into source distributions. Pip won't be able to
--    # install the package without this.
--    manifest_in = os.path.join(root, "MANIFEST.in")
--    simple_includes = set()
--    try:
--        with open(manifest_in, "r") as f:
--            for line in f:
--                if line.startswith("include "):
--                    for include in line.split()[1:]:
--                        simple_includes.add(include)
--    except OSError:
--        pass
--    # That doesn't cover everything MANIFEST.in can do
--    # (http://docs.python.org/2/distutils/sourcedist.html#commands), so
--    # it might give some false negatives. Appending redundant 'include'
--    # lines is safe, though.
--    if "versioneer.py" not in simple_includes:
--        print(" appending 'versioneer.py' to MANIFEST.in")
--        with open(manifest_in, "a") as f:
--            f.write("include versioneer.py\n")
--    else:
--        print(" 'versioneer.py' already in MANIFEST.in")
--    if cfg.versionfile_source not in simple_includes:
--        print(" appending versionfile_source ('%s') to MANIFEST.in" %
--              cfg.versionfile_source)
--        with open(manifest_in, "a") as f:
--            f.write("include %s\n" % cfg.versionfile_source)
--    else:
--        print(" versionfile_source already in MANIFEST.in")
-+        maybe_ipy = None
- 
-     # Make VCS-specific changes. For git, this means creating/changing
-     # .gitattributes to mark _version.py for export-subst keyword
-     # substitution.
--    do_vcs_install(manifest_in, cfg.versionfile_source, ipy)
-+    do_vcs_install(cfg.versionfile_source, maybe_ipy)
-     return 0
- 
- 
--def scan_setup_py():
-+def scan_setup_py() -> int:
-     """Validate the contents of setup.py against Versioneer's expectations."""
-     found = set()
-     setters = False
-@@ -2100,10 +2264,14 @@ def scan_setup_py():
-     return errors
- 
- 
-+def setup_command() -> NoReturn:
-+    """Set up Versioneer and exit with appropriate error code."""
-+    errors = do_setup()
-+    errors += scan_setup_py()
-+    sys.exit(1 if errors else 0)
-+
-+
- if __name__ == "__main__":
-     cmd = sys.argv[1]
-     if cmd == "setup":
--        errors = do_setup()
--        errors += scan_setup_py()
--        if errors:
--            sys.exit(1)
-+        setup_command()
-diff --git a/xnat4tests/_version.py b/xnat4tests/_version.py
-index 8e41b80..3f0ab7b 100644
---- a/xnat4tests/_version.py
-+++ b/xnat4tests/_version.py
-@@ -1,11 +1,13 @@
-+
- # This file helps to compute a version number in source trees obtained from
- # git-archive tarball (such as those provided by githubs download-from-tag
- # feature). Distribution tarballs (built by setup.py sdist) and build
- # directories (produced by setup.py build) will contain a much shorter file
- # that just contains the computed version number.
- 
--# This file is released into the public domain. Generated by
--# versioneer-0.21 (https://github.com/python-versioneer/python-versioneer)
-+# This file is released into the public domain.
-+# Generated by versioneer-0.29
-+# https://github.com/python-versioneer/python-versioneer
- 
- """Git implementation of _version.py."""
- 
-@@ -14,10 +16,11 @@ import os
- import re
- import subprocess
- import sys
--from typing import Callable, Dict
-+from typing import Any, Callable, Dict, List, Optional, Tuple
-+import functools
- 
- 
--def get_keywords():
-+def get_keywords() -> Dict[str, str]:
-     """Get the keywords needed to look up the version information."""
-     # these strings will be replaced by git during git-archive.
-     # setup.py/versioneer.py will grep for the variable names, so they must
-@@ -33,15 +36,22 @@ def get_keywords():
- class VersioneerConfig:
-     """Container for Versioneer configuration parameters."""
- 
-+    VCS: str
-+    style: str
-+    tag_prefix: str
-+    parentdir_prefix: str
-+    versionfile_source: str
-+    verbose: bool
-+
- 
--def get_config():
-+def get_config() -> VersioneerConfig:
-     """Create, populate and return the VersioneerConfig() object."""
-     # these strings are filled in when 'setup.py versioneer' creates
-     # _version.py
-     cfg = VersioneerConfig()
-     cfg.VCS = "git"
-     cfg.style = "pep440"
--    cfg.tag_prefix = ""
-+    cfg.tag_prefix = "v"
-     cfg.parentdir_prefix = "None"
-     cfg.versionfile_source = "xnat4tests/_version.py"
-     cfg.verbose = False
-@@ -56,37 +66,46 @@ LONG_VERSION_PY: Dict[str, str] = {}
- HANDLERS: Dict[str, Dict[str, Callable]] = {}
- 
- 
--def register_vcs_handler(vcs, method):  # decorator
-+def register_vcs_handler(vcs: str, method: str) -> Callable:  # decorator
-     """Create decorator to mark a method as the handler of a VCS."""
--
--    def decorate(f):
-+    def decorate(f: Callable) -> Callable:
-         """Store f in HANDLERS[vcs][method]."""
-         if vcs not in HANDLERS:
-             HANDLERS[vcs] = {}
-         HANDLERS[vcs][method] = f
-         return f
--
-     return decorate
- 
- 
--def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=None):
-+def run_command(
-+    commands: List[str],
-+    args: List[str],
-+    cwd: Optional[str] = None,
-+    verbose: bool = False,
-+    hide_stderr: bool = False,
-+    env: Optional[Dict[str, str]] = None,
-+) -> Tuple[Optional[str], Optional[int]]:
-     """Call the given command(s)."""
-     assert isinstance(commands, list)
-     process = None
-+
-+    popen_kwargs: Dict[str, Any] = {}
-+    if sys.platform == "win32":
-+        # This hides the console window if pythonw.exe is used
-+        startupinfo = subprocess.STARTUPINFO()
-+        startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
-+        popen_kwargs["startupinfo"] = startupinfo
-+
-     for command in commands:
-         try:
-             dispcmd = str([command] + args)
-             # remember shell=False, so use git.cmd on windows, not just git
--            process = subprocess.Popen(
--                [command] + args,
--                cwd=cwd,
--                env=env,
--                stdout=subprocess.PIPE,
--                stderr=(subprocess.PIPE if hide_stderr else None),
--            )
-+            process = subprocess.Popen([command] + args, cwd=cwd, env=env,
-+                                       stdout=subprocess.PIPE,
-+                                       stderr=(subprocess.PIPE if hide_stderr
-+                                               else None), **popen_kwargs)
-             break
--        except OSError:
--            e = sys.exc_info()[1]
-+        except OSError as e:
-             if e.errno == errno.ENOENT:
-                 continue
-             if verbose:
-@@ -106,7 +125,11 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
-     return stdout, process.returncode
- 
- 
--def versions_from_parentdir(parentdir_prefix, root, verbose):
-+def versions_from_parentdir(
-+    parentdir_prefix: str,
-+    root: str,
-+    verbose: bool,
-+) -> Dict[str, Any]:
-     """Try to determine the version from the parent directory name.
- 
-     Source tarballs conventionally unpack into a directory that includes both
-@@ -118,32 +141,26 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
-     for _ in range(3):
-         dirname = os.path.basename(root)
-         if dirname.startswith(parentdir_prefix):
--            return {
--                "version": dirname[len(parentdir_prefix) :],
--                "full-revisionid": None,
--                "dirty": False,
--                "error": None,
--                "date": None,
--            }
-+            return {"version": dirname[len(parentdir_prefix):],
-+                    "full-revisionid": None,
-+                    "dirty": False, "error": None, "date": None}
-         rootdirs.append(root)
-         root = os.path.dirname(root)  # up a level
- 
-     if verbose:
--        print(
--            "Tried directories %s but none started with prefix %s"
--            % (str(rootdirs), parentdir_prefix)
--        )
-+        print("Tried directories %s but none started with prefix %s" %
-+              (str(rootdirs), parentdir_prefix))
-     raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
- 
- 
- @register_vcs_handler("git", "get_keywords")
--def git_get_keywords(versionfile_abs):
-+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]:
-     """Extract version information from the given file."""
-     # the code embedded in _version.py can just fetch the value of these
-     # keywords. When used from setup.py, we don't want to import _version.py,
-     # so we do it with a regexp instead. This function is not used from
-     # _version.py.
--    keywords = {}
-+    keywords: Dict[str, str] = {}
-     try:
-         with open(versionfile_abs, "r") as fobj:
-             for line in fobj:
-@@ -165,7 +182,11 @@ def git_get_keywords(versionfile_abs):
- 
- 
- @register_vcs_handler("git", "keywords")
--def git_versions_from_keywords(keywords, tag_prefix, verbose):
-+def git_versions_from_keywords(
-+    keywords: Dict[str, str],
-+    tag_prefix: str,
-+    verbose: bool,
-+) -> Dict[str, Any]:
-     """Get version information from git keywords."""
-     if "refnames" not in keywords:
-         raise NotThisMethod("Short version file found")
-@@ -191,7 +212,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
-     # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
-     # just "foo-1.0". If we see a "tag: " prefix, prefer those.
-     TAG = "tag: "
--    tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)}
-+    tags = {r[len(TAG):] for r in refs if r.startswith(TAG)}
-     if not tags:
-         # Either we're using git < 1.8.3, or there really are no tags. We use
-         # a heuristic: assume all version tags have a digit. The old git %d
-@@ -200,7 +221,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
-         # between branches and tags. By ignoring refnames without digits, we
-         # filter out many common branch names like "release" and
-         # "stabilization", as well as "HEAD" and "master".
--        tags = {r for r in refs if re.search(r"\d", r)}
-+        tags = {r for r in refs if re.search(r'\d', r)}
-         if verbose:
-             print("discarding '%s', no digits" % ",".join(refs - tags))
-     if verbose:
-@@ -208,35 +229,33 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
-     for ref in sorted(tags):
-         # sorting will prefer e.g. "2.0" over "2.0rc1"
-         if ref.startswith(tag_prefix):
--            r = ref[len(tag_prefix) :]
-+            r = ref[len(tag_prefix):]
-             # Filter out refs that exactly match prefix or that don't start
-             # with a number once the prefix is stripped (mostly a concern
-             # when prefix is '')
--            if not re.match(r"\d", r):
-+            if not re.match(r'\d', r):
-                 continue
-             if verbose:
-                 print("picking %s" % r)
--            return {
--                "version": r,
--                "full-revisionid": keywords["full"].strip(),
--                "dirty": False,
--                "error": None,
--                "date": date,
--            }
-+            return {"version": r,
-+                    "full-revisionid": keywords["full"].strip(),
-+                    "dirty": False, "error": None,
-+                    "date": date}
-     # no suitable tags, so version is "0+unknown", but full hex is still there
-     if verbose:
-         print("no suitable tags, using unknown + full revision id")
--    return {
--        "version": "0+unknown",
--        "full-revisionid": keywords["full"].strip(),
--        "dirty": False,
--        "error": "no suitable tags",
--        "date": None,
--    }
-+    return {"version": "0+unknown",
-+            "full-revisionid": keywords["full"].strip(),
-+            "dirty": False, "error": "no suitable tags", "date": None}
- 
- 
- @register_vcs_handler("git", "pieces_from_vcs")
--def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-+def git_pieces_from_vcs(
-+    tag_prefix: str,
-+    root: str,
-+    verbose: bool,
-+    runner: Callable = run_command
-+) -> Dict[str, Any]:
-     """Get version from 'git describe' in the root of the source tree.
- 
-     This only gets called if the git-archive 'subst' keywords were *not*
-@@ -244,12 +263,18 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     version string, meaning we're inside a checked out source tree.
-     """
-     GITS = ["git"]
--    TAG_PREFIX_REGEX = "*"
-     if sys.platform == "win32":
-         GITS = ["git.cmd", "git.exe"]
--        TAG_PREFIX_REGEX = r"\*"
- 
--    _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=True)
-+    # GIT_DIR can interfere with correct operation of Versioneer.
-+    # It may be intended to be passed to the Versioneer-versioned project,
-+    # but that should not change where we get our version from.
-+    env = os.environ.copy()
-+    env.pop("GIT_DIR", None)
-+    runner = functools.partial(runner, env=env)
-+
-+    _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
-+                   hide_stderr=not verbose)
-     if rc != 0:
-         if verbose:
-             print("Directory %s not under git control" % root)
-@@ -257,19 +282,10 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
- 
-     # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
-     # if there isn't one, this yields HEX[-dirty] (no NUM)
--    describe_out, rc = runner(
--        GITS,
--        [
--            "describe",
--            "--tags",
--            "--dirty",
--            "--always",
--            "--long",
--            "--match",
--            "%s%s" % (tag_prefix, TAG_PREFIX_REGEX),
--        ],
--        cwd=root,
--    )
-+    describe_out, rc = runner(GITS, [
-+        "describe", "--tags", "--dirty", "--always", "--long",
-+        "--match", f"{tag_prefix}[[:digit:]]*"
-+    ], cwd=root)
-     # --long was added in git-1.5.5
-     if describe_out is None:
-         raise NotThisMethod("'git describe' failed")
-@@ -279,12 +295,13 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-         raise NotThisMethod("'git rev-parse' failed")
-     full_out = full_out.strip()
- 
--    pieces = {}
-+    pieces: Dict[str, Any] = {}
-     pieces["long"] = full_out
-     pieces["short"] = full_out[:7]  # maybe improved later
-     pieces["error"] = None
- 
--    branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], cwd=root)
-+    branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"],
-+                             cwd=root)
-     # --abbrev-ref was added in git-1.6.3
-     if rc != 0 or branch_name is None:
-         raise NotThisMethod("'git rev-parse --abbrev-ref' returned error")
-@@ -324,16 +341,17 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     dirty = git_describe.endswith("-dirty")
-     pieces["dirty"] = dirty
-     if dirty:
--        git_describe = git_describe[: git_describe.rindex("-dirty")]
-+        git_describe = git_describe[:git_describe.rindex("-dirty")]
- 
-     # now we have TAG-NUM-gHEX or HEX
- 
-     if "-" in git_describe:
-         # TAG-NUM-gHEX
--        mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe)
-+        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
-         if not mo:
-             # unparsable. Maybe git-describe is misbehaving?
--            pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out
-+            pieces["error"] = ("unable to parse git-describe output: '%s'"
-+                               % describe_out)
-             return pieces
- 
-         # tag
-@@ -342,12 +360,10 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-             if verbose:
-                 fmt = "tag '%s' doesn't start with prefix '%s'"
-                 print(fmt % (full_tag, tag_prefix))
--            pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % (
--                full_tag,
--                tag_prefix,
--            )
-+            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
-+                               % (full_tag, tag_prefix))
-             return pieces
--        pieces["closest-tag"] = full_tag[len(tag_prefix) :]
-+        pieces["closest-tag"] = full_tag[len(tag_prefix):]
- 
-         # distance: number of commits since tag
-         pieces["distance"] = int(mo.group(2))
-@@ -358,8 +374,8 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     else:
-         # HEX: no tags
-         pieces["closest-tag"] = None
--        count_out, rc = runner(GITS, ["rev-list", "HEAD", "--count"], cwd=root)
--        pieces["distance"] = int(count_out)  # total number of commits
-+        out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root)
-+        pieces["distance"] = len(out.split())  # total number of commits
- 
-     # commit date: see ISO-8601 comment in git_versions_from_keywords()
-     date = runner(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[0].strip()
-@@ -371,14 +387,14 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
-     return pieces
- 
- 
--def plus_or_dot(pieces):
-+def plus_or_dot(pieces: Dict[str, Any]) -> str:
-     """Return a + if we don't already have one, else return a ."""
-     if "+" in pieces.get("closest-tag", ""):
-         return "."
-     return "+"
- 
- 
--def render_pep440(pieces):
-+def render_pep440(pieces: Dict[str, Any]) -> str:
-     """Build up version string, with post-release "local version identifier".
- 
-     Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
-@@ -396,13 +412,14 @@ def render_pep440(pieces):
-                 rendered += ".dirty"
-     else:
-         # exception #1
--        rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"])
-+        rendered = "0+untagged.%d.g%s" % (pieces["distance"],
-+                                          pieces["short"])
-         if pieces["dirty"]:
-             rendered += ".dirty"
-     return rendered
- 
- 
--def render_pep440_branch(pieces):
-+def render_pep440_branch(pieces: Dict[str, Any]) -> str:
-     """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] .
- 
-     The ".dev0" means not master branch. Note that .dev0 sorts backwards
-@@ -425,13 +442,14 @@ def render_pep440_branch(pieces):
-         rendered = "0"
-         if pieces["branch"] != "master":
-             rendered += ".dev0"
--        rendered += "+untagged.%d.g%s" % (pieces["distance"], pieces["short"])
-+        rendered += "+untagged.%d.g%s" % (pieces["distance"],
-+                                          pieces["short"])
-         if pieces["dirty"]:
-             rendered += ".dirty"
-     return rendered
- 
- 
--def pep440_split_post(ver):
-+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]:
-     """Split pep440 version string at the post-release segment.
- 
-     Returns the release segments before the post-release and the
-@@ -441,7 +459,7 @@ def pep440_split_post(ver):
-     return vc[0], int(vc[1] or 0) if len(vc) == 2 else None
- 
- 
--def render_pep440_pre(pieces):
-+def render_pep440_pre(pieces: Dict[str, Any]) -> str:
-     """TAG[.postN.devDISTANCE] -- No -dirty.
- 
-     Exceptions:
-@@ -465,7 +483,7 @@ def render_pep440_pre(pieces):
-     return rendered
- 
- 
--def render_pep440_post(pieces):
-+def render_pep440_post(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]+gHEX] .
- 
-     The ".dev0" means dirty. Note that .dev0 sorts backwards
-@@ -492,7 +510,7 @@ def render_pep440_post(pieces):
-     return rendered
- 
- 
--def render_pep440_post_branch(pieces):
-+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] .
- 
-     The ".dev0" means not master branch.
-@@ -521,7 +539,7 @@ def render_pep440_post_branch(pieces):
-     return rendered
- 
- 
--def render_pep440_old(pieces):
-+def render_pep440_old(pieces: Dict[str, Any]) -> str:
-     """TAG[.postDISTANCE[.dev0]] .
- 
-     The ".dev0" means dirty.
-@@ -543,7 +561,7 @@ def render_pep440_old(pieces):
-     return rendered
- 
- 
--def render_git_describe(pieces):
-+def render_git_describe(pieces: Dict[str, Any]) -> str:
-     """TAG[-DISTANCE-gHEX][-dirty].
- 
-     Like 'git describe --tags --dirty --always'.
-@@ -563,7 +581,7 @@ def render_git_describe(pieces):
-     return rendered
- 
- 
--def render_git_describe_long(pieces):
-+def render_git_describe_long(pieces: Dict[str, Any]) -> str:
-     """TAG-DISTANCE-gHEX[-dirty].
- 
-     Like 'git describe --tags --dirty --always -long'.
-@@ -583,16 +601,14 @@ def render_git_describe_long(pieces):
-     return rendered
- 
- 
--def render(pieces, style):
-+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]:
-     """Render the given version pieces into the requested style."""
-     if pieces["error"]:
--        return {
--            "version": "unknown",
--            "full-revisionid": pieces.get("long"),
--            "dirty": None,
--            "error": pieces["error"],
--            "date": None,
--        }
-+        return {"version": "unknown",
-+                "full-revisionid": pieces.get("long"),
-+                "dirty": None,
-+                "error": pieces["error"],
-+                "date": None}
- 
-     if not style or style == "default":
-         style = "pep440"  # the default
-@@ -616,16 +632,12 @@ def render(pieces, style):
-     else:
-         raise ValueError("unknown style '%s'" % style)
- 
--    return {
--        "version": rendered,
--        "full-revisionid": pieces["long"],
--        "dirty": pieces["dirty"],
--        "error": None,
--        "date": pieces.get("date"),
--    }
-+    return {"version": rendered, "full-revisionid": pieces["long"],
-+            "dirty": pieces["dirty"], "error": None,
-+            "date": pieces.get("date")}
- 
- 
--def get_versions():
-+def get_versions() -> Dict[str, Any]:
-     """Get version information or return default if unable to do so."""
-     # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
-     # __file__, we can work backwards from there to the root. Some
-@@ -636,7 +648,8 @@ def get_versions():
-     verbose = cfg.verbose
- 
-     try:
--        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, verbose)
-+        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
-+                                          verbose)
-     except NotThisMethod:
-         pass
- 
-@@ -645,16 +658,13 @@ def get_versions():
-         # versionfile_source is the relative path from the top of the source
-         # tree (where the .git directory might live) to this file. Invert
-         # this to find the root from __file__.
--        for _ in cfg.versionfile_source.split("/"):
-+        for _ in cfg.versionfile_source.split('/'):
-             root = os.path.dirname(root)
-     except NameError:
--        return {
--            "version": "0+unknown",
--            "full-revisionid": None,
--            "dirty": None,
--            "error": "unable to find root of source tree",
--            "date": None,
--        }
-+        return {"version": "0+unknown", "full-revisionid": None,
-+                "dirty": None,
-+                "error": "unable to find root of source tree",
-+                "date": None}
- 
-     try:
-         pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
-@@ -668,10 +678,6 @@ def get_versions():
-     except NotThisMethod:
-         pass
- 
--    return {
--        "version": "0+unknown",
--        "full-revisionid": None,
--        "dirty": None,
--        "error": "unable to compute version",
--        "date": None,
--    }
-+    return {"version": "0+unknown", "full-revisionid": None,
-+            "dirty": None,
-+            "error": "unable to compute version", "date": None}
--- 
-2.49.0
-

diff --git a/python-xnat4tests.spec b/python-xnat4tests.spec
index 6edb1ed..1e0c619 100644
--- a/python-xnat4tests.spec
+++ b/python-xnat4tests.spec
@@ -1,14 +1,13 @@
 %global pypi_name xnat4tests
+%global forgeurl https://github.com/australian-imaging-service/xnat4tests
+Version:        0.4.1
+%global tag     v%{version}
+%forgemeta
 
 Name:           python-%{pypi_name}
-Version:        0.3.14
 Release:        %autorelease
 Summary:        Create basic XNAT instance for API tests
 
-%global forgeurl https://github.com/australian-imaging-service/xnat4tests
-%global tag v%{version}
-%forgemeta
-
 # The entire source is Apache-2.0, except that versioneer.py and the
 # _version.py it generates are CC0-1.0, not generally allowed for code in
 # Fedora, but OK under the exception for existing uses in Fedora prior to
@@ -16,15 +15,8 @@ Summary:        Create basic XNAT instance for API tests
 # _version.py using the system python-versioneer, which is a later version
 # under Unlicense so the resulting _version.py is also Unlicense.
 License:        Apache-2.0 AND Unlicense
-URL:            %forgeurl
+URL:             %forgeurl
 Source:         %forgesource
-# Update Versioneer and fix config.
-# Part of the changes are required even if upstream decides not to
-# merge the PR fully (e.g. sticking with the current Versioneer version).
-# In that case we could use the system installed Versioneer to recreate
-# versioneer.py as well as _version.py which are than Unlicense.
-# https://github.com/Australian-Imaging-Service/xnat4tests/pull/20
-Patch:          0001-Update-Versioneer-and-fix-config.patch
 
 BuildArch:      noarch
 BuildRequires:  git-core
@@ -47,7 +39,7 @@ Provides:       xnat4tests = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %prep
-%forgeautosetup -p1 -S git
+%forgeautosetup -S git
 
 # Remove duplicated entry point
 # We'll create a symlink by the same name instead

diff --git a/sources b/sources
index ec53152..da54eb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xnat4tests-0.3.14.tar.gz) = 85ad7102eb430406c3aa826269a564e1556c8cd9a6ba3fb5d500d6e93579a00df3e269f556f49ce38c0cb8b56fc4808976de2362d91ea0e1acd17b822b5cf541
+SHA512 (xnat4tests-0.4.1.tar.gz) = 537c53d308610c1ac3405b1ab889f9a692a5791edb7a13e56cecf1c40c820e39a9983f18c44f81b76101e30db6a65dbde91001b3d6c6e6b9835374445dc7e93c