Merge branch 'main' into bits

Author: martindurant

pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
 
 [project.optional-dependencies]
 test = ["pytest", "pytest-cov", "django", "streamlit", "copier", "jinja2-time", "flask",
-    "maturin", "uv"]
+    "maturin", "uv", "briefcase"]
 qt = ["pyqt>5,<6", "pyqtwebengin>5,<6"]
 
 [project.scripts]

src/projspec/artifact/base.py

@@ -1,12 +1,11 @@
 import logging
-import subprocess
 from typing import Literal
 
 import fsspec.implementations.local
 
 from projspec.config import get_conf
 from projspec.proj import Project
-from projspec.utils import camel_to_snake, is_installed
+from projspec.utils import camel_to_snake, is_installed, run_subprocess
 
 logger = logging.getLogger("projspec")
 registry = {}
@@ -57,7 +56,7 @@ def make(self, *args, **kwargs):
 
     def _make(self, *args, **kwargs):
         logger.info("running %s", self.cmd)
-        subprocess.check_call(self.cmd, cwd=self.proj.url, **kwargs)
+        run_subprocess(self.cmd, cwd=self.proj.url, output=False, **kwargs)
 
     def remake(self):
         """Recreate the artifact and any runtime it depends on"""

src/projspec/artifact/container.py

@@ -1,7 +1,6 @@
-import subprocess
-
 from projspec.proj.base import Project, ProjectExtra
 from projspec.artifact import BaseArtifact
+from projspec.utils import run_subprocess
 
 
 class DockerImage(BaseArtifact):
@@ -28,16 +27,19 @@ def _make(self, *args, **kwargs) -> None:
         :param args: added to the docker run command
         :param kwargs: affect the docker run subprocess call
         """
-        out = subprocess.check_output(self.cmd, cwd=self.proj.url, **kwargs)
+        out = run_subprocess(self.cmd, cwd=self.proj.url, **kwargs).stdout
         if self.tag:
-            subprocess.check_call(["docker", "run", self.tag])
+            run_subprocess(["docker", "run", self.tag], cwd=self.proj.url, output=False)
         else:
             lines = [
                 l for l in out.splitlines() if l.startswith(b"Successfully built ")
             ]
             img = lines[-1].split()[-1]
-            subprocess.check_call(
-                ["docker", "run", img.decode()] + list(args), **kwargs
+            run_subprocess(
+                ["docker", "run", img.decode()] + list(args),
+                cwd=self.proj.url,
+                output=False,
+                **kwargs,
             )
 
 

src/projspec/artifact/installable.py

@@ -1,11 +1,10 @@
 from enum import auto
 import logging
 import os.path
-import subprocess
 from platform import architecture
 
 from projspec.artifact import FileArtifact
-from projspec.utils import Enum
+from projspec.utils import Enum, run_subprocess
 
 logger = logging.getLogger("projspec")
 
@@ -54,7 +53,7 @@ def _make(self, *args, **kwargs):
         import re
 
         logger.debug(" ".join(self.cmd))
-        out = subprocess.check_output(self.cmd).decode("utf-8")
+        out = run_subprocess(self.cmd, cwd=self.proj.url).stdout.decode("utf-8")
         if fn := re.match(r"'(.*?\.conda)'\n", out):
             if os.path.exists(fn.group(1)):
                 self.fn = fn.group(1)

src/projspec/artifact/process.py

@@ -11,6 +11,7 @@
 
 from projspec.artifact import BaseArtifact
 from projspec.config import get_conf
+from projspec.utils import run_subprocess
 
 
 logger = logging.getLogger("projspec")
@@ -51,9 +52,10 @@ def _make(self, enqueue=True, **kwargs):
                 kwargs["stdout"] = subprocess.PIPE
                 kwargs["stderr"] = subprocess.STDOUT
                 kwargs["close_fds"] = ON_POSIX
-            proc = subprocess.Popen(
+            proc = run_subprocess(
                 self.cmd,
                 cwd=self.proj.url,
+                popen=True,
                 **kwargs,
             )
             if enq:

src/projspec/artifact/python_env.py

@@ -6,10 +6,10 @@
 """
 
 import json
