Merge pull request #389 from Metaswitch/md/trustedpublisher

Fix PyPI publishing and retag

Author: maxdymond

.github/workflows/deploy.yml

@@ -6,19 +6,25 @@ on:
 jobs:
   Deploy:
     runs-on: ubuntu-latest
+    permissions:
+      # IMPORTANT: this permission is mandatory for Trusted Publishing
+      id-token: write
     steps:
       - name: 'Set up Python'
         uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - uses: actions/checkout@v4
       - run: bash install.sh
+      # Build the package and publish it.
+      - run: poetry build
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+      # Build the docker image and publish it
       - run: bash deploy.sh
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
-          PYPI_USER: ${{ secrets.PYPI_USER }}
-          PYPI_PASS: ${{ secrets.PYPI_PASS }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: bash after_deploy.sh
         env:

CHANGELOG.md

@@ -14,6 +14,11 @@ version number is tracked in the file `pyproject.toml`.
 
 ### Fixed
 
+## [6.0.1] - 2025-03-11
+
+### Fixed
+- Fix PyPI publishing
+
 ## [6.0.0] - 2025-03-11
 
 ### Breaking Changes
@@ -109,7 +114,8 @@ version number is tracked in the file `pyproject.toml`.
 
 ### Added
 
-[unreleased]: https://github.com/Metaswitch/announcer/compare/6.0.0...HEAD
+[unreleased]: https://github.com/Metaswitch/announcer/compare/6.0.1...HEAD
+[6.0.1]: https://github.com/Metaswitch/announcer/compare/6.0.0...6.0.1
 [6.0.0]: https://github.com/Metaswitch/announcer/compare/5.0.0...6.0.0
 [5.0.0]: https://github.com/Metaswitch/announcer/compare/4.0.1...5.0.0
 [4.0.1]: https://github.com/Metaswitch/announcer/compare/4.0.0...4.0.1

after_deploy.sh

@@ -2,7 +2,7 @@
 
 echo "Announce changes to the world!"
 
-VERSION=$(tomlq -r '.tool.poetry.version' pyproject.toml)
+VERSION=$(tomlq -r '.project.version' pyproject.toml)
 echo "Version: $VERSION"
 
 # Send announcement to a standalone test webhook.

deploy.sh

@@ -1,14 +1,11 @@
 #!/usr/bin/env bash
 
-VERSION=$(tomlq -r '.tool.poetry.version' pyproject.toml)
+VERSION=$(tomlq -r '.project.version' pyproject.toml)
 echo "Version: $VERSION"
 
 # Log into docker
 docker login -u $DOCKER_USER -p $DOCKER_PASS
 
-echo "Deploying to pypi"
-poetry publish --username $PYPI_USER --password $PYPI_PASS --build
-
 # Try and compile the Docker image - this will fail while the package isn't yet released.
 while ! docker build --build-arg VERSION=$VERSION -t metaswitch/announcer:$VERSION .
 do

install.sh

@@ -5,4 +5,4 @@ set -ex
 # Because poetry doesn't support dev-dependency extras, we need to install these
 # tools outside of the tox poetry environment (because they're not required inside).
 #
-pip install -U poetry tox-gh-actions tomlq
+pip install -U poetry tox-gh-actions yq

pyproject.toml

@@ -3,7 +3,7 @@ name = "announcer"
 description = "Announce changes in keepachangelog-style CHANGELOG.md files to Slack and Microsoft Teams"
 license = "MIT"
 keywords = ['slack', 'teams']
-version = "6.0.0"
+version = "6.0.1"
 readme = "README.md"
 authors = [{name = "Max Dymond", email = "max.dymond@metaswitch.com"}]
 requires-python = '>=3.9,<4.0.0'