Permalink
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
...
- 3 commits
- 4 files changed
- 1 contributor
Commits on Mar 17, 2025
-
build: Restore documentation and test files in sdist
This commit fixes a problem reported by Nicholas Bollweg at #725. Recent commit a3e1325 "CI: Publish PyPI releases using GitHub Actions workflows" and automatic publication of version 1.36.1 revealed a problem that had probably been there for some time: most documentation and test files weren't included in the source distribution when running `python -m build` (unless an `yamllint.egg-info` from a previous run listed them). I see two solutions: 1. Add plugin `setuptools-scm` in `pyproject.toml`: requires = ["setuptools >= 61", "setuptools-scm >= 8"] This would add all files tracked by Git in the sdist, including a few that aren't really needed: `.flake8`, `.github`, `.readthedocs.yaml`… 2. Declare extra files to embed in `MANIFEST.in`. This is what this commit does. I checked that: - All files packages before 1.36.0 are correctly included now: tar -tvf dist/yamllint-1.36.0.tar.gz | cut -b65- \ > /tmp/sdist-files-before rm -rf yamllint.egg-info && python -m build && \ tar -tvf dist/yamllint-1.36.1.tar.gz | cut -b65- \ > /tmp/sdist-files-after git diff --no-index /tmp/sdist-files-before /tmp/sdist-files-after - These extra files are still not installed by `pip install` (they are not needed): pip install yamllint==1.36.0 && \ tree ~/.local/lib/python3.13/site-packages/yamllint \ > /tmp/pip-install-before pip install dist/yamllint-1.36.1.tar.gz && \ tree ~/.local/lib/python3.13/site-packages/yamllint \ > /tmp/pip-install-after git diff --no-index /tmp/pip-install-before /tmp/pip-install-after
-
CI: Ignore version duplicates when publishing to TestPyPI
This commit prevents the failure of the GitHub Actions job "Publish distribution package to TestPyPI" on most pushes (see discussion at #721 (comment)), since recent commit a3e1325 "CI: Publish PyPI releases using GitHub Actions workflows". Indeed, TestPyPI doesn't allow repushing the same version. Use `skip-existing` to prevent to such failures on the CI. An alternative would be to use the `setuptools-scm` plugin to define a unique version for each commit (e.g. `1.36.2.dev2+gd4f1c14`), but it requires more changes (define the version in `pyproject.toml`, fetch tags from GitHub in `publish.yaml`, exclude `.*` + `.github/**` files in `MANIFEST.in`). Moreover it doesn't work as is: to prevent errors like `HTTP 400 The use of local versions in '1.36.2.dev2+gd4f1c14' is not allowed` we would need `local_scheme = "no-local-version"`, which would push duplicated versions on TestPyPI anyway.
-
There are no files selected for viewing