csspin-python 3.1.1__py3-none-any.whl → 4.0.0__py3-none-any.whl

csspin_python/devpi.py

@@ -17,7 +17,6 @@
 
 """Module implementing the devpi plugin for spin"""
 
-
 from typing import Iterable
 
 from csspin import Command, config, die, exists, readyaml, setenv, sh, task

csspin_python/pytest.py

@@ -17,7 +17,6 @@
 
 """Module implementing the pytest plugin for spin"""
 
-
 from typing import Iterable
 
 from csspin import Path, Verbosity, config, die, interpolate1, option, setenv, sh, task

csspin_python/python.py

@@ -74,9 +74,10 @@ import os
 import re
 import shutil
 import sys
-from subprocess import check_output
+from contextlib import contextmanager
+from subprocess import CalledProcessError, 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]
@@ -164,6 +165,7 @@ defaults = config(
         client_secret="",  # nosec: B106
     ),
     index_url="https://pypi.org/simple",
+    skip_js_build=None,
     requires=config(python=["build", "wheel"]),
 )
 
@@ -287,18 +289,74 @@ def nuget_install(cfg: ConfigTree) -> None:
     )
 
 
+def _check_venv(  # pylint: disable=too-many-return-statements
+    cfg: ConfigTree,
+) -> bool:
+    """
+    Checks whether the venv is actually a venv compatible
+    with our configuration and not just some dir.
+    """
+    try:
+        python_version = (
+            check_output([cfg.python.python, "--version"])
+            .decode()
+            .strip()
+            .replace("Python ", "")
+        )
+    except CalledProcessError:
+        return False
+    if not cfg.python.version and not cfg.python.use:
+        return False
+    if cfg.python.use:
+        try:
+            use_python_version = (
+                check_output([cfg.python.use, "--version"])
+                .decode()
+                .strip()
+                .replace("Python ", "")
+            )
+        except CalledProcessError:
+            return False
+        if use_python_version == python_version:
+            return True
+        else:
+            warn(
+                "The cfg.python.use version does not match the cfg.python.python "
+                "version set in the venv. If you want to update the python version "
+                "used in the venv, you have to manually remove it."
+            )
+            return True
+    if python_version.startswith(cfg.python.version):
+        return True
+    return False
+
+
 def provision(cfg: ConfigTree) -> None:
     """Provision the python plugin"""
+
+    info("Checking venv '{python.venv}'")
+
+    fresh_venv = False
+
+    if exists("{python.venv}"):
+        if not _check_venv(cfg):
+            _cleanup_memoed_provisioners(cfg)
+            rmtree(cfg.python.provisioner_memo)
+            rmtree(cfg.python.aws_auth.memo)
+            rmtree(cfg.python.venv)
+            fresh_venv = True
+    else:
+        fresh_venv = True
+
     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)
 
-    venv_provision(cfg)
+    venv_provision(cfg, fresh_venv)
 
     cfg.python.site_packages = get_site_packages(interpreter=cfg.python.python)
 
@@ -332,6 +390,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)
@@ -451,24 +513,19 @@ class BashActivate(ActivateScriptPatcher):
     replacements = [
         ("deactivate", "origdeactivate"),
     ]
-    old_env_pattern = dedent(
-        """
+    old_env_pattern = dedent("""
         if [ -z ${{{name}+x}} ]; then
             export _OLD_SPIN_UNSET{name}=""
         else
             export _OLD_SPIN_VALUE{name}="${name}"
         fi
-        """
-    )
-    setpattern = dedent(
-        """
+        """)
+    setpattern = dedent("""
         {name}="{value}"
         export {name}
-        """
-    )
+        """)
     resetpattern = indent(
-        dedent(
-            """
+        dedent("""
             if ! [ -z "${{_OLD_SPIN_VALUE{name}+_}}" ] ; then
                 {name}="$_OLD_SPIN_VALUE{name}"
                 export {name}
@@ -478,12 +535,10 @@ class BashActivate(ActivateScriptPatcher):
                 unset {name}
                 unset _OLD_SPIN_UNSET{name}
             fi
-            """
-        ),
+            """),
         prefix="    ",
     )
