diff --git a/.gitignore b/.gitignore index 6acd91491..ce78cdb25 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,4 @@ scripts/ci/gcp-creds.json .gcp-creds.json *~ -/dvc/_version.py +/dvc/_dvc_version.py diff --git a/dvc/info.py b/dvc/info.py index 06340be99..c1d05fdb0 100644 --- a/dvc/info.py +++ b/dvc/info.py @@ -6,6 +6,7 @@ import uuid import psutil +from dvc import __version__ from dvc.exceptions import DvcException, NotDvcRepoError from dvc.fs import FS_MAP, get_fs_cls, get_fs_config from dvc.repo import Repo @@ -13,7 +14,6 @@ from dvc.scm.base import SCMError from dvc.system import System from dvc.utils import error_link from dvc.utils.pkg import PKG -from dvc.version import __version__ try: import importlib.metadata as importlib_metadata diff --git a/dvc/version.py b/dvc/version.py index 3611fbee6..820edde88 100644 --- a/dvc/version.py +++ b/dvc/version.py @@ -1,6 +1,6 @@ # pylint: disable=unused-import try: - from ._version import version as __version__ - from ._version import version_tuple # noqa: F401 + from ._dvc_version import version as __version__ + from ._dvc_version import version_tuple # noqa: F401 except ImportError: __version__ = "UNKNOWN" diff --git a/pyproject.toml b/pyproject.toml index c507b8f01..b6785e142 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools>=48", "wheel", "setuptools_scm[toml]>=6.3.1"] build-backend = "setuptools.build_meta" [tool.setuptools_scm] -write_to = "dvc/_version.py" +write_to = "dvc/_dvc_version.py" [tool.black] line-length = 79