protoprimer 0.13.0.dev2__tar.gz → 0.13.0.dev3__tar.gz

{protoprimer-0.13.0.dev2 → protoprimer-0.13.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protoprimer
-Version: 0.13.0.dev2
+Version: 0.13.0.dev3
 Summary: Escape the fragile mess of pre-venv shell scripts with a pure Python bootstrap wrapper: 🚀 ⏩ single-touch, zero-args, self-contained, no-deps, cross-platform, testable init logic using standard tools to run apps in a custom environment isolated per repository
 Author-email: uvsmtid <uvsmtid@gmail.com>
 License: MIT

{protoprimer-0.13.0.dev2 → protoprimer-0.13.0.dev3}/main/protoprimer/primer_kernel.py

@@ -40,7 +40,7 @@ import typing
 
 # The release process ensures that content in this file matches the version below while tagging the release commit
 # (otherwise, if the file comes from a different commit, the version is irrelevant):
-__version__ = "0.13.0.dev2"
+__version__ = "0.13.0.dev3"
 
 logger: logging.Logger = logging.getLogger()
 
@@ -751,6 +751,35 @@ class VenvDriverBase:
     ) -> list[str]:
         raise NotImplementedError()
 
+    @staticmethod
+    def _list_installed_pkg_names(
+        venv_python_file_abs_path: str,
+    ) -> list[str]:
+        """
+        Returns names (without versions) of all packages currently
+        installed in the `venv` behind `venv_python_file_abs_path`.
+
+        Used to re-pin with `--constraint` whatever
+        a `venv`-seeding mechanism (`ensurepip`, `uv --seed`, ...)
+        happens to install (e.g. `pip`/`setuptools`/`wheel`).
+        """
+        freeze_output = subprocess.check_output(
+            [
+                venv_python_file_abs_path,
+                "-m",
+                "pip",
+                "list",
+                "--format=freeze",
+                "--exclude-editable",
+            ]
+        )
+        return [
+            #
+            output_line.split("==")[0]
+            for output_line in freeze_output.decode().splitlines()
+            if output_line.strip()
+        ]
+
     def pin_versions(
         self,
         venv_python_file_abs_path: str,
@@ -809,14 +838,15 @@ class VenvDriverPip(VenvDriverBase):
             "-m",
             "pip",
             "install",
+            "--no-input",
             "--upgrade",
-            "pip",
-        ]
-        # Respect the committed constraints (if any) so a fresh `venv` does not
-        # silently drift `pip` itself past the pinned version:
+        ] + self._list_installed_pkg_names(venv_python_executable)
         if os.path.exists(constraints_file_abs_path):
             pip_upgrade_cmd.extend(
                 [
+                    # Respect the committed constraints (if any)
+                    # so a fresh `venv` does not silently drift
+                    # seeded packages past the pinned version:
                     "--constraint",
                     constraints_file_abs_path,
                 ]
@@ -948,9 +978,6 @@ class VenvDriverUv(VenvDriverBase):
             ]
         )
 
-        # `--seed` installs whatever `pip` `uv` currently considers current, ignoring any
-        # committed constraints - re-pin it explicitly so a fresh `venv` does not silently
-        # drift `pip` itself past the pinned version:
         if os.path.exists(constraints_file_abs_path):
             seeded_venv_python_abs_path = os.path.join(
                 local_venv_dir_abs_path,
@@ -963,10 +990,13 @@ class VenvDriverUv(VenvDriverBase):
                     "install",
                     "--python",
                     seeded_venv_python_abs_path,
+                    # Respect the committed constraints (if any)
+                    # so a fresh `venv` does not silently drift
+                    # seeded packages past the pinned version:
                     "--constraint",
                     constraints_file_abs_path,
-                    "pip",
                 ]
+                + self._list_installed_pkg_names(seeded_venv_python_abs_path)
             )
 
     def get_install_dependencies_cmd(
@@ -4798,6 +4828,8 @@ class EnvState(enum.Enum):
 
     state_default_file_log_handler_configured = Bootstrapper_state_default_file_log_handler_configured
 
+    # TODO: Add a (replaceable) env_check step to execute before switching to `StateStride.stride_py_required`.
+
     # restart: `StateStride.stride_py_arbitrary` -> `StateStride.stride_py_required`:
     state_stride_py_required_reached = Factory_state_stride_py_required_reached
 

{protoprimer-0.13.0.dev2 → protoprimer-0.13.0.dev3}/main/protoprimer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protoprimer
-Version: 0.13.0.dev2
+Version: 0.13.0.dev3
 Summary: Escape the fragile mess of pre-venv shell scripts with a pure Python bootstrap wrapper: 🚀 ⏩ single-touch, zero-args, self-contained, no-deps, cross-platform, testable init logic using standard tools to run apps in a custom environment isolated per repository
 Author-email: uvsmtid <uvsmtid@gmail.com>
 License: MIT

{protoprimer-0.13.0.dev2 → protoprimer-0.13.0.dev3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "protoprimer"
-version = "0.13.0.dev2"
+version = "0.13.0.dev3"
 
 authors = [
     { name = "uvsmtid", email = "uvsmtid@gmail.com" },