From e7f52a4013337a64ce2f4390a9346b77ca7ee093 Mon Sep 17 00:00:00 2001
From: Jim Paris <jim@jtan.com>
Date: Wed, 5 Aug 2020 16:42:46 -0400
Subject: [PATCH] Update versioneer

---
 .gitattributes      |  2 +-
 nilmrun/_version.py | 28 ++++++++++++++--------------
 versioneer.py       |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 26e3729..57e89cc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-src/_version.py export-subst
+nilmrun/_version.py export-subst
diff --git a/nilmrun/_version.py b/nilmrun/_version.py
index 716b34a..b0dc4f2 100644
--- a/nilmrun/_version.py
+++ b/nilmrun/_version.py
@@ -41,9 +41,9 @@ def get_config():
     cfg = VersioneerConfig()
     cfg.VCS = "git"
     cfg.style = "pep440"
-    cfg.tag_prefix = "nilmdb-"
-    cfg.parentdir_prefix = "nilmdb-"
-    cfg.versionfile_source = "nilmdb/_version.py"
+    cfg.tag_prefix = "nilmrun-"
+    cfg.parentdir_prefix = "nilmrun-"
+    cfg.versionfile_source = "nilmrun/_version.py"
     cfg.verbose = False
     return cfg
 
@@ -86,20 +86,20 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
             if e.errno == errno.ENOENT:
                 continue
             if verbose:
-                print(("unable to run %s" % dispcmd))
+                print("unable to run %s" % dispcmd)
                 print(e)
             return None, None
     else:
         if verbose:
-            print(("unable to find command, tried %s" % (commands,)))
+            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()
     if p.returncode != 0:
         if verbose:
-            print(("unable to run %s (error)" % dispcmd))
-            print(("stdout was %s" % stdout))
+            print("unable to run %s (error)" % dispcmd)
+            print("stdout was %s" % stdout)
         return None, p.returncode
     return stdout, p.returncode
 
@@ -124,8 +124,8 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
             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")
 
 
@@ -192,15 +192,15 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         # "stabilization", as well as "HEAD" and "master".
         tags = set([r for r in refs if re.search(r'\d', r)])
         if verbose:
-            print(("discarding '%s', no digits" % ",".join(refs - tags)))
+            print("discarding '%s', no digits" % ",".join(refs - tags))
     if verbose:
-        print(("likely tags: %s" % ",".join(sorted(tags))))
+        print("likely tags: %s" % ",".join(sorted(tags)))
     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):]
             if verbose:
-                print(("picking %s" % r))
+                print("picking %s" % r)
             return {"version": r,
                     "full-revisionid": keywords["full"].strip(),
                     "dirty": False, "error": None,
@@ -229,7 +229,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
                           hide_stderr=True)
     if rc != 0:
         if verbose:
-            print(("Directory %s not under git control" % root))
+            print("Directory %s not under git control" % root)
         raise NotThisMethod("'git rev-parse --git-dir' returned error")
 
     # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
@@ -278,7 +278,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
         if not full_tag.startswith(tag_prefix):
             if verbose:
                 fmt = "tag '%s' doesn't start with prefix '%s'"
-                print((fmt % (full_tag, tag_prefix)))
+                print(fmt % (full_tag, tag_prefix))
             pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
                                % (full_tag, tag_prefix))
             return pieces
diff --git a/versioneer.py b/versioneer.py
index d3e699c..64fea1c 100644
--- a/versioneer.py
+++ b/versioneer.py
@@ -276,11 +276,11 @@ https://creativecommons.org/publicdomain/zero/1.0/ .
 
 """
 
-
+from __future__ import print_function
 try:
     import configparser
 except ImportError:
-    import configparser as configparser
+    import ConfigParser as configparser
 import errno
 import json
 import os