nox-uv 0.4.0__tar.gz → 0.6.0__tar.gz

{nox_uv-0.4.0 → nox_uv-0.6.0}/.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]
 
 env:
-  UV_VERSION: "0.7.3"
+  UV_VERSION: "0.7.12"
 
 jobs:
   test:
@@ -15,8 +15,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install uv
         uses: astral-sh/setup-uv@v5
-        # Caching is enabled by default for GitHub-hosted runners:
-        #   https://github.com/astral-sh/setup-uv?tab=readme-ov-file#enable-caching
         with:
           version: ${{ env.UV_VERSION }}
       - name: Set up Python ${{ matrix.python-version }}

{nox_uv-0.4.0 → nox_uv-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nox-uv
-Version: 0.4.0
+Version: 0.6.0
 Summary: Facilitate nox integration with uv for Python projects
 Project-URL: Homepage, https://github.com/dantebben/nox-uv
 Project-URL: Repository, https://github.com/dantebben/nox-uv
@@ -44,8 +44,8 @@ Description-Content-Type: text/markdown
 [ruff-badge]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
 [mypy-badge]: https://www.mypy-lang.org/static/mypy_badge.svg
 
-`nox-uv` is a simple drop-in replacement for [nox](https://nox.thea.codes/)'s `@nox.session` that installs
-dependencies constrained by [uv](https://docs.astral.sh/uv/)'s lockfile.
+`nox-uv` is a simple drop-in replacement for [nox](https://nox.thea.codes/)'s `@nox.session` that
+installs dependencies constrained by [uv](https://docs.astral.sh/uv/)'s lockfile.
 
 ## Usage
 
@@ -107,7 +107,7 @@ def type_check(s: Session) -> None:
 
 
 @session(uv_only_groups=["lint"])
-def type_check(s: Session) -> None:
+def lint(s: Session) -> None:
     s.run("ruff", "check", ".")
     s.run("ruff", "format", "--check", ".")
 ```
@@ -124,10 +124,11 @@ def type_check(s: Session) -> None:
 - `uv_groups`: list of `uv` _dependency-groups_
 - `uv_extras`: list of `uv` _optional-dependencies_
 - `uv_only_groups`: list of `uv` _only-groups_ to include. Prevents installation of project
-   _dependencies_.
+   _dependencies_
 - `uv_all_extras`: boolean to install all _optional-dependencies_ from `pyproject.toml`
 - `uv_all_groups`: boolean to install all _dependency-groups_
-- `uv_sync_locked`: boolean to validate that `uv.lock` is up-to-date
+- `uv_no_install_project`: boolean to not install the current project
+- `uv_sync_locked`: boolean to validate that `uv.lock` is up to date
 
 
 ## Inspiration

{nox_uv-0.4.0 → nox_uv-0.6.0}/README.md

@@ -16,8 +16,8 @@
 [ruff-badge]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
 [mypy-badge]: https://www.mypy-lang.org/static/mypy_badge.svg
 
-`nox-uv` is a simple drop-in replacement for [nox](https://nox.thea.codes/)'s `@nox.session` that installs
-dependencies constrained by [uv](https://docs.astral.sh/uv/)'s lockfile.
+`nox-uv` is a simple drop-in replacement for [nox](https://nox.thea.codes/)'s `@nox.session` that
+installs dependencies constrained by [uv](https://docs.astral.sh/uv/)'s lockfile.
 
 ## Usage
 
@@ -79,7 +79,7 @@ def type_check(s: Session) -> None:
 
 
 @session(uv_only_groups=["lint"])
-def type_check(s: Session) -> None:
+def lint(s: Session) -> None:
     s.run("ruff", "check", ".")
     s.run("ruff", "format", "--check", ".")
 ```
@@ -96,10 +96,11 @@ def type_check(s: Session) -> None:
 - `uv_groups`: list of `uv` _dependency-groups_
 - `uv_extras`: list of `uv` _optional-dependencies_
 - `uv_only_groups`: list of `uv` _only-groups_ to include. Prevents installation of project
-   _dependencies_.
+   _dependencies_
 - `uv_all_extras`: boolean to install all _optional-dependencies_ from `pyproject.toml`
 - `uv_all_groups`: boolean to install all _dependency-groups_
-- `uv_sync_locked`: boolean to validate that `uv.lock` is up-to-date
+- `uv_no_install_project`: boolean to not install the current project
+- `uv_sync_locked`: boolean to validate that `uv.lock` is up to date
 
 
 ## Inspiration

{nox_uv-0.4.0 → nox_uv-0.6.0}/noxfile.py

@@ -4,12 +4,7 @@ from nox_uv import session
 
 options.error_on_external_run = True
 options.default_venv_backend = "uv"
-options.sessions = ["uv_lock_check", "lint", "type_check", "test"]
-
-
-@session(venv_backend="none")
-def uv_lock_check(s: Session) -> None:
-    s.run("uv", "lock", "--check")
+options.sessions = ["lint", "type_check", "test"]
 
 
 @session(
@@ -31,9 +26,7 @@ def test(s: Session) -> None:
     )
 
 
-# For some sessions, set venv_backend="none" to simply execute scripts within the existing Poetry
-# environment. This requires that nox is run within `poetry shell` or using `poetry run nox ...`.
-@session(venv_backend="none")
+@session(uv_only_groups=["lint"])
 @parametrize(
     "command",
     [
@@ -57,7 +50,7 @@ def fmt(s: Session, command: list[str]) -> None:
     s.run(*command)
 
 
-@session(uv_groups=["lint"])
+@session(uv_only_groups=["lint"])
 @parametrize(
     "command",
     [
@@ -69,22 +62,11 @@ def lint(s: Session, command: list[str]) -> None:
     s.run(*command)
 
 
-@session(venv_backend="none")
+@session(uv_only_groups=["lint"])
 def lint_fix(s: Session) -> None:
     s.run("ruff", "check", ".", "--extend-fixable", "F401", "--fix")
 
 
-@session(venv_backend="none")
+@session(uv_groups=["test", "type_check"])
 def type_check(s: Session) -> None:
     s.run("mypy", "src", "tests", "noxfile.py")
-
-
-@session(venv_backend="none")
-def simple_test(s: Session) -> None:
-    assert 1 == 1
-
-
-@session(venv_backend="none")
-def run_test_as_session(s: Session) -> None:
-    """Test ability to call a nother session."""
-    simple_test(s)

{nox_uv-0.4.0 → nox_uv-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nox-uv"
-version = "0.4.0"
+version = "0.6.0"
 description = "Facilitate nox integration with uv for Python projects"
 keywords = ["nox", "uv"]
 readme = "README.md"
@@ -44,9 +44,12 @@ lint = [
     "ruff>=0.9.7",
 ]
 test = [
+    # TODO: Remove this upper bound with pytest-cov fixes issues with filterwarnings = ["error"]
+    #   https://github.com/pytest-dev/pytest-cov/issues/693
+    "pytest<8.4.0",
     "pytest-cov>=6.0.0",
 ]
-type-check = [
+type_check = [
     "mypy>=1.15.0",
 ]
 

{nox_uv-0.4.0 → nox_uv-0.6.0}/src/nox_uv/__init__.py

@@ -26,6 +26,7 @@ def session(
     uv_only_groups: Sequence[str] = (),
     uv_all_extras: bool = False,
     uv_all_groups: bool = False,
+    uv_no_install_project: bool = False,
     uv_sync_locked: bool = True,
     **kwargs: dict[str, Any],
 ) -> Callable[..., Callable[..., R]]:
@@ -34,7 +35,7 @@ def session(
     Args:
         args: Positional arguments are forwarded to ``nox.session``.
         kwargs: Keyword arguments are forwarded to ``nox.session``. Used to catch any future
-            arguments of nox.session that aren't explicitely captured in nox_uv.session.
+            arguments of nox.session that aren't explicitly captured in nox_uv.session.
 
     Returns:
         The decorated session function.
@@ -55,6 +56,7 @@ def session(
             uv_all_extras=uv_all_extras,
             uv_all_groups=uv_all_groups,
             uv_only_groups=uv_only_groups,
+            uv_no_install_project=uv_no_install_project,
             uv_sync_locked=uv_sync_locked,
             **kwargs,
         )  # type: ignore
@@ -84,6 +86,9 @@ def session(
     if uv_all_extras:
         extended_cmd.append("--all-extras")
 
+    if uv_no_install_project:
+        extended_cmd.append("--no-install-project")
+
     sync_cmd += extended_cmd
 
     @functools.wraps(function)
@@ -94,15 +99,17 @@ def session(
             # UV called from Nox does not respect the Python version set in the Nox session.
             # We need to pass the Python version to UV explicitly.
             if s.python is not None:
-                # NOTE: casting to string explicitly because implicit casting isn't working
-                # for the type checker.
-                s.env["UV_PYTHON"] = str(s.python)
+                s.env["UV_PYTHON"] = s.virtualenv.location
 
+            s.debug(
+                f"UV_PYTHON={s.env['UV_PYTHON']} | "
+                f"UV_PROJECT_ENVIRONMENT={s.env['UV_PROJECT_ENVIRONMENT']}"
+            )
             s.run_install(*sync_cmd)
         else:
             if len(extended_cmd) > 0:
                 raise s.error(
-                    'Using "uv" specific paramaters is not allowed outside of a "uv" '
+                    'Using "uv" specific parameters is not allowed outside of a "uv" '
                     "venv_backend.\n"
                     f"Check the venv_backend, or the {extended_cmd} parameters."
                 )

{nox_uv-0.4.0 → nox_uv-0.6.0}/tests/subproject/noxfile.py

@@ -3,8 +3,6 @@ from nox import Session, options
 from nox_uv import session
 
 options.default_venv_backend = "uv"
-options.reuse_existing_virtualenvs = False
-
 options.sessions = [
     "check_python_version",
     "install_nothing",
@@ -14,12 +12,14 @@ options.sessions = [
     "one_extra",
     "correct_python",
     "only_groups",
+    "no_install_project",
+    "do_install_project",
 ]
 
 
 @session(venv_backend="none")
 def check_python_version(s: Session) -> None:
-    s.run("python3", "--version")
+    s.run("python", "--version")
 
 
 @session
@@ -74,7 +74,7 @@ def one_extra(s: Session) -> None:
 @session(python=["3.10"])
 def correct_python(s: Session) -> None:
     assert s.python == "3.10"
-    v = s.run("python3", "--version", silent=True)
+    v = s.run("python", "--version", silent=True)
     if isinstance(v, str):
         assert "Python 3.10" in v
     else:
@@ -89,11 +89,27 @@ def only_groups(s: Session) -> None:
     assert "nox-uv" not in r
 
 
-@session(uv_groups=["type-check"], venv_backend="virtualenv")
+@session(uv_no_install_project=True, uv_groups=["lint"])
+def no_install_project(s: Session) -> None:
+    r = s.run("uv", "pip", "list", silent=True)
+    assert isinstance(r, str)
+    assert "ruff" in r
+    assert "subproject" not in r
+
+
+@session(uv_groups=["lint"])
+def do_install_project(s: Session) -> None:
+    r = s.run("uv", "pip", "list", silent=True)
+    assert isinstance(r, str)
+    assert "ruff" in r
+    assert "subproject" in r
+
+
+@session(uv_groups=["type_check"], venv_backend="virtualenv")
 def failed_virtualenv(s: Session) -> None:
     pass
 
 
-@session(uv_groups=["type-check"], venv_backend="none")
+@session(uv_groups=["type_check"], venv_backend="none")
 def failed_venv_none(s: Session) -> None:
     pass

{nox_uv-0.4.0 → nox_uv-0.6.0}/tests/subproject/pyproject.toml

@@ -5,7 +5,7 @@ description = "Project for testing nox-uv"
 readme = "README.md"
 requires-python = ">=3.9"
 classifiers = [
-    "Private: Do Not Upload",
+    "Private :: Do Not Upload",
 ]
 dependencies = [
     "nox-uv",
@@ -14,6 +14,11 @@ dependencies = [
 [tool.uv.sources]
 nox-uv = { path = "../../", editable = true }
 
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+
 [project.optional-dependencies] 
 pyyaml = ["pyyaml"]
 scapy = ["scapy"]
@@ -29,7 +34,7 @@ lint = [
 test = [
     "pytest-cov>=6.0.0",
 ]
-type-check = [
+type_check = [
     "mypy>=1.15.0",
 ]
 
@@ -37,5 +42,5 @@ type-check = [
 default-groups = [
     "lint",
     "test",
-    "type-check",
+    "type_check",
 ]

{nox_uv-0.4.0 → nox_uv-0.6.0}/tests/subproject/uv.lock

@@ -266,7 +266,7 @@ wheels = [
 
 [[package]]
 name = "nox-uv"
-version = "0.4.0"
+version = "0.6.0"
 source = { editable = "../../" }
 dependencies = [
     { name = "nox" },
@@ -277,7 +277,10 @@ requires-dist = [{ name = "nox", specifier = ">=2025.5.1" }]
 
 [package.metadata.requires-dev]
 lint = [{ name = "ruff", specifier = ">=0.9.7" }]
-test = [{ name = "pytest-cov", specifier = ">=6.0.0" }]
+test = [
+    { name = "pytest", specifier = "<8.4.0" },
+    { name = "pytest-cov", specifier = ">=6.0.0" },
+]
 type-check = [{ name = "mypy", specifier = ">=1.15.0" }]
 
 [[package]]
@@ -427,7 +430,7 @@ wheels = [
 [[package]]
 name = "subproject"
 version = "0.1.0"
-source = { virtual = "." }
+source = { editable = "." }
 dependencies = [
     { name = "nox-uv" },
 ]