Skip to content

Commit

Permalink
test: allow Snakemake tests to run on newer Python versions (#700)
Browse files Browse the repository at this point in the history
After upgrading Snakemake to version 7.32.4 (reanahub/reana-commons#435)
there is no need to avoid running Snakemake tests on Python 3.11 and
3.12, as it should be supported.

Closes #655
  • Loading branch information
giuseppe-steduto committed Jan 26, 2024
1 parent fa5b7c7 commit 7ef65fa
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
6 changes: 3 additions & 3 deletions reana_client/api/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,9 @@ def create_workflow_from_json(
reana_yaml["outputs"] = outputs
if workflow_file:
reana_yaml["workflow"]["file"] = workflow_file
reana_yaml["workflow"][
"specification"
] = load_workflow_spec_from_reana_yaml(reana_yaml, workspace_path)
reana_yaml["workflow"]["specification"] = (
load_workflow_spec_from_reana_yaml(reana_yaml, workspace_path)
)
else:
reana_yaml["workflow"]["specification"] = workflow_json
# The function below loads the input parameters into the reana_yaml dictionary
Expand Down
8 changes: 5 additions & 3 deletions reana_client/validation/environments.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,11 @@ def validate_environment(self):
def _check_environment(environment):
image = "{}{}".format(
environment["image"],
":{}".format(environment["imagetag"])
if "imagetag" in environment
else "",
(
":{}".format(environment["imagetag"])
if "imagetag" in environment
else ""
),
)
k8s_uid = next(
(
Expand Down
4 changes: 0 additions & 4 deletions tests/test_cli_workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,10 +580,6 @@ def test_create_snakemake_workflow_from_json_parameters(
external_parameter_yaml_file,
):
"""Test create workflow from json with external parameters."""
if sys.version_info.major == 3 and sys.version_info.minor in (11, 12):
pytest.xfail(
"Snakemake features of reana-client are not supported on Python 3.11"
)
status_code = 201
response = {
"message": "The workflow has been successfully created.",
Expand Down

0 comments on commit 7ef65fa

Please sign in to comment.