ppqs 2.2.1__tar.gz → 2.3.1__tar.gz

{ppqs-2.2.1/src/ppqs.egg-info → ppqs-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ppqs
-Version: 2.2.1
+Version: 2.3.1
 Summary: Python project quick scripts
 Author-email: Karl Wette <karl.wette@anu.edu.au>
 License-Expression: MIT

{ppqs-2.2.1 → ppqs-2.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ppqs"
-version = "2.2.1"
+version = "2.3.1"
 description = "Python project quick scripts"
 authors = [
     { name = "Karl Wette", email = "karl.wette@anu.edu.au" },

{ppqs-2.2.1 → ppqs-2.3.1/src/ppqs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ppqs
-Version: 2.2.1
+Version: 2.3.1
 Summary: Python project quick scripts
 Author-email: Karl Wette <karl.wette@anu.edu.au>
 License-Expression: MIT

{ppqs-2.2.1 → ppqs-2.3.1}/src/py_proj_quick_scripts/__init__.py

@@ -233,24 +233,6 @@ def run_script(scripts, script_name, argv, cwd, has_been_run):
     for command in script["commands"]:
         cmd = []
 
-        cmd_exec = command.pop(0)
-        if cmd_exec == "ppqs":
-
-            # Recursively run script
-            # - silently ignore scripts which have already been run
-            script_name_r = command.pop(0)
-            if script_name_r not in has_been_run:
-                run_script(scripts, script_name_r, argv, cwd, has_been_run)
-            continue
-
-        elif cmd_exec == "python":
-
-            # Use same Python as ppqs to run Python scripts
-            cmd.append(sys.executable)
-
-        else:
-            cmd.append(cmd_exec)
-
         for arg in command:
             if isinstance(arg, Path):
                 if "*" in arg.parts[-1]:
@@ -269,6 +251,20 @@ def run_script(scripts, script_name, argv, cwd, has_been_run):
             else:
                 cmd.append(arg)
 
+        if cmd[0] == "ppqs":
+
+            # Recursively run script
+            # - silently ignore scripts which have already been run
+            script_name_r = cmd[1]
+            if script_name_r not in has_been_run:
+                run_script(scripts, script_name_r, cmd[2:], cwd, has_been_run)
+            continue
+
+        elif cmd[0] == "python":
+
+            # Use same Python as ppqs to run Python scripts
+            cmd[0] = sys.executable
+
         # Print header
         if script["print-header"]:
             cmd_str = " ".join(cmd)
@@ -276,7 +272,7 @@ def run_script(scripts, script_name, argv, cwd, has_been_run):
             print(header, flush=True)
 
         # Run command
-        retn = subprocess.run(cmd, stdin=subprocess.DEVNULL, shell=False, cwd=cwd)
+        retn = subprocess.run(cmd, shell=False, cwd=cwd)
         if retn.returncode != 0:
             raise SystemExit(retn.returncode)
 

{ppqs-2.2.1 → ppqs-2.3.1}/test/test_cli.py

@@ -39,11 +39,11 @@ def pyproject_path(tmp_path):
         ["python", "-c", "import sys; print(*sys.argv[1:])", ["subdir", "*.txt"]],
     ]
     [tool.ppqs.scripts.greeting]
-    script = "echo Hello"
+    script = "echo Hello ..."
     [tool.ppqs.scripts.farewell]
     script = '''
-    ppqs greeting
-    ppqs greeting
+    ppqs greeting friend!
+    ppqs greeting comrade!
     echo Goodbye
     '''
     """
@@ -131,7 +131,7 @@ def test_recursion(pyproject_path, capfd):
     with in_dir(pyproject_path.parent):
         cli("farewell")
         captured = capfd.readouterr()
-        assert captured.out == "Hello\nGoodbye\n"
+        assert captured.out == "Hello friend!\nGoodbye\n"
         assert captured.err == ""
 
         with pytest.raises(InvalidScriptError):