Tweaks

Author: Tinche

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
         env:
           FAST: ${{ startsWith(matrix.python-version, 'pypy') && '1' || '' }}
         run: |
-          just cov ${{ startsWith(matrix.python-version, 'pypy') && matrix.python-version || format('python{0}', matrix.python-version) }}
+          just --set python ${{ startsWith(matrix.python-version, 'pypy') && matrix.python-version || format('python{0}', matrix.python-version) }} cov
 
       - name: Upload coverage data
         uses: actions/upload-artifact@v4
@@ -62,8 +62,8 @@ jobs:
       - name: "Combine coverage"
         run: |
           uv run --group test coverage combine
-          uv run --group test  coverage html
-          uv run --group test  coverage json
+          uv run --group test coverage html
+          uv run --group test coverage json
 
           # Report and write to summary.
           uv run --group test coverage report --format=markdown >> $GITHUB_STEP_SUMMARY

CONTRIBUTING.md

@@ -55,27 +55,27 @@ Ready to contribute? Here's how to set up _cattrs_ for local development.
 $ git clone [email protected]:your_name_here/cattrs.git
 ```
 
-3. Install your local copy into a virtualenv. Assuming you have [PDM](https://pdm.fming.dev/latest/) installed, this is how you set up your fork for local development::
+3. Install your local copy into a virtualenv. Assuming you have [uv](https://docs.astral.sh/uv/) installed, this is how you set up your fork for local development::
 
 ```shell
 $ cd cattrs/
-$ pdm install -d -G :all
+$ uv sync --all-groups --all-extras
 ```
 
 4. Create a branch for local development::
 
 ```shell
-$ git checkout -b name-of-your-bugfix-or-feature
+$ git switch -c name-of-your-bugfix-or-feature
 ```
 
 Now you can make your changes locally.
 
-5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
+5. When you're done making changes, check that your changes pass lints and the tests, including testing other Python versions::
 
 ```shell
 $ make lint
-$ make test
-$ tox
+$ just test
+$ just --set python python3.9 test  # Test on other versions
 ```
 
 6. Commit your changes and push your branch to GitHub::
@@ -106,5 +106,5 @@ Before you submit a pull request, check that it meets these guidelines:
 To run a subset of tests:
 
 ```shell
-$ pdm run pytest tests.test_unstructure
+$ just test tests/test_unstructure.py
 ```

Justfile

@@ -1,6 +1,12 @@
-test python='':
-    uv run {{ if python != '' { '-p ' + python } else { '' } }} --all-extras --group test pytest -x --ff -n auto tests/
+python := ""
 
-cov python='':
+lint:
+	uv run -p python3.13 --group lint ruff check src/ tests bench
+	uv run -p python3.13 --group lint black --check src tests docs/conf.py
+
+test *args="-x --ff -n auto tests":
+    uv run {{ if python != '' { '-p ' + python } else { '' } }} --all-extras --group test pytest {{args}}
+
+cov *args="-x --ff -n auto tests":
     @uv run {{ if python != '' { '-p ' + python } else { '' } }} python -c 'import pathlib, site; pathlib.Path(f"{site.getsitepackages()[0]}/cov.pth").write_text("import coverage; coverage.process_startup()")'
-    COVERAGE_PROCESS_START={{justfile_directory()}}/pyproject.toml uv run {{ if python != '' { '-p ' + python } else { '' } }} --all-extras --group test coverage run -m pytest -x --ff -n auto tests/
+    COVERAGE_PROCESS_START={{justfile_directory()}}/pyproject.toml uv run {{ if python != '' { '-p ' + python } else { '' } }} --all-extras --group test coverage run -m pytest {{args}}

Makefile

@@ -42,29 +42,6 @@ clean-pyc: ## remove Python file artifacts
 	find . -name '*~' -exec rm -f {} +
 	find . -name '__pycache__' -exec rm -fr {} +
 
-clean-test: ## remove test and coverage artifacts
-	rm -fr .tox/
-	rm -f .coverage
-	rm -fr htmlcov/
-
-lint: ## check style with ruff and black
-	pdm run ruff check src/ tests bench
-	pdm run black --check src tests docs/conf.py
-
-test: ## run tests quickly with the default Python
-	pdm run pytest -x --ff -n auto tests
-
-
-test-all: ## run tests on every Python version with tox
-	tox
-
-coverage: ## check code coverage quickly with the default Python
-	pdm run coverage run --source cattrs -m pytest -n auto tests
-
-	pdm run coverage report -m
-	pdm run coverage html
-	$(BROWSER) htmlcov/index.html
-
 docs: ## generate Sphinx HTML documentation, including API docs
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs doctest