@@ -3,8 +3,8 @@

 import os

 import subprocess

 from collections import namedtuple

-from distutils.command.build_py import build_py as build_py_orig

+from setuptools.command.build_py import build_py as build_py_orig

 from setuptools.command.sdist import sdist as sdist_orig

 Version = namedtuple("Version", ("release", "dev", "labels"))

@@ -15,6 +15,13 @@ __all__ = []

 package_root = os.path.dirname(os.path.realpath(__file__))

 package_name = os.path.basename(package_root)

 distr_root = os.path.dirname(package_root)

+# If the package is inside a "src" directory the

+# distribution root is 1 level up.

+if os.path.split(distr_root)[1] == "src":

+    _package_root_inside_src = True

+    distr_root = os.path.dirname(distr_root)

+else:

+    _package_root_inside_src = False

 STATIC_VERSION_FILE = "_static_version.py"

@@ -189,7 +196,11 @@ class _build_py(build_py_orig):

 class _sdist(sdist_orig):

     def make_release_tree(self, base_dir, files):

         super().make_release_tree(base_dir, files)

-        _write_version(os.path.join(base_dir, package_name, STATIC_VERSION_FILE))

+        if _package_root_inside_src:

+            p = os.path.join("src", package_name)

+        else:

+            p = package_name

+        _write_version(os.path.join(base_dir, p, STATIC_VERSION_FILE))

 cmdclass = dict(sdist=_sdist, build_py=_build_py)

@@ -1,4 +1,3 @@

-# -*- coding: utf-8 -*-

 # This file is part of 'miniver': https://github.com/jbweston/miniver

 #

 import os

@@ -8,7 +8,7 @@ from distutils.command.build_py import build_py as build_py_orig

 from setuptools.command.sdist import sdist as sdist_orig

-Version = namedtuple('Version', ('release', 'dev', 'labels'))

+Version = namedtuple("Version", ("release", "dev", "labels"))

 # No public API

 __all__ = []

@@ -17,12 +17,12 @@ package_root = os.path.dirname(os.path.realpath(__file__))

 package_name = os.path.basename(package_root)

 distr_root = os.path.dirname(package_root)

-STATIC_VERSION_FILE = '_static_version.py'

+STATIC_VERSION_FILE = "_static_version.py"

 def get_version(version_file=STATIC_VERSION_FILE):

     version_info = get_static_version_info(version_file)

-    version = version_info['version']

+    version = version_info["version"]

     if version == "__use_git__":

         version = get_version_from_git()

         if not version:

@@ -36,13 +36,13 @@ def get_version(version_file=STATIC_VERSION_FILE):

 def get_static_version_info(version_file=STATIC_VERSION_FILE):

     version_info = {}

-    with open(os.path.join(package_root, version_file), 'rb') as f:

+    with open(os.path.join(package_root, version_file), "rb") as f:

         exec(f.read(), {}, version_info)

     return version_info

 def version_is_from_git(version_file=STATIC_VERSION_FILE):

-    return get_static_version_info(version_file)['version'] == '__use_git__'

+    return get_static_version_info(version_file)["version"] == "__use_git__"

 def pep440_format(version_info):

@@ -50,13 +50,13 @@ def pep440_format(version_info):

     version_parts = [release]

     if dev:

-        if release.endswith('-dev') or release.endswith('.dev'):

+        if release.endswith("-dev") or release.endswith(".dev"):

             version_parts.append(dev)

         else:  # prefer PEP440 over strict adhesion to semver

-            version_parts.append(f'.dev{dev}')

+            version_parts.append(f".dev{dev}")

     if labels:

-        version_parts.append('+')

+        version_parts.append("+")

         version_parts.append(".".join(labels))

     return "".join(version_parts)

@@ -64,15 +64,17 @@ def pep440_format(version_info):

 def get_version_from_git():

     try:

