From 711dc2ea9a1fb3ff2a6e11e83a0a6929ab483ed5 Mon Sep 17 00:00:00 2001 From: Irchan Bani Date: Thu, 10 Oct 2019 18:21:16 +0700 Subject: [PATCH] setup: change define __version__ (#2592) * setup: change define __version__ * setup: run pre-commit install, black, adn flake8 --- dvc/version.py | 2 +- setup.py | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dvc/version.py b/dvc/version.py index 5edd6f013..06104a294 100644 --- a/dvc/version.py +++ b/dvc/version.py @@ -12,7 +12,7 @@ _BASE_VERSION = "0.62.0" def _generate_version(base_version): """Generate a version with information about the git repository""" - pkg_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) + pkg_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if not _is_git_repo(pkg_dir) or not _have_git(): return base_version diff --git a/setup.py b/setup.py index 3cc15a0ac..922743407 100644 --- a/setup.py +++ b/setup.py @@ -10,13 +10,20 @@ import fastentrypoints # noqa: F401 # https://packaging.python.org/guides/single-sourcing-package-version/ -pkg_dir = os.path.dirname(__file__) +pkg_dir = os.path.dirname(os.path.abspath(__file__)) +version_path = os.path.join(pkg_dir, "dvc", "version.py") +if sys.version_info[0] == 2: + import imp -# This will define __version__ implicitly -with open(os.path.join(pkg_dir, "dvc", "version.py")) as fobj: - exec(fobj.read()) + dvc_version = imp.load_source("dvc.version", version_path) +else: + import importlib.util -version = __version__ # noqa: F821 + spec = importlib.util.spec_from_file_location("dvc.version", version_path) + dvc_version = importlib.util.module_from_spec(spec) + spec.loader.exec_module(dvc_version) + +version = dvc_version.__version__ # noqa: F821 # To achieve consistency between the build version and the one provided