csspin-python 3.1.0__py3-none-any.whl → 3.2.0__py3-none-any.whl

csspin_python/python.py

@@ -74,9 +74,10 @@ import os
 import re
 import shutil
 import sys
+from contextlib import contextmanager
 from subprocess import check_output
 from textwrap import dedent, indent
-from typing import Iterable, Type, Union
+from typing import Generator, Iterable, Type, Union
 
 try:
     from typing import Self  # type: ignore[attr-defined]
@@ -159,33 +160,13 @@ defaults = config(
         key_duration=3600 * 10,  # 10 hours
         static_oidc=False,
         index="16.0/simple",
+        # Need to set client secret to empty string, otherwise the string "None"
+        # would be handled as secret and obfucsated in logs.
+        client_secret="",  # nosec: B106
     ),
     index_url="https://pypi.org/simple",
-    requires=config(
-        python=["build", "wheel"],
-        system=config(
-            debian=config(
-                apt=[
-                    "build-essential",
-                    "curl",
-                    "git",
-                    "libbz2-dev",
-                    "libffi-dev",
-                    "libkrb5-dev",
-                    "liblzma-dev",
-                    "libncursesw5-dev",
-                    "libreadline-dev",
-                    "libsqlite3-dev",
-                    "libssl-dev",
-                    "libxml2-dev",
-                    "libxmlsec1-dev",
-                    "make",
-                    "xz-utils",
-                    "zlib1g-dev",
-                ]
-            )
-        ),
-    ),
+    skip_js_build=None,
+    requires=config(python=["build", "wheel"]),
 )
 
 
@@ -310,12 +291,23 @@ def nuget_install(cfg: ConfigTree) -> None:
 
 def provision(cfg: ConfigTree) -> None:
     """Provision the python plugin"""
+    if not cfg.python.use and exists(cfg.python.python):
+        python_version = (
+            check_output([cfg.python.python, "--version"])
+            .decode()
+            .strip()
+            .replace("Python ", "")
+        )
+        if python_version and not python_version.startswith(cfg.python.version):
+            _cleanup_memoed_provisioners(cfg)
+            rmtree(cfg.python.provisioner_memo)
+            rmtree(cfg.python.aws_auth.memo)
+            rmtree(cfg.python.venv)
     with memoizer(cfg.python.provisioner_memo) as memo:
         if cfg.python.provisioner is None:
             cfg.python.provisioner = SimpleProvisioner(cfg)
         if not memo.check(cfg.python.provisioner):
             memo.add(cfg.python.provisioner)
-
     if not shutil.which(cfg.python.interpreter):
         cfg.python.provisioner.provision_python(cfg)
 
@@ -353,6 +345,10 @@ def configure(cfg: ConfigTree) -> None:
 
     if exists(cfg.python.python):
         cfg.python.site_packages = get_site_packages(interpreter=cfg.python.python)
+        # Built JS should still be available in this case
+        # Skip only if users hasn't explicitly set it to False
+        if cfg.python.skip_js_build is None:
+            cfg.python.skip_js_build = True
 
     if cfg.python.aws_auth.enabled:
         _check_aws_token_validity(cfg)
@@ -831,13 +827,31 @@ class SimpleProvisioner(ProvisionerProtocol):
         )
 
     def install(self: Self, cfg: ConfigTree) -> None:
-        if requirements := self._filter(
-            self._requirements, self._m, cfg.spin.project_root
-        ):
-            self._install_command(*self._split(requirements))
-            self._m.clear()
-            for req in requirements:
-                self._m.add(_req_for_memo(req, cfg.spin.project_root))
+        @contextmanager
+        def skip_js_build(cfg: ConfigTree) -> Generator[None, None, None]:
+            if cfg.python.skip_js_build:
+                try:
+                    setenv(SETUPTOOLS_CE_BUILD_JS_SKIP=1)
+                    yield
+                    setenv(SETUPTOOLS_CE_BUILD_JS_SKIP=None)
+                finally:
+                    # Make sure the variable will not be written into the
+                    # activation scripts
+                    global EXPORTS  # pylint: disable=global-statement
+                    EXPORTS = [
+                        (k, v) for k, v in EXPORTS if k != "SETUPTOOLS_CE_BUILD_JS_SKIP"
+                    ]
+            else:
+                yield
+
+        with skip_js_build(cfg):
+            if self._m.items():
+                self._install_command("--upgrade", *self._split(self._requirements))
+            else:
+                self._install_command(*self._split(self._requirements))
+        self._m.clear()
+        for req in self._requirements:
+            self._m.add(_req_for_memo(req, cfg.spin.project_root))
 
     @staticmethod
     def _split(requirements: Iterable[str]) -> list[str]:
@@ -847,20 +861,6 @@ class SimpleProvisioner(ProvisionerProtocol):
             requirement_list.extend(requirement.split())
         return requirement_list
 
