fix: add testcase for script directive to work with Python 3.7 and corresponding fix.

johanneskoester · johanneskoester · commit 0b4ae2e11553 · 2023-12-19T12:18:05.000+01:00
diff --git a/snakemake/script/__init__.py b/snakemake/script/__init__.py
diff --git a/snakemake/settings.py b/snakemake/settings.py
@@ -1,10 +1,8 @@
 from abc import ABC
 from dataclasses import dataclass, field
-from enum import Enum
-import importlib
 from pathlib import Path
 from typing import Optional
-from collections.abc import Mapping, Sequence, Set
+from typing import Mapping, Sequence, Set
 
 import immutables
 
diff --git a/tests/test_script_pre_py39/Snakefile b/tests/test_script_pre_py39/Snakefile
@@ -0,0 +1,7 @@
+rule a:
+    output:
+        "test.out"
+    conda:
+        "env.yaml"
+    script:
+        "script.py"
diff --git a/tests/test_script_pre_py39/env.yaml b/tests/test_script_pre_py39/env.yaml
@@ -0,0 +1,5 @@
+channels:
+  - conda-forge
+  - nodefaults
+dependencies:
+  - python =3.7
diff --git a/tests/test_script_pre_py39/expected-results/test.out b/tests/test_script_pre_py39/expected-results/test.out
@@ -0,0 +1 @@
+test
diff --git a/tests/test_script_pre_py39/script.py b/tests/test_script_pre_py39/script.py
@@ -0,0 +1,3 @@
+from snakemake.shell import shell
+print("test", file=open(snakemake.output[0], "w"))
+shell("echo test")
diff --git a/tests/tests.py b/tests/tests.py
@@ -1921,3 +1921,7 @@ def test_conda_global():
 
 def test_missing_file_dryrun():
     run(dpath("test_missing_file_dryrun"), executor="dryrun", shouldfail=True)
+
+
+def test_script_pre_py39():
+    run(dpath("test_script_pre_py39"), deployment_method={DeploymentMethod.CONDA})

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from snakemake.shell import shell`
	`2`	`+print("test", file=open(snakemake.output[0], "w"))`
	`3`	`+shell("echo test")`