diff --git a/dvc/command/version.py b/dvc/command/version.py index 0025ee4b2..e8e687d2d 100644 --- a/dvc/command/version.py +++ b/dvc/command/version.py @@ -18,7 +18,7 @@ from dvc.command.base import CmdBaseNoRepo, append_doc_link from dvc.version import __version__ from dvc.exceptions import DvcException, NotDvcRepoError from dvc.system import System -from dvc.utils.pkg import get_package_manager +from dvc.utils.pkg import PKG logger = logging.getLogger(__name__) @@ -31,19 +31,18 @@ class CmdVersion(CmdBaseNoRepo): python_version = platform.python_version() platform_type = platform.platform() binary = is_binary() - package_manager = get_package_manager() info = ( "DVC version: {dvc_version}\n" "Python version: {python_version}\n" "Platform: {platform_type}\n" "Binary: {binary}\n" - "Package type: {package_manager}\n" + "Package: {package}\n" ).format( dvc_version=dvc_version, python_version=python_version, platform_type=platform_type, binary=binary, - package_manager=package_manager, + package=PKG, ) try: diff --git a/dvc/updater.py b/dvc/updater.py index b8349416a..279d5d23a 100644 --- a/dvc/updater.py +++ b/dvc/updater.py @@ -13,7 +13,7 @@ from dvc.lock import Lock from dvc.lock import LockError from dvc.utils import boxify from dvc.utils import env2bool -from dvc.utils.pkg import get_package_manager +from dvc.utils.pkg import PKG logger = logging.getLogger(__name__) @@ -143,7 +143,7 @@ class Updater(object): # pragma: no cover ), } - package_manager = get_package_manager() + package_manager = PKG if package_manager in ("osxpkg", "exe"): package_manager = "binary" diff --git a/dvc/utils/pkg.py b/dvc/utils/pkg.py index f5dace688..5d04b78ba 100644 --- a/dvc/utils/pkg.py +++ b/dvc/utils/pkg.py @@ -1,7 +1,4 @@ -def get_package_manager(): - try: - from .build import PKG # file created during dvc build - - return PKG - except ImportError: - return None +try: + from .build import PKG # file created during dvc build +except ImportError: + PKG = None diff --git a/scripts/build_posix.sh b/scripts/build_posix.sh index c9926a2c4..53e07dacf 100755 --- a/scripts/build_posix.sh +++ b/scripts/build_posix.sh @@ -133,12 +133,12 @@ build_dvc() build() { + cleanup echo "PKG = \"$1\"" > dvc/utils/build.py build_dvc fpm_build $1 } -cleanup install_dependencies if [[ "$(uname)" == 'Linux' ]]; then diff --git a/tests/func/test_version.py b/tests/func/test_version.py index 0668fe720..c8614acd6 100644 --- a/tests/func/test_version.py +++ b/tests/func/test_version.py @@ -16,7 +16,7 @@ def test_info_in_repo(repo_dir, dvc_repo, caplog): assert re.search(re.compile(r"Python version: \d\.\d\.\d"), caplog.text) assert re.search(re.compile(r"Platform: .*"), caplog.text) assert re.search(re.compile(r"Binary: (True|False)"), caplog.text) - assert re.search(re.compile(r"Package type: .*"), caplog.text) + assert re.search(re.compile(r"Package: .*"), caplog.text) assert re.search( re.compile(r"(Cache: (.*link - (True|False)(,\s)?){3})"), caplog.text ) @@ -41,7 +41,7 @@ def test_info_outside_of_repo(repo_dir, caplog): assert re.search(re.compile(r"Python version: \d\.\d\.\d"), caplog.text) assert re.search(re.compile(r"Platform: .*"), caplog.text) assert re.search(re.compile(r"Binary: (True|False)"), caplog.text) - assert re.search(re.compile(r"Package type: .*"), caplog.text) + assert re.search(re.compile(r"Package: .*"), caplog.text) assert not re.search( re.compile(r"(Cache: (.*link - (True|False)(,\s)?){3})"), caplog.text )