chore: use dependency groups (#219)

Author: DarkaMaul

.github/workflows/CI.yml

@@ -171,11 +171,7 @@ jobs:
         shell: bash
 
       - name: Test Install
-        run: |
-          uv venv
-          source ./.venv/Scripts/activate
-          uv pip install wheelhouse/rfc3161_client*.whl
-          python -c "import rfc3161_client"
+        run: uv run --with wheelhouse/rfc3161_client*.whl python -c "import rfc3161_client"
         shell: bash
 
       - name: Upload wheels

.github/workflows/lint.yml

@@ -33,4 +33,4 @@ jobs:
           cache-dependency-glob: pyproject.toml
 
       - name: lint
-        run: make lint INSTALL_EXTRA=lint
+        run: make lint

.github/workflows/tests.yml

@@ -39,7 +39,7 @@ jobs:
         run: uv python install ${{ matrix.python }}
 
       - name: test
-        run: make test INSTALL_EXTRA=test
+        run: make test
 
   test-windows:
     strategy:
@@ -89,11 +89,7 @@ jobs:
           echo "OPENSSL_NO_VENDOR=1" >> $GITHUB_ENV
 
       - name: test
-        run: |
-          # We need to do this in CI because setup-uv@v5 automatically creates a new venv and it prevents us from 
-          # installing our dependencies in the Makefile.
-          touch pyproject.toml
-          make test INSTALL_EXTRA=test
+        run: make test
         shell: bash
 
   all-tests-pass:

Makefile

@@ -5,25 +5,12 @@ PY_IMPORT = rfc3161_client
 ALL_PY_SRCS := $(shell find src -name '*.py') \
 		$(shell find test -name '*.py')
 
-# Optionally overriden by the user, if they're using a virtual environment manager.
-VENV ?= .venv
-
-# On Windows, venv scripts/shims are under `Scripts` instead of `bin`.
-VENV_BIN := $(VENV)/bin
-ifeq ($(OS),Windows_NT)
-	VENV_BIN := $(VENV)/Scripts
-endif
-
 # Optionally overridden by the user in the `release` target.
 BUMP_ARGS :=
 
 # Optionally overridden by the user in the `test` target.
 TESTS :=
 
-# Optionally overridden by the user/CI, to limit the installation to a specific
-# subset of development dependencies.
-INSTALL_EXTRA := dev
-
 # If the user selects a specific test pattern to run, set `pytest` to fail fast
 # and only run tests that match the pattern.
 # Otherwise, run all tests and enable coverage assertions, since we expect
@@ -41,42 +28,37 @@ all:
 	@echo "Run my targets individually!"
 
 .PHONY: dev
-dev: $(VENV)/pyvenv.cfg
-	@. $(VENV_BIN)/activate && maturin develop --uv
-
-$(VENV)/pyvenv.cfg: pyproject.toml
-	uv venv $(VENV)
-	@. $(VENV_BIN)/activate && uv pip install -e '.[$(INSTALL_EXTRA)]'
+dev:
+	uv sync --group dev
+	uv run maturin develop --uv
 
 .PHONY: lint
-lint: $(VENV)/pyvenv.cfg
-	. $(VENV_BIN)/activate && \
-		ruff format --check && \
-		ruff check
-	cargo fmt --check --manifest-path rust/Cargo.toml
-	cargo fmt --check --manifest-path rust/tsp-asn1/Cargo.toml
-	. $(VENV_BIN)/activate && \
-		interrogate -c pyproject.toml .
-	. $(VENV_BIN)/activate && \
-		ty check
+lint:
+	uv sync --group lint
+	uv run ruff format --check && \
+		uv run ruff check && \
+		cargo fmt --check --manifest-path rust/Cargo.toml && \
+		cargo fmt --check --manifest-path rust/tsp-asn1/Cargo.toml && \
+		uv run interrogate -c pyproject.toml . && \
+		uv run ty check
 
 .PHONY: reformat
 reformat:
-	. $(VENV_BIN)/activate && \
-	    ruff format && \
-		ruff check --fix
-	cargo fmt --manifest-path rust/Cargo.toml
-	cargo fmt --manifest-path rust/tsp-asn1/Cargo.toml
+	uv sync --group lint
+	uv run ruff format  && \
+		uv run ruff check --fix  && \
+		cargo fmt --manifest-path rust/Cargo.toml  && \
+		cargo fmt --manifest-path rust/tsp-asn1/Cargo.toml
 
 .PHONY: doc
 doc:
 	@echo "No documentation set up"
 
 
 .PHONY: test tests
-test tests: $(VENV)/pyvenv.cfg
-	. $(VENV_BIN)/activate && \
-		pytest --cov=$(PY_IMPORT) $(T) $(TEST_ARGS) && \
-		python -m coverage report -m $(COV_ARGS)
-	cargo test --manifest-path rust/Cargo.toml
-	cargo test --manifest-path rust/tsp-asn1/Cargo.toml
+test tests:
+	uv sync --group test
+	uv run pytest --cov=$(PY_IMPORT) $(T) $(TEST_ARGS) && \
+		uv run coverage report -m $(COV_ARGS)  && \
+		cargo test --manifest-path rust/Cargo.toml  && \
+		cargo test --manifest-path rust/tsp-asn1/Cargo.toml

pyproject.toml

@@ -19,11 +19,11 @@ license = { file = "LICENSE" }
 authors = [{ name = "Trail of Bits", email = "[email protected]" }]
 dependencies = ["cryptography>=43"]
 
-[project.optional-dependencies]
+[dependency-groups]
 doc = []
 test = ["pytest", "pytest-cov", "pretend", "coverage[toml]"]
-lint = ["ruff >= 0.7,< 0.15", "interrogate", "ty>=0.0.14", "rfc3161-client[test]"]
-dev = ["rfc3161-client[test,lint,doc]", "maturin>=1.7,<2.0"]
+lint = ["ruff >= 0.7,< 0.15", "interrogate", "ty>=0.0.14", { include-group = "test" }]
+dev = [{ include-group = "lint" }, { include-group = "doc" }, "maturin>=1.7,<2.0"]
 
 [project.urls]
 Homepage = "https://pypi.org/project/rfc3161-client"