diff --git a/Dockerfile.debbuild b/Dockerfile.debbuild index 8d185b1..35ffc7b 100644 --- a/Dockerfile.debbuild +++ b/Dockerfile.debbuild @@ -61,6 +61,23 @@ rsync -a --delete \ "${SRC}/" "${WORK}/" cd "${WORK}" + +# This project's pyproject.toml uses the PEP 621 [project] table, which needs +# poetry-core >= 2.0. Debian bookworm and Ubuntu jammy/noble ship an older +# poetry-core that cannot parse it. On those, swap in the legacy Poetry 1.x +# formatted metadata (kept in sync at pyproject.poetry1.toml) for the build. +# trixie and newer ship poetry-core 2.x and keep the PEP 621 file. +if [ -f pyproject.poetry1.toml ]; then + core_ver="$(python3 -c 'import poetry.core as c; print(c.__version__)' 2>/dev/null || echo 0)" + core_major="${core_ver%%.*}" + if [ "${core_major:-0}" -lt 2 ]; then + echo "poetry-core ${core_ver} < 2.0: using legacy pyproject.poetry1.toml" + cp pyproject.poetry1.toml pyproject.toml + else + echo "poetry-core ${core_ver} >= 2.0: using PEP 621 pyproject.toml" + fi +fi + if [ -n "${SUITE:-}" ]; then export DEBEMAIL="mig@mig5.net" export DEBFULLNAME="Miguel Jacq" diff --git a/README.md b/README.md index 8423cb7..2905cfe 100644 --- a/README.md +++ b/README.md @@ -281,11 +281,6 @@ Clone the repo and then run inside the clone: poetry install ``` -### AppImage - -Download the AppImage from the Releases page, make it executable, and put it on -your `$PATH`. - ## Full usage info ```text diff --git a/release.sh b/release.sh index 2cdb868..874e50e 100755 --- a/release.sh +++ b/release.sh @@ -7,11 +7,6 @@ filedust -y . # Publish to Pypi poetry build -poetry publish - -# Make AppImage -poetry run pyproject-appimage -mv JinjaTurtle.AppImage dist/ # Sign packages for file in `ls -1 dist/`; do qubes-gpg-client --batch --armor --detach-sign dist/$file > dist/$file.asc; done @@ -51,8 +46,8 @@ REPO_ROOT="${HOME}/git/repo_rpm" REMOTE="ashpool.mig5.net:/opt/repo_rpm" DISTS=( + fedora:44 fedora:43 - fedora:42 ) for dist in ${DISTS[@]}; do @@ -87,6 +82,9 @@ for dist in ${DISTS[@]}; do qubes-gpg-client --local-user "$KEYID" --detach-sign --armor "$RPM_REPO/repodata/repomd.xml" > "$RPM_REPO/repodata/repomd.xml.asc" done +# If we got this far, we can publish to PyPI +poetry publish + echo "==> Syncing repo to server..." rsync -aHPvz --exclude=.git --delete "$REPO_ROOT/" "$REMOTE/"