Skip to content

Commit

Permalink
Fix broken make deb-from-pypi (switch to GH releases) (#12)
Browse files Browse the repository at this point in the history
PyPI no longer serves PGP signatures:
```
uscan info: Downloading OpenPGP signature from:
   https://pypi.debian.net/afancontrol/afancontrol-3.1.0.tar.gz.asc (pgpsigurlmangled)
   as afancontrol-3.1.0.tar.gz.asc
uscan info: Requesting URL:
   https://pypi.debian.net/afancontrol/afancontrol-3.1.0.tar.gz.asc
uscan warn: In directory ., downloading
  https://pypi.debian.net/afancontrol/afancontrol-3.1.0.tar.gz.asc failed: 404 NOT FOUND
uscan die: FAIL Checking OpenPGP signature (no signature file downloaded).
```
  • Loading branch information
KostyaEsmukov committed Jan 6, 2024
1 parent a289bec commit dc6dcee
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ deb-local: clean sdist
'

.PHONY: deb-from-pypi
deb-from-pypi: clean
deb-from-pypi: deb-from-github # deprecated target

.PHONY: deb-from-github
deb-from-github: clean
docker build -t afancontrol-debuild -f ./Dockerfile.debian .
docker run -it --rm \
-v `pwd`/dist:/afancontrol/dist \
Expand Down
4 changes: 3 additions & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
1. `make release`
1. `git tag -s 3.0.0` + `git push origin 3.0.0`
1. Create a new release for the pushed tag at https://github.com/KostyaEsmukov/afancontrol/releases
1. Upload a GPG signature of the tarball to the just created GitHub release,
see https://wiki.debian.org/Creating%20signed%20GitHub%20releases

## Check

1. `make deb-from-pypi`
1. `make deb-from-github`
1. `docker run -it --rm python:3.7 bash` + `pip install afancontrol` + `afancontrol --help`
1. Ensure that the CI build for the tag is green.
10 changes: 7 additions & 3 deletions debian/watch
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
version=3
opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ \
https://pypi.debian.net/afancontrol/afancontrol-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
version=4
opts="repack,compression=gz,repacksuffix=+dfsg,dversionmangle=s/\+dfsg//,\
uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
pgpsigurlmangle=s@archive/refs/tags@releases/download@;\
s@([^\/]+)\.tar\.gz@$1/afancontrol-$1\.tar\.gz@;\
s/$/.asc/" \
https://github.com/KostyaEsmukov/afancontrol/tags .*/v?(\d\.\d\.\d[a-z]?)\.tar\.gz
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ There's a Dockerfile which can be used to build a Debian `.deb` package:
# Build the .deb from the latest PyPI release:
git clone https://github.com/KostyaEsmukov/afancontrol.git
cd afancontrol
make deb-from-pypi
make deb-from-github

# Install the package:
sudo apt install ./dist/debian/*.deb
Expand Down

0 comments on commit dc6dcee

Please sign in to comment.