diff --git a/dvc/analytics.py b/dvc/analytics.py index 2d0d328e7..4a4a4060b 100644 --- a/dvc/analytics.py +++ b/dvc/analytics.py @@ -15,7 +15,7 @@ from dvc.lock import Lock, LockError from dvc.repo import Repo from dvc.scm import SCM from dvc.utils import env2bool, is_binary, makedirs -from dvc.utils.compat import str, FileNotFoundError, fspath_py35 +from dvc.utils.compat import builtin_str, str, FileNotFoundError, fspath_py35 logger = logging.getLogger(__name__) @@ -24,10 +24,10 @@ report_schema = Schema( { "cmd_class": Any(str, None), "cmd_return_code": Any(int, None), - "dvc_version": str, + "dvc_version": Any(builtin_str, str), "is_binary": bool, "scm_class": Any("Git", None), - "user_id": str, + "user_id": Any(builtin_str, str), "system_info": dict, } ) diff --git a/dvc/lock.py b/dvc/lock.py index 1f3df8ebb..d4925e963 100644 --- a/dvc/lock.py +++ b/dvc/lock.py @@ -10,7 +10,7 @@ from funcy.py3 import lkeep from dvc.exceptions import DvcException from dvc.utils import makedirs -from dvc.utils.compat import is_py3, str, fspath +from dvc.utils.compat import is_py3, fspath DEFAULT_TIMEOUT = 5 diff --git a/tests/unit/test_analytics.py b/tests/unit/test_analytics.py index 953a681a3..e62c6e7b5 100644 --- a/tests/unit/test_analytics.py +++ b/tests/unit/test_analytics.py @@ -3,7 +3,7 @@ import pytest import mock from dvc import analytics -from dvc.utils.compat import builtin_str, str +from dvc.utils.compat import str @pytest.fixture