@@ -1,2 +1,2 @@

 *.ipynb filter=nbclearoutput

-adaptive/_adaptive_version.py export-subst

+adaptive/_static_version.py export-subst

@@ -8,9 +8,9 @@ from . import runner

 from .learner import (Learner1D, Learner2D, AverageLearner,

                       BalancingLearner, DataSaver, IntegratorLearner)

 from .runner import Runner, BlockingRunner

-from . import _version

+from . import version

-__version__ = _version.version

+__version__ = version.version

 del notebook_integration  # to avoid confusion with `notebook_extension`

-del _version

+del version

similarity index 90%

rename from adaptive/_adaptive_version.py

rename to adaptive/_static_version.py

@@ -1,6 +1,6 @@

 # This file will be overwritten by setup.py when a source or binary

 # distribution is made.  The magic value "__use_git__" is interpreted by

-# _version.py in this directory.

+# version.py.

 version = "__use_git__"

similarity index 98%

rename from adaptive/_version.py

rename to adaptive/version.py

@@ -8,7 +8,7 @@ __all__ = []

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

 distr_root = os.path.dirname(package_root)

-STATIC_VERSION_FILE = '_adaptive_version.py'

+STATIC_VERSION_FILE = '_static_version.py'

 version = None

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

 import os

 import sys

-import imp

+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

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

     sys.exit(1)

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

-_dont_write_bytecode = sys.dont_write_bytecode

-version = imp.load_source('version', 'adaptive/_version.py')

-sys.dont_write_bytecode = _dont_write_bytecode

+package_name = 'adaptive'

+

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

+def load_version_module():

+    spec = spec_from_file_location('version',

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

+    module = module_from_spec(spec)

+    spec.loader.exec_module(module)

+    return module

+

+version = load_version_module()

 def write_version(fname):

@@ -35,15 +43,14 @@ def write_version(fname):

 class build(build_orig):

     def run(self):

         super().run()

-        write_version(os.path.join(self.build_lib, 'adaptive',

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

                                    version.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, 'adaptive',

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

                                    version.STATIC_VERSION_FILE))