-import subprocess
 from functools import cache
 
 from projspec.artifact import FileArtifact
+from projspec.utils import run_subprocess
 
 
 class CondaEnv(FileArtifact):
@@ -27,7 +27,7 @@ class CondaEnv(FileArtifact):
     def envs() -> list[str]:
         """Global conda env root paths"""
         # pixi also has global envs
-        out = subprocess.check_output(["conda", "env", "list", "--json"])
+        out = run_subprocess(["conda", "env", "list", "--json"]).stdout
         return json.loads(out.decode())["envs"]
 
 

src/projspec/proj/briefcase.py

@@ -1,5 +1,7 @@
+import os
+
 from projspec.proj import ProjectSpec
-from projspec.utils import AttrDict
+from projspec.utils import AttrDict, run_subprocess, make_and_copy
 
 
 def supported(apps: dict, app: str, *config) -> bool:
@@ -162,3 +164,9 @@ def parse(self) -> None:
                         "zip",
                     ],
                 )
+
+    @staticmethod
+    def _create(path: str) -> None:
+        # TODO: this version will overwrite any pyproject.toml
+        with make_and_copy(path, sub="helloworld", mkdir=True) as tmp:
+            run_subprocess(["briefcase", "new", "--no-input"], cwd=tmp, output=False)

src/projspec/proj/git.py

@@ -1,7 +1,5 @@
-import subprocess
-
 from projspec.proj.base import ProjectSpec
-from projspec.utils import AttrDict
+from projspec.utils import AttrDict, run_subprocess
 
 
 class GitRepo(ProjectSpec):
@@ -17,7 +15,7 @@ def match(self) -> bool:
 
     @staticmethod
     def _create(path: str) -> None:
-        subprocess.check_call(["git", "init", path])
+        run_subprocess(["git", "init"], cwd=path, output=False)
 
     def parse(self) -> None:
         # It's faster to read the /.git/config file for branches, remotes and URLs;

src/projspec/proj/node.py

@@ -3,6 +3,7 @@
 from projspec.proj.base import ProjectSpec, ParseFailed
 from projspec.content.package import NodePackage
 from projspec.artifact.process import Process
+from projspec.utils import run_subprocess
 from projspec.content.executable import Command
 from projspec.utils import AttrDict
 
@@ -195,8 +196,6 @@ def parse(self):
     # create() with https://github.com/jupyterlab/extension-template
     @staticmethod
     def _create(path: str, name: str | None = None) -> None:
-        import subprocess
-
         # this is a highly opinionated template
         cmd = [
             "copier",
@@ -212,4 +211,4 @@ def _create(path: str, name: str | None = None) -> None:
             "https://github.com/jupyterlab/extension-template",
             path,
         ]
-        subprocess.check_call(cmd, cwd=path)
+        run_subprocess(cmd, cwd=path, output=False)

src/projspec/proj/rust.py

@@ -1,8 +1,6 @@
-import subprocess
-
 import toml
 from projspec.proj import ProjectSpec, PythonLibrary
-from projspec.utils import AttrDict
+from projspec.utils import AttrDict, run_subprocess
 
 
 class Rust(ProjectSpec):
@@ -39,7 +37,7 @@ def parse(self):
 
     @staticmethod
     def _create(path: str) -> None:
-        subprocess.check_call(["cargo", "init"], cwd=path)
+        run_subprocess(["cargo", "init"], cwd=path, output=False)
 
 
 class RustPython(Rust, PythonLibrary):
@@ -69,4 +67,6 @@ def parse(self):
     def _create(path: str) -> None:
         # will fail for existing python libraries, since it doesn't want to edit
         # the pyproject.toml build backend.
-        subprocess.check_call(["maturin", "init", "-b", "pyo3", "--mixed"], cwd=path)
+        run_subprocess(
+            ["maturin", "init", "-b", "pyo3", "--mixed"], cwd=path, output=False
+        )