-    @staticmethod
-    def _filter(
-        requirements: set[str], memo: Memoizer, project_root: Union[Path, str]
-    ) -> set[str]:
-        """
-        We want to filter all requirements prior to installing them, because we
-        only want to run the install, when there are changes, as it takes pip
-        quite some time to check, whether it has to do something.
-        """
-        if all(memo.check(_req_for_memo(req, project_root)) for req in requirements):
-            return set()
-        else:
-            return requirements
-
 
 def _file_hash(filename: Union[Path, str]) -> str:
     """
@@ -922,8 +922,8 @@ def venv_provision(  # pylint: disable=too-many-branches,missing-function-docstr
     cfg: ConfigTree,
 ) -> None:
     fresh_env = False
-
     info("Checking venv '{python.venv}'")
+
     if not exists(cfg.python.venv):
         info("Provisioning venv '{python.venv}'")
         cfg.python.provisioner.provision_venv(cfg)
@@ -964,6 +964,19 @@ def venv_provision(  # pylint: disable=too-many-branches,missing-function-docstr
 
 def cleanup(cfg: ConfigTree) -> None:
     """Remove directories and files generated by the python plugin."""
+    _cleanup_memoed_provisioners(cfg)
+    rmtree(cfg.python.provisioner_memo)
+    rmtree(cfg.python.aws_auth.memo)
+    for path in cfg.python.build_wheels:
+        current_path = Path(interpolate1(path))
+        rmtree(current_path / "build")
+        rmtree(current_path / "dist")
+        for filename in os.listdir(current_path):
+            if filename.endswith(".egg-info") or filename.endswith(".dist-info"):
+                rmtree(current_path / filename)
+
+
+def _cleanup_memoed_provisioners(cfg: ConfigTree) -> None:
     with memoizer(cfg.python.provisioner_memo) as memo:
         for provisioner in memo.items():
             try:
@@ -975,16 +988,6 @@ def cleanup(cfg: ConfigTree) -> None:
                 )
         memo.clear()
 
-    rmtree(cfg.python.provisioner_memo)
-    rmtree(cfg.python.aws_auth.memo)
-    for path in cfg.python.build_wheels:
-        current_path = Path(interpolate1(path))
-        rmtree(current_path / "build")
-        rmtree(current_path / "dist")
-        for filename in os.listdir(current_path):
-            if filename.endswith(".egg-info") or filename.endswith(".dist-info"):
-                rmtree(current_path / filename)
-
 
 def _get_pipconf(cfg: ConfigTree) -> Path:
     """Retrieve the pipconf configuration file path."""
@@ -1018,7 +1021,9 @@ def _obfuscate_index_url(index_url: str) -> None:
     secrets.add(index_url.split(":")[2].split("@")[0])  # Codeartifact token
 
 
-def _check_aws_token_validity(cfg: ConfigTree) -> None:
+def _check_aws_token_validity(  # pylint: disable=too-many-locals
+    cfg: ConfigTree,
+) -> None:
     """
     If csspin-python[aws_auth] is installed, we can use csaccess to get the
     CodeArtifact authentication token.
@@ -1034,6 +1039,17 @@ def _check_aws_token_validity(cfg: ConfigTree) -> None:
 
     import time
 
+    if not (
+        client_secret := (
+            interpolate1(cfg.python.aws_auth.client_secret)
+            or os.getenv("CS_AWS_OIDC_CLIENT_SECRET")
+        )
+    ):
+        die(
+            "Please provide a client secret for CodeArtifact access via"
+            " 'python.aws_auth.client_secret'."
+        )
+
     current_time = int(time.time())
     timestamp_key = "aws_auth_timestamp"
 
@@ -1059,18 +1075,24 @@ def _check_aws_token_validity(cfg: ConfigTree) -> None:
                 memo.items().remove(item)
         else:
             info("Updating Codeartifact token.")
+            from urllib.error import HTTPError
             from urllib.parse import urljoin
 
             opts = {
+                "client_secret": client_secret,
                 "static_oidc": interpolate1(cfg.python.aws_auth.static_oidc).lower()
-                == "true"
+                == "true",
             }
             if cfg.python.aws_auth.client_id:
                 opts["client_id"] = interpolate1(cfg.python.aws_auth.client_id)
             if cfg.python.aws_auth.role_arn:
                 opts["aws_role_arn"] = interpolate1(cfg.python.aws_auth.role_arn)
 
-            index_base_url = get_ca_pypi_url_programmatic(**opts)
+            try:
+                index_base_url = get_ca_pypi_url_programmatic(**opts)
+            except HTTPError as e:
+                die(f"Failed to establish CodeArtifact connection: {e}")
+
             index_url = urljoin(
                 index_base_url + "/", interpolate1(cfg.python.aws_auth.index)
             )

csspin_python/python_schema.yaml

@@ -148,10 +148,20 @@ python:
                         CodeArtifact.
                 index:
                     type: str
-                    help: The Codeartifact repository index (e.g. "16.0/simple").
+                    help: The CodeArtifact repository index (e.g. "16.0/simple").
                 client_id:
                     type: str
                     help: The OIDC client ID to use.
+                client_secret:
+                    type: secret
+                    help: |
+                        The OIDC client secret to use, defaults to the
+                        environment variable 'CS_AWS_OIDC_CLIENT_SECRET'.
                 role_arn:
                     type: str
                     help: The role ARN to assume when authenticating.
