opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename has_yaml to yaml_content per PR review request.

Browse Source
This commit is contained in:
John Chilton
2022-09-20 11:24:48 -04:00
parent e6e94a920a
commit 65c4edac6a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy_test/base/populators.py
+4 -4
View File
@@ -1389,7 +1389,7 @@ class DatasetPopulator(GalaxyInteractorHttpMixin, BaseDatasetPopulator):
# Things gxformat2 knows how to upload as workflows
HasYamlT = Union[str, os.PathLike, dict]
YamlContentT = Union[str, os.PathLike, dict]
class BaseWorkflowPopulator(BasePopulator):
@@ -1444,11 +1444,11 @@ class BaseWorkflowPopulator(BasePopulator):
upload_response = self._post("workflows/upload", data=data)
return upload_response
def upload_yaml_workflow(self, has_yaml: HasYamlT, **kwds) -> str:
def upload_yaml_workflow(self, yaml_content: YamlContentT, **kwds) -> str:
round_trip_conversion = kwds.get("round_trip_format_conversion", False)
client_convert = kwds.pop("client_convert", not round_trip_conversion)
kwds["convert"] = client_convert
workflow = convert_and_import_workflow(has_yaml, galaxy_interface=self, **kwds)
workflow = convert_and_import_workflow(yaml_content, galaxy_interface=self, **kwds)
workflow_id = workflow["id"]
if round_trip_conversion:
workflow_yaml_wrapped = self.download_workflow(workflow_id, style="format2_wrapped_yaml")
@@ -1717,7 +1717,7 @@ class BaseWorkflowPopulator(BasePopulator):
def run_workflow(
self,
has_workflow: HasYamlT,
has_workflow: YamlContentT,
test_data: Optional[Union[str, dict]] = None,
history_id: Optional[str] = None,
wait: bool = True,
lib/galaxy_test/selenium/framework.py
+3 -2
View File
@@ -50,6 +50,7 @@ from galaxy_test.base.env import (
from galaxy_test.base.populators import (
load_data_dict,
skip_if_github_down,
YamlContentT,
)
from galaxy_test.base.testcase import FunctionalTestCase
@@ -785,8 +786,8 @@ class SeleniumSessionWorkflowPopulator(
upload_response.raise_for_status()
return upload_response.json()
def upload_yaml_workflow(self, has_yaml, **kwds) -> str:
workflow = convert_and_import_workflow(has_yaml, galaxy_interface=self, **kwds)
def upload_yaml_workflow(self, yaml_content: YamlContentT, **kwds) -> str:
workflow = convert_and_import_workflow(yaml_content, galaxy_interface=self, **kwds)
return workflow["id"]