Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ scripts/ci/gcp-creds.json
.gcp-creds.json

*~
/dvc/_version.py
/dvc/_dvc_version.py
2 changes: 1 addition & 1 deletion dvc/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

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
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
Expand Down
4 changes: 2 additions & 2 deletions dvc/version.py
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down