+        skip_js_build:
+            type: bool
+            help: |
+                If true the build_js part of setuptools_ce will be skipped
+                during provision.

csspin_python/uv_provisioner.py

@@ -180,7 +180,7 @@ def _update_index_url_in_toml(cfg: ConfigTree) -> None:
     """
     Update the index-url in the uv.toml in case it changed.
     """
-    if (uv_toml_path := interpolate1(cfg.uv_provisioner.uv_toml_path)).exists():
+    if (uv_toml_path := interpolate1(Path(cfg.uv_provisioner.uv_toml_path))).exists():
         with open(uv_toml_path, mode="r+b") as fd:
             toml_content = tomllib.load(fd)
             if toml_content.get("index-url") != cfg.python.index_url:

{csspin_python-3.1.0.dist-info → csspin_python-3.2.0.dist-info}/METADATA

@@ -1,11 +1,15 @@
 Metadata-Version: 2.4
 Name: csspin-python
-Version: 3.1.0
+Version: 3.2.0
 Summary: Plugin-package for csspin providing Python related plugins
 Author-email: CONTACT Software GmbH <info@contact-software.com>
 Maintainer-email: Waleri Enns <waleri.enns@contact-software.com>, Benjamin Thomas Schwertfeger <benjaminthomas.schwertfeger@contact-software.com>, Fabian Hafer <fabian.hafer@contact-software.com>
 License-Expression: Apache-2.0
-Project-URL: Homepage, https://contact-software.com
+Project-URL: CONTACT Software GmbH, https://contact-software.com
+Project-URL: Documentation, https://csspin-python.readthedocs.io/en/stable/
+Project-URL: Issue Tracker, https://github.com/cslab/csspin-python/issues
+Project-URL: Release Notes, https://csspin-python.readthedocs.io/en/stable/relnotes.html
+Project-URL: Repository, https://github.com/cslab/csspin-python
 Classifier: Environment :: Console
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{csspin_python-3.1.0.dist-info → csspin_python-3.2.0.dist-info}/RECORD

@@ -8,14 +8,14 @@ csspin_python/playwright.py,sha256=oFfphLqa4AB6K9vasCUFHN0kFXu63n3ocrsqVuRp4-0,5
 csspin_python/playwright_schema.yaml,sha256=TSeR16YHa7m7bfO59F2eMV-jXcglluTJdEpUeL16saY,1178
 csspin_python/pytest.py,sha256=pTOb5zFd9RINZwJsHNaRuSGVDkPMABzaAhwpAJo1nQE,4574
 csspin_python/pytest_schema.yaml,sha256=tzXtdF6MvGC9v59EVRJFfLeMMHqPsXcFXy2zJtRECBI,1535
-csspin_python/python.py,sha256=Hht9TcBhIcHU4PdicB5W7s-9OYepUnxK1bdpxzob1Ro,34697
-csspin_python/python_schema.yaml,sha256=J9GEr5023cUHvfvSRiD1572eSVvfXt8-XEk9uhowhlc,5939
+csspin_python/python.py,sha256=rSdF72FkcxiCrzLWSV7Cr4Thx5OgHGN7b6RKgOaXFEg,35871
+csspin_python/python_schema.yaml,sha256=pgVVjByUYjxQWek7aFmjQzRwmq2ROLvHYgwGPMrT9sM,6351
 csspin_python/radon.py,sha256=uFqm6FEi5oWj-_XVaAm3s9cam0cUmr1_FwRf40K6xWs,1876
 csspin_python/radon_schema.yaml,sha256=rlRzXw5z4XbjOVznRiUxWGP4E9hx1Jm-gGw1iQiYzE0,548
-csspin_python/uv_provisioner.py,sha256=8d_24xyofO_6wU7bkomAH1FfY6P_Am0Yy6CXbzLxWN4,5993
+csspin_python/uv_provisioner.py,sha256=MGedx4e286ZE1miwh70y6b3wePw3mmc0m1kG6H_738I,5999
 csspin_python/uv_provisioner_schema.yaml,sha256=Y8ZNC2OMnhR8Us3WUXAXK9hMjqGWAKFJB2puX4X5XNQ,727
-csspin_python-3.1.0.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
-csspin_python-3.1.0.dist-info/METADATA,sha256=YIDI67iYHouz4I8dVqCkMtcpXgQTXqmXlz3yUwjbeaM,4715
-csspin_python-3.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-csspin_python-3.1.0.dist-info/top_level.txt,sha256=QSeglMEGbFu1z4L6MCQYwo01NgL0KojWvC4rzgMQ8gU,14
-csspin_python-3.1.0.dist-info/RECORD,,
+csspin_python-3.2.0.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
+csspin_python-3.2.0.dist-info/METADATA,sha256=54Kz-P7RQC4aHc31QmvyZnY2QSZgrnn9BnIW5ogr8ws,5031
+csspin_python-3.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+csspin_python-3.2.0.dist-info/top_level.txt,sha256=QSeglMEGbFu1z4L6MCQYwo01NgL0KojWvC4rzgMQ8gU,14
+csspin_python-3.2.0.dist-info/RECORD,,