From 40e062871679c4b1814c10740b9dc4f6dffafa5b Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Mon, 25 Sep 2023 19:22:19 +0100 Subject: [PATCH 1/4] Fix make homepage make -C doc code make[1]: Entering directory '/var/tmp/linkchecker/doc' make[1]: *** No rule to make target 'code'. Stop. code target was removed in: c7989eb05 ("Turn all warnings into errors when building website", 2022-11-02) --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 4f64e595..f592e1af 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,6 @@ upload: twine upload dist/LinkChecker* homepage: linkcheck/_release.py - make -C doc code make -C doc html dist: From d414c4ab1c1a6edff3d3fb253a8add9e4bea3163 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Mon, 25 Sep 2023 19:22:19 +0100 Subject: [PATCH 2/4] Rename upload step of release workflow Sigstore files are uploaded as well as distribution files. --- .github/workflows/release-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-files.yml b/.github/workflows/release-files.yml index 737fca8c..920b34b3 100644 --- a/.github/workflows/release-files.yml +++ b/.github/workflows/release-files.yml @@ -51,7 +51,7 @@ jobs: run: > sha256sum dist/*.{tar.gz,whl} - - name: Add distribution files to release + - name: Add files to release run: > gh release upload ${{ github.ref_name }} dist/* env: From 0c9b98deb52ccf8f0985588b539c89a1161eaad6 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Mon, 25 Sep 2023 19:22:19 +0100 Subject: [PATCH 3/4] Fix release workflow publish step gh-action-pypi-publish failing on twine check: Checking dist/LinkChecker-10.3.0-py3-none-any.whl.crt: ERROR InvalidDistribution: Unknown distribution format: 'LinkChecker-10.3.0-py3-none-any.whl.crt' --- .github/workflows/release-files.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release-files.yml b/.github/workflows/release-files.yml index 920b34b3..5ab5cc6f 100644 --- a/.github/workflows/release-files.yml +++ b/.github/workflows/release-files.yml @@ -57,5 +57,9 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + - name: Remove Sigstore files + run: > + rm -f dist/*.{crt,sig,sigstore} + - name: Publish distribution files to PyPI uses: pypa/gh-action-pypi-publish@release/v1 From 00da28f5bc920a470cb35e1f1ca60174baf9676a Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Mon, 25 Sep 2023 19:22:19 +0100 Subject: [PATCH 4/4] Document that --verbose overrides --no-warnings --- doc/src/man/linkchecker.rst | 3 ++- doc/src/man/linkcheckerrc.rst | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/src/man/linkchecker.rst b/doc/src/man/linkchecker.rst index ef4fbb09..b9a2476b 100644 --- a/doc/src/man/linkchecker.rst +++ b/doc/src/man/linkchecker.rst @@ -141,7 +141,8 @@ URL checking results .. option:: -v, --verbose - Log all checked URLs. Default is to log only errors and warnings. + Log all checked URLs, overriding :option:`--no-warnings`. + Default is to log only errors and warnings. Progress updates """""""""""""""" diff --git a/doc/src/man/linkcheckerrc.rst b/doc/src/man/linkcheckerrc.rst index f5b8cb90..e1e54493 100644 --- a/doc/src/man/linkcheckerrc.rst +++ b/doc/src/man/linkcheckerrc.rst @@ -181,8 +181,8 @@ URL checking results https://docs.python.org/library/codecs.html#standard-encodings. Command line option: :option:`--output` **verbose=**\ [**0**\ \|\ **1**] - If set log all checked URLs once. Default is to log only errors and - warnings. + If set log all checked URLs once, overriding **warnings**. + Default is to log only errors and warnings. Command line option: :option:`--verbose` **warnings=**\ [**0**\ \|\ **1**] If set log warnings. Default is to log warnings.