diff --git a/dvc/__init__.py b/dvc/__init__.py index 2df5ce05c..11b89b84d 100644 --- a/dvc/__init__.py +++ b/dvc/__init__.py @@ -4,6 +4,6 @@ DVC Make your data science projects reproducible and shareable. """ import dvc.logger -from dvc.version import __version__ # noqa: F401 +from dvc.version import __version__, version_tuple # noqa: F401 dvc.logger.setup() diff --git a/dvc/version.py b/dvc/version.py index 820edde88..7ab488de1 100644 --- a/dvc/version.py +++ b/dvc/version.py @@ -4,3 +4,4 @@ try: from ._dvc_version import version_tuple # noqa: F401 except ImportError: __version__ = "UNKNOWN" + version_tuple = (0, 0, __version__) # type: ignore[assignment] diff --git a/scripts/build.py b/scripts/build.py index a53738d72..a6b1240f6 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -1,7 +1,5 @@ import argparse -import importlib.util import pathlib -import textwrap from subprocess import STDOUT, check_call path = pathlib.Path(__file__).parent.absolute() @@ -25,22 +23,8 @@ args = parser.parse_args() (dvc / "utils" / "build.py").write_text(f'PKG = "{args.pkg}"') -# Autogenerate version, similar to what we do in setup.py -spec = importlib.util.spec_from_file_location( - "dvc.version", dvc / "version.py" -) -dvc_version = importlib.util.module_from_spec(spec) -spec.loader.exec_module(dvc_version) -version = dvc_version.__version__ - -(dvc / "version.py").write_text( - textwrap.dedent( - f"""\ - # AUTOGENERATED at build time by scripts/build.py - __version__ = "{version}" - """ - ) -) +if not (dvc / "_dvc_version.py").exists(): + raise Exception("no version info found") check_call( ["python", "build.py"],