Merge branch 'main' into hanch/infra-220-timeout

Author: hanchchch

.github/workflows/lint.yml

@@ -0,0 +1,37 @@
+name: Lint
+
+permissions:
+  contents: read
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+  schedule:
+    - cron: '30 5 * * *' # every day at 5:30 UTC
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-python@v3
+      with:
+        python-version: "3.11"
+
+    - name: Install dependencies
+      run: |
+        python -m pip install -e ".[test]"
+
+    - name: Install uv
+      run: |
+        python -m pip install uv
+
+    - uses: pre-commit/action@v3.0.1

.github/workflows/test.yml

@@ -60,8 +60,6 @@ jobs:
       run: |
         python -m pip install uv
 
-    - uses: pre-commit/action@v3.0.1
-
     - name: Test
       run: |
         export ISOLATE_PYENV_EXECUTABLE=pyenv/bin/pyenv

src/isolate/backends/container.py

@@ -18,6 +18,7 @@ class ContainerizedPythonEnvironment(BaseEnvironment[Path]):
     image: dict[str, Any] = field(default_factory=dict)
     python_version: str | None = None
     requirements: list[str] = field(default_factory=list)
+    install_requirements: list[str] = field(default_factory=list)
     tags: list[str] = field(default_factory=list)
     resolver: str | None = None
 
@@ -46,6 +47,7 @@ def key(self) -> str:
         dockerfile_str = self.image.get("dockerfile_str", "")
         return sha256_digest_of(
             dockerfile_str,
+            *self.install_requirements,
             *self.requirements,
             *sorted(self.tags),
             *extras,

src/isolate/backends/virtualenv.py

@@ -30,6 +30,7 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
     BACKEND_NAME: ClassVar[str] = "virtualenv"
 
     requirements: list[str] = field(default_factory=list)
+    install_requirements: list[str] = field(default_factory=list)
     constraints_file: os.PathLike | None = None
     python_version: str | None = None
     extra_index_urls: list[str] = field(default_factory=list)
@@ -65,6 +66,7 @@ def key(self) -> str:
         active_python_version = self.python_version or active_python()
         return sha256_digest_of(
             active_python_version,
+            *self.install_requirements,
             *self.requirements,
             *constraints,
             *self.extra_index_urls,
@@ -74,17 +76,17 @@ def key(self) -> str:
             *extras,
         )
 
-    def install_requirements(self, path: Path) -> None:
+    def _install_packages(self, path: Path, requirements: list[str]) -> None:
         """Install the requirements of this environment using 'pip' to the
         given virtualenv path.
 
         If there are any constraint files specified, they will be also passed to
         the package resolver.
         """
-        if not self.requirements:
+        if not requirements:
             return None
 
-        self.log(f"Installing requirements: {', '.join(self.requirements)}")
+        self.log(f"Installing requirements: {', '.join(requirements)}")
         environ = os.environ.copy()
 
         if self.resolver == "uv":
@@ -102,7 +104,7 @@ def install_requirements(self, path: Path) -> None:
         pip_cmd: list[str | os.PathLike] = [
             *base_pip_cmd,  # type: ignore
             "install",
-            *self.requirements,
+            *requirements,
         ]
         if self.constraints_file:
             pip_cmd.extend(["-c", self.constraints_file])
@@ -125,8 +127,8 @@ def _install_python_through_pyenv(self) -> str:
         from isolate.backends.pyenv import PyenvEnvironment
 
         self.log(
-            f"Requested Python version of {self.python_version} is not available "
-            "in the system, attempting to install it through pyenv."
+            f"Requested Python version of {self.python_version} is not available,"
+            "attempting to install it through pyenv."
         )
 
         pyenv = PyenvEnvironment.from_config(
@@ -147,8 +149,10 @@ def _decide_python(self) -> str:
             _get_pyenv_executable()
         except Exception:
             raise EnvironmentCreationError(
-                f"Python {self.python_version} is not available in your "
-                "system. Please install it first."
+                f"Your local Python version {self.python_version} is not "
+                "available in the app environment. "
+                "Please either downgrade your local version of Python or use a Docker "
+                f"image with Python {self.python_version}."
             ) from None
         else:
             return self._install_python_through_pyenv()
@@ -181,7 +185,8 @@ def create(self, *, force: bool = False) -> Path:
                     f"Failed to create the environment at '{venv_path}': {exc}"
                 )
 
-            self.install_requirements(venv_path)
+            self._install_packages(venv_path, self.install_requirements)
+            self._install_packages(venv_path, self.requirements)
             completion_marker.touch()
 
         self.log(f"New environment cached at '{venv_path}'")

tests/test_backends.py

@@ -362,7 +362,11 @@ def test_invalid_python_version_raises(self, tmp_path, monkeypatch):
         environment = self.get_environment(tmp_path, {"python_version": "9.9.9"})
         with pytest.raises(
             EnvironmentCreationError,
-            match="Python 9.9.9 is not available",
+            match=(
+                "Your local Python version 9.9.9 is not available in the app "
+                "environment. Please either downgrade your local version of "
+                "Python or use a Docker image with Python 9.9.9"
+            ),
         ):
             environment.create()
 
@@ -388,6 +392,44 @@ def test_tags_in_key(self, tmp_path, monkeypatch):
             tagged_environment.key == tagged_environment_2.key
         ), "Tag order should not matter"
 
+    def test_install_requirements_in_key(self, tmp_path):
+        base = self.get_environment(tmp_path, {"requirements": ["pyjokes==0.6.0"]})
+        with_install = self.get_environment(
+            tmp_path,
+            {
+                "requirements": ["pyjokes==0.6.0"],
+                "install_requirements": ["pip==23.0.1"],
+            },
+        )
+        assert base.key != with_install.key
+
+    def test_install_requirements_order(self, tmp_path, monkeypatch):
+        installed = []
+
+        def fake_install_packages(self, path, requirements):
+            installed.append(list(requirements))
+
+        class DummyVirtualenv:
+            @staticmethod
+            def cli_run(args):
+                Path(args[0]).mkdir(parents=True, exist_ok=True)
+
+        monkeypatch.setattr(
+            "isolate.backends.virtualenv.optional_import", lambda _: DummyVirtualenv
+        )
+        monkeypatch.setattr(
+            VirtualPythonEnvironment, "_install_packages", fake_install_packages
+        )
+
+        environment = VirtualPythonEnvironment(
+            requirements=["pyjokes==0.6.0"],
+            install_requirements=["pip==23.0.1"],
+        )
+        environment.apply_settings(IsolateSettings(Path(tmp_path)))
+        environment.create()
+
+        assert installed == [["pip==23.0.1"], ["pyjokes==0.6.0"]]
+
     @pytest.mark.skipif(not UV_PATH, reason="uv is not available")
     def test_try_using_uv(self, tmp_path):
         environment = self.get_environment(