-    script = dedent(
-        """
+    script = dedent("""
         {patchmarker}
         {original}
         deactivate () {{
@@ -503,8 +558,7 @@ class BashActivate(ActivateScriptPatcher):
         # commands. Without forgetting past commands the $PATH changes
         # we made may not be respected
         hash -r 2>/dev/null
-        """
-    )
+        """)
 
     @staticmethod
     def interpolate_environ_value(value: str) -> str:
@@ -526,24 +580,19 @@ class PowershellActivate(ActivateScriptPatcher):
     old_env_pattern = (
         "New-Variable -Scope global -Name _OLD_SPIN_{name} -Value $env:{name}"
     )
-    setpattern = dedent(
-        """
+    setpattern = dedent("""
         $env:{name} = "{value}"
-        """
-    )
+        """)
     resetpattern = indent(
-        dedent(
-            """
+        dedent("""
                 if (Test-Path variable:_OLD_SPIN_{name}) {{
                     $env:{name} = $variable:_OLD_SPIN_{name}
                     Remove-Variable "_OLD_SPIN_{name}" -Scope global
                 }}
-            """
-        ),
+            """),
         prefix="    ",
     )
-    script = dedent(
-        """
+    script = dedent("""
         {patchmarker}
         {original}
         function global:deactivate([switch] $NonDestructive) {{
@@ -557,8 +606,7 @@ class PowershellActivate(ActivateScriptPatcher):
         deactivate -nondestructive
         {old_value_setters}
         {setters}
-        """
-    )
+        """)
 
     @staticmethod
     def interpolate_environ_value(value: str) -> str:
@@ -575,8 +623,7 @@ class BatchActivate(ActivateScriptPatcher):
     patchmarker = "\nREM Patched by csspin_python.python\n"
     activatescript = Path("{python.scriptdir}") / "activate.bat"
     replacements = []
-    old_env_pattern = dedent(
-        """
+    old_env_pattern = dedent("""
         if defined _OLD_SPIN_VALUE_{name} goto ENDIFSPIN{name}1
         if defined _OLD_SPIN_UNSET_{name} goto ENDIFSPIN{name}2
         if defined {name} goto ENDIFSPIN{name}3
@@ -596,19 +643,16 @@ class BatchActivate(ActivateScriptPatcher):
             set "_OLD_SPIN_UNSET_{name}= "
             goto ENDIFSPIN{name}5
         :ENDIFSPIN{name}5
-        """
-    )
+        """)
     setpattern = 'set "{name}={value}"'
     resetpattern = ""
-    script = dedent(
-        """
+    script = dedent("""
         @echo off
         {patchmarker}
         {original}
         {old_value_setters}
         {setters}
-        """
-    )
+        """)
 
     @staticmethod
     def interpolate_environ_value(value: str) -> str:
@@ -627,8 +671,7 @@ class BatchDeactivate(ActivateScriptPatcher):
     replacements = []
     old_env_pattern = ""
     setpattern = ""
-    resetpattern = dedent(
-        """
+    resetpattern = dedent("""
         if defined _OLD_SPIN_VALUE_{name} goto ENDIFVSPIN{name}1
         if defined _OLD_SPIN_UNSET_{name} goto ENDIFVSPIN{name}2
         :ENDIFVSPIN{name}1
@@ -640,16 +683,13 @@ class BatchDeactivate(ActivateScriptPatcher):
             set _OLD_SPIN_UNSET_{name}=
             goto ENDIFVSPIN{name}0
         :ENDIFVSPIN{name}0
-        """
-    )
-    script = dedent(
-        """
+        """)
+    script = dedent("""
         @echo off
         {patchmarker}
         {original}
         {resetters}
-        """
-    )
+        """)
 
 
 class PythonActivate(ActivateScriptPatcher):
@@ -659,13 +699,11 @@ class PythonActivate(ActivateScriptPatcher):
     old_env_pattern = ""
     setpattern = 'os.environ["{name}"] = fr"{value}"'
     resetpattern = ""
-    script = dedent(
-        """
+    script = dedent("""
         {patchmarker}
         {original}
         {setters}
-        """
-    )
+        """)
 
     @staticmethod
     def interpolate_environ_value(value: str) -> str:
@@ -810,13 +848,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]:
@@ -826,20 +882,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:
     """
@@ -898,15 +940,12 @@ def _req_for_memo(
 
 
 def venv_provision(  # pylint: disable=too-many-branches,missing-function-docstring
-    cfg: ConfigTree,
+    cfg: ConfigTree, fresh_venv: bool = False
 ) -> None:
-    fresh_env = False
 
-    info("Checking venv '{python.venv}'")
-    if not exists(cfg.python.venv):
+    if fresh_venv:
         info("Provisioning venv '{python.venv}'")
         cfg.python.provisioner.provision_venv(cfg)
-        fresh_env = True
 
     # This sets PATH to the venv
     init(cfg)
@@ -914,7 +953,7 @@ def venv_provision(  # pylint: disable=too-many-branches,missing-function-docstr
     _configure_pipconf(cfg)
 
     # Establish the prerequisites
-    if fresh_env:
+    if fresh_venv:
         cfg.python.provisioner.prerequisites(cfg)
 
     # Plugins can define a 'venv_hook' function, to give them a
@@ -943,6 +982,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:
@@ -954,16 +1006,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."""

csspin_python/python_schema.yaml

@@ -160,3 +160,8 @@ python:
                 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

@@ -181,8 +181,9 @@ 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(Path(cfg.uv_provisioner.uv_toml_path))).exists():
-        with open(uv_toml_path, mode="r+b") as fd:
+        with open(uv_toml_path, mode="rb") as fd:
             toml_content = tomllib.load(fd)
-            if toml_content.get("index-url") != cfg.python.index_url:
-                toml_content["index-url"] = cfg.python.index_url
+        if toml_content.get("index-url") != cfg.python.index_url:
+            toml_content["index-url"] = cfg.python.index_url
+            with open(uv_toml_path, mode="wb") as fd:
                 tomli_w.dump(toml_content, fd)

{csspin_python-3.1.1.dist-info → csspin_python-4.0.0.dist-info}/METADATA

@@ -1,23 +1,27 @@
 Metadata-Version: 2.4
 Name: csspin-python
-Version: 3.1.1
+Version: 4.0.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
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: platformdirs~=4.3.8
@@ -86,7 +90,7 @@ within the `spinfile.yaml` configuration file of your project.
       - csspin_python.pytest
 
     python:
-      version: 3.9.8
+      version: 3.10.19
       requirements:
         - sphinx-click
         - sphinx-rtd-theme

{csspin_python-3.1.1.dist-info → csspin_python-4.0.0.dist-info}/RECORD

@@ -2,20 +2,20 @@ csspin_python/behave.py,sha256=iJZeyIqB7V_NzTdLTZldNY9W_GGwCWkXe6WY69wpDqs,4997
 csspin_python/behave_schema.yaml,sha256=8qoOCK-uTmwgRRW29urgK0X_kgn0zO0X34v89bvii2w,1241
 csspin_python/debugpy.py,sha256=v0ZZopv5TNoSaFf2kiePsw9OmhBpjfOBFh0u71jTcnQ,962
 csspin_python/debugpy_schema.yaml,sha256=BeH30nSirDYctkdhS9xMXUG5htj3PED_ZjmxPG5WRUc,364
-csspin_python/devpi.py,sha256=C-5O_vA06CwQR4uElOw-2VH2-m001SpxowM_X6RbRwo,2352
+csspin_python/devpi.py,sha256=o7O06Dw-xt47y-M74TShcl9MUMaW78aFmw6i6ISYwoU,2351
 csspin_python/devpi_schema.yaml,sha256=2gPATWjVcfvCTrGZX2FK6wH8hh9KS0XzZ35JvZeJGEU,487
 csspin_python/playwright.py,sha256=oFfphLqa4AB6K9vasCUFHN0kFXu63n3ocrsqVuRp4-0,5102
 csspin_python/playwright_schema.yaml,sha256=TSeR16YHa7m7bfO59F2eMV-jXcglluTJdEpUeL16saY,1178
-csspin_python/pytest.py,sha256=pTOb5zFd9RINZwJsHNaRuSGVDkPMABzaAhwpAJo1nQE,4574
+csspin_python/pytest.py,sha256=N9YaU_ouQab0PFPf46HLE7Vg4JeoZW4dzVD7EevqJ1U,4573
 csspin_python/pytest_schema.yaml,sha256=tzXtdF6MvGC9v59EVRJFfLeMMHqPsXcFXy2zJtRECBI,1535
-csspin_python/python.py,sha256=32L4S6fKMWh5tbU-Rv5l6NVqrjjPLAiL25cB5gfeiC4,34784
-csspin_python/python_schema.yaml,sha256=_EBDglOM9AuXOvYUjFRJkUmtezCHcObEYmO64f-FOHI,6176
+csspin_python/python.py,sha256=ogmaOdaXXZHaCYaPa0b2y11Rn6ZgMgzRftUG6-seBWM,36824
+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=MGedx4e286ZE1miwh70y6b3wePw3mmc0m1kG6H_738I,5999
+csspin_python/uv_provisioner.py,sha256=1e-_Sb39JrqNWyaUNeBX59R5tutXLJ1ZsT7urCN1U0I,6044
 csspin_python/uv_provisioner_schema.yaml,sha256=Y8ZNC2OMnhR8Us3WUXAXK9hMjqGWAKFJB2puX4X5XNQ,727
-csspin_python-3.1.1.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
-csspin_python-3.1.1.dist-info/METADATA,sha256=OsIblHbaQVC9ybAydVQ1L-YEzqKtzw3qyJZnXqc-nZs,4715
-csspin_python-3.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-csspin_python-3.1.1.dist-info/top_level.txt,sha256=QSeglMEGbFu1z4L6MCQYwo01NgL0KojWvC4rzgMQ8gU,14
-csspin_python-3.1.1.dist-info/RECORD,,
+csspin_python-4.0.0.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
+csspin_python-4.0.0.dist-info/METADATA,sha256=yC8s-jxM6RQjQWi6UsukDCZlGdoV_NOFubcZ0Y-QERM,5035
+csspin_python-4.0.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+csspin_python-4.0.0.dist-info/top_level.txt,sha256=QSeglMEGbFu1z4L6MCQYwo01NgL0KojWvC4rzgMQ8gU,14
+csspin_python-4.0.0.dist-info/RECORD,,

{csspin_python-3.1.1.dist-info → csspin_python-4.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any