-        p = subprocess.Popen(['git', 'rev-parse', '--show-toplevel'],

-                             cwd=distr_root,

-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+        p = subprocess.Popen(

+            ["git", "rev-parse", "--show-toplevel"],

+            cwd=distr_root,

+            stdout=subprocess.PIPE,

+            stderr=subprocess.PIPE,

+        )

     except OSError:

         return

     if p.wait() != 0:

         return

-    if not os.path.samefile(p.communicate()[0].decode().rstrip('\n'),

-                            distr_root):

+    if not os.path.samefile(p.communicate()[0].decode().rstrip("\n"), distr_root):

         # The top-level directory of the current Git repository is not the same

         # as the root directory of the distribution: do not extract the

         # version from Git.

@@ -81,12 +83,14 @@ def get_version_from_git():

     # git describe --first-parent does not take into account tags from branches

     # that were merged-in. The '--long' flag gets us the 'dev' version and

     # git hash, '--always' returns the git hash even if there are no tags.

-    for opts in [['--first-parent'], []]:

+    for opts in [["--first-parent"], []]:

         try:

             p = subprocess.Popen(

-                ['git', 'describe', '--long', '--always'] + opts,

+                ["git", "describe", "--long", "--always"] + opts,

                 cwd=distr_root,

-                stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+                stdout=subprocess.PIPE,

+                stderr=subprocess.PIPE,

+            )

         except OSError:

             return

         if p.wait() == 0:

@@ -97,17 +101,17 @@ def get_version_from_git():

     description = (

         p.communicate()[0]

         .decode()

-        .strip('v')  # Tags can have a leading 'v', but the version should not

-        .rstrip('\n')

-        .rsplit('-', 2)  # Split the latest tag, commits since tag, and hash

+        .strip("v")  # Tags can have a leading 'v', but the version should not

+        .rstrip("\n")

+        .rsplit("-", 2)  # Split the latest tag, commits since tag, and hash

     )

     try:

         release, dev, git = description

     except ValueError:  # No tags, only the git hash

         # prepend 'g' to match with format returned by 'git describe'

-        git = 'g{}'.format(*description)

-        release = 'unknown'

+        git = "g{}".format(*description)

+        release = "unknown"

         dev = None

     labels = []

@@ -117,12 +121,12 @@ def get_version_from_git():

         labels.append(git)

     try:

-        p = subprocess.Popen(['git', 'diff', '--quiet'], cwd=distr_root)

+        p = subprocess.Popen(["git", "diff", "--quiet"], cwd=distr_root)

     except OSError:

-        labels.append('confused')  # This should never happen.

+        labels.append("confused")  # This should never happen.

     else:

         if p.wait() == 1:

-            labels.append('dirty')

+            labels.append("dirty")

     return Version(release, dev, labels)

@@ -134,25 +138,25 @@ def get_version_from_git():

 #       if it is not tagged.

 def get_version_from_git_archive(version_info):

     try:

-        refnames = version_info['refnames']

-        git_hash = version_info['git_hash']

+        refnames = version_info["refnames"]

+        git_hash = version_info["git_hash"]

     except KeyError:

         # These fields are not present if we are running from an sdist.

         # Execution should never reach here, though

         return None

-    if git_hash.startswith('$Format') or refnames.startswith('$Format'):

+    if git_hash.startswith("$Format") or refnames.startswith("$Format"):

         # variables not expanded during 'git archive'

         return None

-    VTAG = 'tag: v'

+    VTAG = "tag: v"

     refs = {r.strip() for r in refnames.split(",")}

-    version_tags = {r[len(VTAG):] for r in refs if r.startswith(VTAG)}

+    version_tags = {r[len(VTAG) :] for r in refs if r.startswith(VTAG)}

     if version_tags:

         release, *_ = sorted(version_tags)  # prefer e.g. "2.0" over "2.0rc1"

         return Version(release, dev=None, labels=None)

     else:

-        return Version('unknown', dev=None, labels=[f'g{git_hash}'])

+        return Version("unknown", dev=None, labels=[f"g{git_hash}"])

 __version__ = get_version()

@@ -162,6 +166,7 @@ __version__ = get_version()

 # which can be used from setup.py. The 'package_name' and

 # '__version__' module globals are used (but not modified).

+

 def _write_version(fname):

     # This could be a hard link, so try to delete it first.  Is there any way

     # to do this atomically together with opening?

@@ -169,23 +174,23 @@ def _write_version(fname):

         os.remove(fname)

     except OSError:

         pass

-    with open(fname, 'w') as f:

-        f.write("# This file has been created by setup.py.\n"

-                "version = '{}'\n".format(__version__))

+    with open(fname, "w") as f:

+        f.write(

+            "# This file has been created by setup.py.\n"

+            "version = '{}'\n".format(__version__)

+        )

 class _build_py(build_py_orig):

     def run(self):

         super().run()

-        _write_version(os.path.join(self.build_lib, package_name,

-                                    STATIC_VERSION_FILE))

+        _write_version(os.path.join(self.build_lib, package_name, STATIC_VERSION_FILE))

 class _sdist(sdist_orig):

     def make_release_tree(self, base_dir, files):

         super().make_release_tree(base_dir, files)

-        _write_version(os.path.join(base_dir, package_name,

-                                    STATIC_VERSION_FILE))

+        _write_version(os.path.join(base_dir, package_name, STATIC_VERSION_FILE))

 cmdclass = dict(sdist=_sdist, build_py=_build_py)

@@ -1,11 +1,11 @@

 # -*- coding: utf-8 -*-

 # This file is part of 'miniver': https://github.com/jbweston/miniver

 #

-from collections import namedtuple

 import os

 import subprocess

-

+from collections import namedtuple

 from distutils.command.build_py import build_py as build_py_orig

+

 from setuptools.command.sdist import sdist as sdist_orig

 Version = namedtuple('Version', ('release', 'dev', 'labels'))

@@ -53,7 +53,7 @@ def pep440_format(version_info):

         if release.endswith('-dev') or release.endswith('.dev'):

             version_parts.append(dev)

         else:  # prefer PEP440 over strict adhesion to semver

-            version_parts.append('.dev{}'.format(dev))

+            version_parts.append(f'.dev{dev}')

     if labels:

         version_parts.append('+')

@@ -146,13 +146,13 @@ def get_version_from_git_archive(version_info):

         return None

     VTAG = 'tag: v'

-    refs = set(r.strip() for r in refnames.split(","))

-    version_tags = set(r[len(VTAG):] for r in refs if r.startswith(VTAG))

+    refs = {r.strip() for r in refnames.split(",")}

+    version_tags = {r[len(VTAG):] for r in refs if r.startswith(VTAG)}

     if version_tags:

         release, *_ = sorted(version_tags)  # prefer e.g. "2.0" over "2.0rc1"

         return Version(release, dev=None, labels=None)

     else:

-        return Version('unknown', dev=None, labels=['g{}'.format(git_hash)])

+        return Version('unknown', dev=None, labels=[f'g{git_hash}'])

 __version__ = get_version()

new file mode 100644

@@ -0,0 +1,191 @@

+# -*- coding: utf-8 -*-

+# This file is part of 'miniver': https://github.com/jbweston/miniver

+#

+from collections import namedtuple

+import os

+import subprocess

+

+from distutils.command.build_py import build_py as build_py_orig

+from setuptools.command.sdist import sdist as sdist_orig

+

+Version = namedtuple('Version', ('release', 'dev', 'labels'))

+

+# No public API

+__all__ = []

+

+package_root = os.path.dirname(os.path.realpath(__file__))

+package_name = os.path.basename(package_root)

+distr_root = os.path.dirname(package_root)

+

+STATIC_VERSION_FILE = '_static_version.py'

+

+

+def get_version(version_file=STATIC_VERSION_FILE):

+    version_info = get_static_version_info(version_file)

+    version = version_info['version']

+    if version == "__use_git__":

+        version = get_version_from_git()

+        if not version:

+            version = get_version_from_git_archive(version_info)

+        if not version:

+            version = Version("unknown", None, None)

+        return pep440_format(version)

+    else:

+        return version

+

+

+def get_static_version_info(version_file=STATIC_VERSION_FILE):

+    version_info = {}

+    with open(os.path.join(package_root, version_file), 'rb') as f:

+        exec(f.read(), {}, version_info)

+    return version_info

+

+

+def version_is_from_git(version_file=STATIC_VERSION_FILE):

+    return get_static_version_info(version_file)['version'] == '__use_git__'

+

+

+def pep440_format(version_info):

+    release, dev, labels = version_info

+

+    version_parts = [release]

+    if dev:

+        if release.endswith('-dev') or release.endswith('.dev'):

+            version_parts.append(dev)

+        else:  # prefer PEP440 over strict adhesion to semver

+            version_parts.append('.dev{}'.format(dev))

+

+    if labels:

+        version_parts.append('+')

+        version_parts.append(".".join(labels))

+

+    return "".join(version_parts)

+

+

+def get_version_from_git():

+    try:

+        p = subprocess.Popen(['git', 'rev-parse', '--show-toplevel'],

+                             cwd=distr_root,

+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+    except OSError:

+        return

+    if p.wait() != 0:

+        return

+    if not os.path.samefile(p.communicate()[0].decode().rstrip('\n'),

+                            distr_root):

+        # The top-level directory of the current Git repository is not the same

+        # as the root directory of the distribution: do not extract the

+        # version from Git.

+        return

+

+    # git describe --first-parent does not take into account tags from branches

+    # that were merged-in. The '--long' flag gets us the 'dev' version and

+    # git hash, '--always' returns the git hash even if there are no tags.

+    for opts in [['--first-parent'], []]:

+        try:

+            p = subprocess.Popen(

+                ['git', 'describe', '--long', '--always'] + opts,

+                cwd=distr_root,

+                stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+        except OSError:

+            return

+        if p.wait() == 0:

+            break

+    else:

+        return

+

+    description = (

+        p.communicate()[0]

+        .decode()

+        .strip('v')  # Tags can have a leading 'v', but the version should not

+        .rstrip('\n')

+        .rsplit('-', 2)  # Split the latest tag, commits since tag, and hash

+    )

+

+    try:

+        release, dev, git = description

+    except ValueError:  # No tags, only the git hash

+        # prepend 'g' to match with format returned by 'git describe'

+        git = 'g{}'.format(*description)

+        release = 'unknown'

+        dev = None

+

+    labels = []

+    if dev == "0":

+        dev = None

+    else:

+        labels.append(git)

+

+    try:

+        p = subprocess.Popen(['git', 'diff', '--quiet'], cwd=distr_root)

+    except OSError:

+        labels.append('confused')  # This should never happen.

+    else:

+        if p.wait() == 1:

+            labels.append('dirty')

+

+    return Version(release, dev, labels)

+

+

+# TODO: change this logic when there is a git pretty-format

+#       that gives the same output as 'git describe'.

+#       Currently we can only tell the tag the current commit is

+#       pointing to, or its hash (with no version info)

+#       if it is not tagged.

+def get_version_from_git_archive(version_info):

+    try:

+        refnames = version_info['refnames']

+        git_hash = version_info['git_hash']

+    except KeyError:

+        # These fields are not present if we are running from an sdist.

+        # Execution should never reach here, though

+        return None

+

+    if git_hash.startswith('$Format') or refnames.startswith('$Format'):

+        # variables not expanded during 'git archive'

+        return None

+

+    VTAG = 'tag: v'

+    refs = set(r.strip() for r in refnames.split(","))

+    version_tags = set(r[len(VTAG):] for r in refs if r.startswith(VTAG))

+    if version_tags:

+        release, *_ = sorted(version_tags)  # prefer e.g. "2.0" over "2.0rc1"

+        return Version(release, dev=None, labels=None)

+    else:

+        return Version('unknown', dev=None, labels=['g{}'.format(git_hash)])

+

+

+__version__ = get_version()

+

+

+# The following section defines a module global 'cmdclass',

+# which can be used from setup.py. The 'package_name' and

+# '__version__' module globals are used (but not modified).

+

+def _write_version(fname):

+    # This could be a hard link, so try to delete it first.  Is there any way

+    # to do this atomically together with opening?

+    try:

+        os.remove(fname)

+    except OSError:

+        pass

+    with open(fname, 'w') as f:

+        f.write("# This file has been created by setup.py.\n"

+                "version = '{}'\n".format(__version__))

+

+

+class _build_py(build_py_orig):

+    def run(self):

+        super().run()

+        _write_version(os.path.join(self.build_lib, package_name,

+                                    STATIC_VERSION_FILE))

+

+

+class _sdist(sdist_orig):

+    def make_release_tree(self, base_dir, files):

+        super().make_release_tree(base_dir, files)

+        _write_version(os.path.join(base_dir, package_name,

+                                    STATIC_VERSION_FILE))

+

+

+cmdclass = dict(sdist=_sdist, build_py=_build_py)

deleted file mode 100644

@@ -1,109 +0,0 @@

-import sys

-import subprocess

-import os

-

-# No public API

-__all__ = []

-

-package_root = os.path.dirname(os.path.realpath(__file__))

-distr_root = os.path.dirname(package_root)

-

-STATIC_VERSION_FILE = '_adaptive_version.py'

-

-version = None

-

-def get_version(version_file=STATIC_VERSION_FILE):

-    version_info = {}

-    with open(os.path.join(package_root, version_file), 'rb') as f:

-        exec(f.read(), {}, version_info)

-    version = version_info['version']

-    version_is_from_git = (version == "__use_git__")

-    if version_is_from_git:

-        version = get_version_from_git()

-        if not version:

-            version = get_version_from_git_archive(version_info)

-        if not version:

-            version = "unknown"

-    return version

-

-

-def get_version_from_git():

-    try:

-        p = subprocess.Popen(['git', 'rev-parse', '--show-toplevel'],

-                             cwd=distr_root,

-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)

-    except OSError:

-        return

-    if p.wait() != 0:

-        return

-    if not os.path.samefile(p.communicate()[0].decode().rstrip('\n'),

-                            distr_root):

-        # The top-level directory of the current Git repository is not the same

-        # as the root directory of the Kwant distribution: do not extract the

-        # version from Git.

-        return

-

-    # git describe --first-parent does not take into account tags from branches

-    # that were merged-in.

-    for opts in [['--first-parent'], []]:

-        try:

-            p = subprocess.Popen(['git', 'describe', '--long'] + opts,

-                                 cwd=distr_root,

-                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)

-        except OSError:

-            return

-        if p.wait() == 0:

-            break

-    else:

-        return

-    description = p.communicate()[0].decode().strip('v').rstrip('\n')

-

-    release, dev, git = description.rsplit('-', 2)

-    version = [release]

-    labels = []

-    if dev != "0":

-        version.append(".dev{}".format(dev))

-        labels.append(git)

-

-    try:

-        p = subprocess.Popen(['git', 'diff', '--quiet'], cwd=distr_root)

-    except OSError:

-        labels.append('confused') # This should never happen.

-    else:

-        if p.wait() == 1:

-            labels.append('dirty')

-

-    if labels:

-        version.append('+')

-        version.append(".".join(labels))

-

-    return "".join(version)

-

-

-# TODO: change this logic when there is a git pretty-format

-#       that gives the same output as 'git describe'.

-#       Currently we return just the tag if a tagged version

-#       was archived, or 'unknown-g<git hash>' otherwise.

-def get_version_from_git_archive(version_info):

-    try:

-        refnames = version_info['refnames']

-        git_hash = version_info['git_hash']

-    except KeyError:

-        # These fields are not present if we are running from an sdist.

-        # Execution should never reach here, though

-        return None

-

-    if git_hash.startswith('$Format') or refnames.startswith('$Format'):

-        # variables not expanded during 'git archive'

-        return None

-

-    TAG = 'tag: v'

-    refs = set(r.strip() for r in refnames.split(","))

-    tags = set(r[len(TAG):] for r in refs if r.startswith(TAG))

-    if tags:

-        release, *_ = sorted(tags)  # prefer e.g. "2.0" over "2.0rc1"

-        return release

-    else:

-        return f'unknown+g{git_hash}'

-

-version = get_version()

new file mode 100644

@@ -0,0 +1,109 @@

+import sys

+import subprocess

+import os

+

+# No public API

+__all__ = []

+

+package_root = os.path.dirname(os.path.realpath(__file__))

+distr_root = os.path.dirname(package_root)

+

+STATIC_VERSION_FILE = '_adaptive_version.py'

+

+version = None

+

+def get_version(version_file=STATIC_VERSION_FILE):

+    version_info = {}

+    with open(os.path.join(package_root, version_file), 'rb') as f:

+        exec(f.read(), {}, version_info)

+    version = version_info['version']

+    version_is_from_git = (version == "__use_git__")

+    if version_is_from_git:

+        version = get_version_from_git()

+        if not version:

+            version = get_version_from_git_archive(version_info)

+        if not version:

+            version = "unknown"

+    return version

+

+

+def get_version_from_git():

+    try:

+        p = subprocess.Popen(['git', 'rev-parse', '--show-toplevel'],

+                             cwd=distr_root,

+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+    except OSError:

+        return

+    if p.wait() != 0:

+        return

+    if not os.path.samefile(p.communicate()[0].decode().rstrip('\n'),

+                            distr_root):

+        # The top-level directory of the current Git repository is not the same

+        # as the root directory of the Kwant distribution: do not extract the

+        # version from Git.

+        return

+

+    # git describe --first-parent does not take into account tags from branches

+    # that were merged-in.

+    for opts in [['--first-parent'], []]:

+        try:

+            p = subprocess.Popen(['git', 'describe', '--long'] + opts,

+                                 cwd=distr_root,

+                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+        except OSError:

+            return

+        if p.wait() == 0:

+            break

+    else:

+        return

+    description = p.communicate()[0].decode().strip('v').rstrip('\n')

+

+    release, dev, git = description.rsplit('-', 2)

+    version = [release]

+    labels = []

+    if dev != "0":

+        version.append(".dev{}".format(dev))

+        labels.append(git)

+

+    try:

+        p = subprocess.Popen(['git', 'diff', '--quiet'], cwd=distr_root)

+    except OSError:

+        labels.append('confused') # This should never happen.

+    else:

+        if p.wait() == 1:

+            labels.append('dirty')

+

+    if labels:

+        version.append('+')

+        version.append(".".join(labels))

+

+    return "".join(version)

+

+

+# TODO: change this logic when there is a git pretty-format

+#       that gives the same output as 'git describe'.

+#       Currently we return just the tag if a tagged version

+#       was archived, or 'unknown-g<git hash>' otherwise.

+def get_version_from_git_archive(version_info):

+    try:

+        refnames = version_info['refnames']

+        git_hash = version_info['git_hash']

+    except KeyError:

+        # These fields are not present if we are running from an sdist.

+        # Execution should never reach here, though

+        return None

+

+    if git_hash.startswith('$Format') or refnames.startswith('$Format'):

+        # variables not expanded during 'git archive'

+        return None

+

+    TAG = 'tag: v'

+    refs = set(r.strip() for r in refnames.split(","))

+    tags = set(r[len(TAG):] for r in refs if r.startswith(TAG))

+    if tags:

+        release, *_ = sorted(tags)  # prefer e.g. "2.0" over "2.0rc1"

+        return release

+    else:

+        return f'unknown+g{git_hash}'

+

+version = get_version()