refactor: delegate to uv's built-in packaging and dependency handling (#180)

* refactor: delegate to uv's built-in packaging and dependency handling

Fixes #151

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* PR feedback

Signed-off-by: Bernát Gábor <[email protected]>

* Address feedback

Signed-off-by: Bernát Gábor <[email protected]>

---------

Signed-off-by: Bernát Gábor <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Bernát Gábor <[email protected]>

Author: 3 people

README.md

@@ -98,7 +98,15 @@ Therefore, options like `deps` are ignored (and all others
 
 ### `package`
 
-How to install the source tree package, one of `wheel`, `editable` or `skip`. By default will do `editable`.
+How to install the source tree package, must be one of:
+
+- `skip`,
+- `wheel`,
+- `editable` (default),
+- `uv` (use uv to install the project, rather than build wheel via `tox`),
+- `uv-editable` (use uv to install the project in editable mode, rather than build wheel via `tox`).
+
+You should use the latter two in case you need to use any non-standard features of `uv`, such as `tool.uv.sources`.
 
 ### `extras`
 

src/tox_uv/_installer.py

@@ -5,6 +5,7 @@
 import logging
 from collections import defaultdict
 from collections.abc import Sequence
+from itertools import chain
 from typing import TYPE_CHECKING, Any, Final
 
 from packaging.requirements import Requirement
@@ -16,6 +17,8 @@
 from tox.tox_env.python.pip.req_file import PythonDeps
 from uv import find_uv_bin
 
+from ._package_types import UvEditablePackage, UvPackage
+
 if TYPE_CHECKING:
     from tox.config.main import Config
     from tox.tox_env.package import PathPackage
@@ -94,7 +97,7 @@ def install(self, arguments: Any, section: str, of_type: str) -> None:  # noqa:
             _LOGGER.warning("uv cannot install %r", arguments)  # pragma: no cover
             raise SystemExit(1)  # pragma: no cover
 
-    def _install_list_of_deps(  # noqa: C901
+    def _install_list_of_deps(  # noqa: C901, PLR0912
         self,
         arguments: Sequence[
             Requirement | WheelPackage | SdistPackage | EditableLegacyPackage | EditablePackage | PathPackage
@@ -114,6 +117,12 @@ def _install_list_of_deps(  # noqa: C901
             elif isinstance(arg, EditableLegacyPackage):
                 groups["req"].extend(str(i) for i in arg.deps)
                 groups["dev_pkg"].append(str(arg.path))
+            elif isinstance(arg, UvPackage):
+                extras_suffix = f"[{','.join(arg.extras)}]" if arg.extras else ""
+                groups["uv"].append(f"{arg.path}{extras_suffix}")
+            elif isinstance(arg, UvEditablePackage):
+                extras_suffix = f"[{','.join(arg.extras)}]" if arg.extras else ""
+                groups["uv_editable"].append(f"{arg.path}{extras_suffix}")
             else:  # pragma: no branch
                 _LOGGER.warning("uv install %r", arg)  # pragma: no cover
                 raise SystemExit(1)  # pragma: no cover
@@ -129,7 +138,13 @@ def _install_list_of_deps(  # noqa: C901
                 new_deps = sorted(set(groups["req"]) - set(old or []))
                 if new_deps:  # pragma: no branch
                     self._execute_installer(new_deps, req_of_type)
-        install_args = ["--reinstall", "--no-deps"]
+        install_args = ["--reinstall"]
+        if groups["uv"]:
+            self._execute_installer(install_args + groups["uv"], of_type)
+        if groups["uv_editable"]:
+            requirements = list(chain.from_iterable(("-e", entry) for entry in groups["uv_editable"]))
+            self._execute_installer(install_args + requirements, of_type)
+        install_args.append("--no-deps")
         if groups["pkg"]:
             self._execute_installer(install_args + groups["pkg"], of_type)
         if groups["dev_pkg"]:

src/tox_uv/_package.py

@@ -1,16 +1,31 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from tox.tox_env.python.virtual_env.package.cmd_builder import VenvCmdBuilder
 from tox.tox_env.python.virtual_env.package.pyproject import Pep517VenvPackager
 
+from ._package_types import UvEditablePackage, UvPackage
 from ._venv import UvVenv
 
+if TYPE_CHECKING:
+    from tox.config.sets import EnvConfigSet
+    from tox.tox_env.package import Package
+
 
 class UvVenvPep517Packager(Pep517VenvPackager, UvVenv):
     @staticmethod
     def id() -> str:
         return "uv-venv-pep-517"
 
+    def perform_packaging(self, for_env: EnvConfigSet) -> list[Package]:
+        of_type: str = for_env["package"]
+        if of_type == UvPackage.KEY:
+            return [UvPackage(self.core["tox_root"], for_env["extras"])]
+        if of_type == UvEditablePackage.KEY:
+            return [UvEditablePackage(self.core["tox_root"], for_env["extras"])]
+        return super().perform_packaging(for_env)
+
 
 class UvVenvCmdBuilder(VenvCmdBuilder, UvVenv):
     @staticmethod

src/tox_uv/_package_types.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from tox.tox_env.python.package import PythonPathPackageWithDeps
+
+if TYPE_CHECKING:
+    import pathlib
+    from collections.abc import Sequence
+
+
+class UvBasePackage(PythonPathPackageWithDeps):
+    """Package to be built and installed by uv directly."""
+
+    KEY: str
+
+    def __init__(self, path: pathlib.Path, extras: Sequence[str]) -> None:
+        super().__init__(path, ())
+        self.extras = extras
+
+
+class UvPackage(UvBasePackage):
+    """Package to be built and installed by uv directly as wheel."""
+
+    KEY = "uv"
+
+
+class UvEditablePackage(UvBasePackage):
+    """Package to be built and installed by uv directly as editable wheel."""
+
+    KEY = "uv-editable"
+
+
+__all__ = [
+    "UvEditablePackage",
+    "UvPackage",
+]

src/tox_uv/_run.py

@@ -6,6 +6,7 @@
 
 from tox.tox_env.python.runner import PythonRun
 
+from ._package_types import UvEditablePackage, UvPackage
 from ._venv import UvVenv
 
 if TYPE_CHECKING:
@@ -32,6 +33,10 @@ def default_pkg_type(self) -> str:
             return "skip"
         return super().default_pkg_type
 
+    @property
+    def _package_types(self) -> tuple[str, ...]:
+        return *super()._package_types, UvPackage.KEY, UvEditablePackage.KEY
+
 
 __all__ = [
     "UvVenvRunner",

tests/test_tox_uv_package.py

@@ -24,7 +24,7 @@ def test_uv_package_use_default_from_file(tox_project: ToxProjectCreator) -> Non
 
 
 @pytest.mark.parametrize("with_dash", [True, False], ids=["name_dash", "name_underscore"])
-@pytest.mark.parametrize("package", ["sdist", "wheel", "editable"])
+@pytest.mark.parametrize("package", ["sdist", "wheel", "editable", "uv", "uv-editable"])
 def test_uv_package_artifact(
     tox_project: ToxProjectCreator, package: str, demo_pkg_inline: Path, with_dash: bool
 ) -> None: