From b342f4ccb65bedef4ae81a2f9f3aa6baf7b2e07a Mon Sep 17 00:00:00 2001 From: "Yakubov, Sergey" Date: Fri, 17 Nov 2023 12:08:28 -0500 Subject: [PATCH] rename _sync_cache -> sync_cache --- lib/galaxy/model/none_like.py | 2 +- lib/galaxy/tool_util/data/__init__.py | 2 +- test/unit/app/jobs/dynamic_tool_destination/mockGalaxy.py | 2 +- test/unit/app/tools/test_wrappers.py | 2 +- test/unit/data/datatypes/test_connectivity_table.py | 2 +- test/unit/data/datatypes/test_validation.py | 2 +- test/unit/data/datatypes/util.py | 6 +++--- test/unit/tool_util/data/test_tool_data_bundles.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/galaxy/model/none_like.py b/lib/galaxy/model/none_like.py index 7fa7175d7f3..80e96c16b7e 100644 --- a/lib/galaxy/model/none_like.py +++ b/lib/galaxy/model/none_like.py @@ -38,5 +38,5 @@ class NoneDataset(RecursiveNone): def missing_meta(self): return False - def get_file_name(self, _sync_cache=True): + def get_file_name(self, sync_cache=True): return "None" diff --git a/lib/galaxy/tool_util/data/__init__.py b/lib/galaxy/tool_util/data/__init__.py index 94e27437939..849be7bb90e 100644 --- a/lib/galaxy/tool_util/data/__init__.py +++ b/lib/galaxy/tool_util/data/__init__.py @@ -891,7 +891,7 @@ class DirectoryAsExtraFiles(HasExtraFiles): class OutputDataset(HasExtraFiles, Protocol): ext: str - def get_file_name(self, _sync_cache=True) -> str: + def get_file_name(self, sync_cache=True) -> str: ... diff --git a/test/unit/app/jobs/dynamic_tool_destination/mockGalaxy.py b/test/unit/app/jobs/dynamic_tool_destination/mockGalaxy.py index 919eecfc642..17f4ce9cf72 100644 --- a/test/unit/app/jobs/dynamic_tool_destination/mockGalaxy.py +++ b/test/unit/app/jobs/dynamic_tool_destination/mockGalaxy.py @@ -43,7 +43,7 @@ class Dataset: def get_metadata(self): return self.metadata - def get_file_name(self, _sync_cache=True): + def get_file_name(self, sync_cache=True): return self.file_name_ diff --git a/test/unit/app/tools/test_wrappers.py b/test/unit/app/tools/test_wrappers.py index 96c18253e87..69cca55f204 100644 --- a/test/unit/app/tools/test_wrappers.py +++ b/test/unit/app/tools/test_wrappers.py @@ -312,7 +312,7 @@ class MockDataset: self.ext = MOCK_DATASET_EXT self.tags = [] - def get_file_name(self, _sync_cache=True): + def get_file_name(self, sync_cache=True): return MOCK_DATASET_PATH diff --git a/test/unit/data/datatypes/test_connectivity_table.py b/test/unit/data/datatypes/test_connectivity_table.py index 521ecb59c13..b73ad1fdb92 100644 --- a/test/unit/data/datatypes/test_connectivity_table.py +++ b/test/unit/data/datatypes/test_connectivity_table.py @@ -9,7 +9,7 @@ from galaxy.util import galaxy_directory @pytest.fixture def dataset(): class MockDataset: - def get_file_name(self, _sync_cache=True): + def get_file_name(self, sync_cache=True): return os.path.join(galaxy_directory(), "test-data/1.ct") return MockDataset() diff --git a/test/unit/data/datatypes/test_validation.py b/test/unit/data/datatypes/test_validation.py index 0b4164dd5e1..5ce7e214953 100644 --- a/test/unit/data/datatypes/test_validation.py +++ b/test/unit/data/datatypes/test_validation.py @@ -60,5 +60,5 @@ class MockDataset: self.file_name_ = file_name self.datatype = datatype - def get_file_name(self, _sync_cache=True): + def get_file_name(self, sync_cache=True): return self.file_name_ diff --git a/test/unit/data/datatypes/util.py b/test/unit/data/datatypes/util.py index df12959a6b8..ff0de253899 100644 --- a/test/unit/data/datatypes/util.py +++ b/test/unit/data/datatypes/util.py @@ -13,7 +13,7 @@ class MockDatasetDataset: self.purged = False self.file_name_ = file_name - def get_file_name(self, _sync_cache=True): + def get_file_name(self, sync_cache=True): return self.file_name_ def set_file_name(self, file_name): @@ -23,7 +23,7 @@ class MockDatasetDataset: class MockMetadata: file_name_: Optional[str] = None - def get_file_name(self, _sync_cache=True): + def get_file_name(self, sync_cache=True): return self.file_name_ def set_file_name(self, file_name): @@ -37,7 +37,7 @@ class MockDataset: self.dataset = None self.file_name_: Optional[str] = None - def get_file_name(self, _sync_cache=True): + def get_file_name(self, sync_cache=True): return self.file_name_ def set_file_name(self, file_name): diff --git a/test/unit/tool_util/data/test_tool_data_bundles.py b/test/unit/tool_util/data/test_tool_data_bundles.py index f4926156a32..2e1a1f27174 100644 --- a/test/unit/tool_util/data/test_tool_data_bundles.py +++ b/test/unit/tool_util/data/test_tool_data_bundles.py @@ -76,7 +76,7 @@ class OutputDataset: extra_files_path: str ext: str = "data_manager_json" - def get_file_name(self, _sync_cache=True) -> str: + def get_file_name(self, sync_cache=True) -> str: return self.file_name_ def extra_files_path_exists(self) -> bool: