privatevoid.net/depot
1
1
Fork 0
Code Issues 21 Pull requests 4 Projects 3 Releases Packages Wiki Activity Actions

packages/dvc: new patchset for 2.17.0

Browse source
This commit is contained in:
Max Headroom 2022-12-17 13:52:18 +01:00
parent bcca6929bd
commit 6c6b2c67d9
4 changed files with 503 additions and 1020 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1482
patches/base/dvc/md5-to-sha256.patch
View file

File diff suppressed because it is too large Load diff

27
patches/base/dvc/no-analytics.patch
View file

@ -1,5 +1,11 @@
commit de4f3a29629628c24ca9b69533c83b571c92c73f
Author: Max <max@privatevoid.net>
Date: Sat Dec 17 13:47:49 2022 +0100
no analytics for 2.17.0
diff --git a/dvc/analytics.py b/dvc/analytics.py diff --git a/dvc/analytics.py b/dvc/analytics.py
index 8b9c6310..e6586005 100644 index af4823ea..7effc0b8 100644
--- a/dvc/analytics.py --- a/dvc/analytics.py
+++ b/dvc/analytics.py +++ b/dvc/analytics.py
@@ -1,12 +1,3 @@ @@ -1,12 +1,3 @@
@ -51,14 +57,14 @@ index 8b9c6310..e6586005 100644
- Config(validate=False).get("core", {}).get("analytics", "true") - Config(validate=False).get("core", {}).get("analytics", "true")
- ) - )
- -
- logger.debug("Analytics is {}abled.".format("en" if enabled else "dis")) - logger.debug("Analytics is %sabled.", "en" if enabled else "dis")
- -
- return enabled - return enabled
+ return False + return False
def send(path): def send(path):
@@ -63,88 +25,21 @@ def send(path): @@ -63,88 +25,22 @@ def send(path):
`collect_and_send_report`. Sending happens on another process, `collect_and_send_report`. Sending happens on another process,
thus, the need of removing such file afterwards. thus, the need of removing such file afterwards.
""" """
@ -147,10 +153,11 @@ index 8b9c6310..e6586005 100644
- } - }
- -
- # We don't collect data for any other system. - # We don't collect data for any other system.
+ # We don't collect data :)
raise NotImplementedError raise NotImplementedError
@@ -158,33 +53,4 @@ def _find_or_create_user_id(): @@ -158,33 +54,4 @@ def _find_or_create_user_id():
IDs are generated randomly with UUID. IDs are generated randomly with UUID.
""" """
@ -183,14 +190,14 @@ index 8b9c6310..e6586005 100644
- return user_id - return user_id
- -
- except LockError: - except LockError:
- logger.debug(f"Failed to acquire '{lockfile}'") - logger.debug("Failed to acquire '%s'", lockfile)
+ raise NotImplementedError + raise NotImplementedError
diff --git a/dvc/cli/__init__.py b/dvc/cli/__init__.py diff --git a/dvc/cli/__init__.py b/dvc/cli/__init__.py
index 3002654e..ee61bee4 100644 index e206befd..590b0790 100644
--- a/dvc/cli/__init__.py --- a/dvc/cli/__init__.py
+++ b/dvc/cli/__init__.py +++ b/dvc/cli/__init__.py
@@ -115,11 +115,6 @@ def main(argv=None): # noqa: C901 @@ -211,11 +211,6 @@ def main(argv=None): # noqa: C901
ret = 255 ret = _log_exceptions(exc) or 255
try: try:
- from dvc import analytics - from dvc import analytics
@ -202,7 +209,7 @@ index 3002654e..ee61bee4 100644
finally: finally:
logger.setLevel(outerLogLevel) logger.setLevel(outerLogLevel)
diff --git a/dvc/commands/daemon.py b/dvc/commands/daemon.py diff --git a/dvc/commands/daemon.py b/dvc/commands/daemon.py
index 3e212899..09abaccf 100644 index 2a22de3d..d64a6404 100644
--- a/dvc/commands/daemon.py --- a/dvc/commands/daemon.py
+++ b/dvc/commands/daemon.py +++ b/dvc/commands/daemon.py
@@ -26,15 +26,6 @@ class CmdDaemonUpdater(CmdDaemonBase): @@ -26,15 +26,6 @@ class CmdDaemonUpdater(CmdDaemonBase):
@ -267,7 +274,7 @@ index 3d0c774b..19b86b50 100644
"{yellow}What's next?{nc}\n" "{yellow}What's next?{nc}\n"
"{yellow}------------{nc}\n" "{yellow}------------{nc}\n"
diff --git a/dvc/config_schema.py b/dvc/config_schema.py diff --git a/dvc/config_schema.py b/dvc/config_schema.py
index aa495a89..54ae30b1 100644 index bd514c61..e358b949 100644
--- a/dvc/config_schema.py --- a/dvc/config_schema.py
+++ b/dvc/config_schema.py +++ b/dvc/config_schema.py
@@ -114,7 +114,6 @@ SCHEMA = { @@ -114,7 +114,6 @@ SCHEMA = {

10
patches/base/dvc/yaml-to-json.patch
View file

@ -1,5 +1,11 @@
commit eceb8d19ba9da3c7d07fc5a12636027d499a3a06
Author: Max <max@privatevoid.net>
Date: Sat Dec 17 13:57:49 2022 +0100
yaml to json for 2.17.0
diff --git a/dvc/dvcfile.py b/dvc/dvcfile.py diff --git a/dvc/dvcfile.py b/dvc/dvcfile.py
index e542ba98..40d13a40 100644 index 04db6d5f..4eb40e90 100644
--- a/dvc/dvcfile.py --- a/dvc/dvcfile.py
+++ b/dvc/dvcfile.py +++ b/dvc/dvcfile.py
@@ -14,7 +14,7 @@ from dvc.stage.exceptions import ( @@ -14,7 +14,7 @@ from dvc.stage.exceptions import (
@ -41,7 +47,7 @@ index e542ba98..40d13a40 100644
@@ -198,7 +198,7 @@ class SingleStageFile(FileMixin): @@ -198,7 +198,7 @@ class SingleStageFile(FileMixin):
if self.verify: if self.verify:
check_dvcfile_path(self.repo, self.path) check_dvcfile_path(self.repo, self.path)
logger.debug(f"Saving information to '{relpath(self.path)}'.") logger.debug("Saving information to '%s'.", relpath(self.path))
- dump_yaml(self.path, serialize.to_single_stage_file(stage)) - dump_yaml(self.path, serialize.to_single_stage_file(stage))
+ dump_json(self.path, serialize.to_single_stage_file(stage)) + dump_json(self.path, serialize.to_single_stage_file(stage))
self.repo.scm_context.track_file(self.relpath) self.repo.scm_context.track_file(self.relpath)

0
patches/dvc/yaml-to-json.patch
View file