@@ -1,7 +1,10 @@

-import sys

-import subprocess

 from collections import namedtuple

 import os

+import subprocess

+import sys

+

+from distutils.command.build import build as build_orig

+from setuptools.command.sdist import sdist as sdist_orig

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

@@ -9,11 +12,11 @@ Version = namedtuple('Version', ('release', 'dev', 'labels'))

 __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'

-version = None

 def get_version(version_file=STATIC_VERSION_FILE):

     version_info = {}

@@ -127,3 +130,37 @@ def get_version_from_git_archive(version_info):

 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(build_orig):

+    def run(self):

+        super().run()

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

+                                    STATIC_VERSION_FILE),

+                      version=version)

+

+

+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),

+                       version=version)

+

+

+cmdclass = dict(sdist=_sdist, build=_build)

@@ -1,13 +1,8 @@

 #!/usr/bin/env python3

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

-import os

-import sys

-import importlib

-from importlib.util import module_from_spec, spec_from_file_location

 from setuptools import setup, find_packages

-from setuptools.command.sdist import sdist as sdist_orig

-from distutils.command.build import build as build_orig

+import sys

 if sys.version_info < (3, 6):

@@ -15,43 +10,18 @@ if sys.version_info < (3, 6):

     sys.exit(1)

-package_name = 'adaptive'

-

-# Load version.py module without importing 'adaptive'

-def load_version_module():

+# Loads version.py module without importing the whole package.

+def get_version_and_cmdclass(package_name):

+    import os

+    from importlib.util import module_from_spec, spec_from_file_location

     spec = spec_from_file_location('version',

-                                   '{}/version.py'.format(package_name))

+                                   os.path.join(package_name, 'version.py'))

     module = module_from_spec(spec)

     spec.loader.exec_module(module)

-    return module

-

-version = load_version_module()

-

-

-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.version))

-

-

-class build(build_orig):

-    def run(self):

-        super().run()

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

-                                   version.STATIC_VERSION_FILE))

+    return module.version, module.cmdclass

-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,

-                                   version.STATIC_VERSION_FILE))

+version, cmdclass = get_version_and_cmdclass('adaptive')

 install_requires = [

@@ -75,7 +45,7 @@ extras_require = {

 setup(

     name='adaptive',

     description='Adaptive parallel sampling of mathematical functions',

-    version=version.version,

+    version=version,

     url='https://gitlab.kwant-project.org/qt/adaptive',

     author='Adaptive authors',

     license='BSD',

@@ -88,5 +58,5 @@ setup(

     packages=find_packages('.'),

     install_requires=install_requires,

     extras_require=extras_require,

-    cmdclass=dict(sdist=sdist, build=build),

+    cmdclass=cmdclass,

 )