From 6cedd657f109a7bb3b7b04f86a5e6ca48777ed76 Mon Sep 17 00:00:00 2001 From: "David L. Day" Date: Thu, 24 Jul 2025 05:44:24 -0400 Subject: [PATCH 1/2] fix: use OrderedDict from collections instead of deprecated typing --- src/pointofview/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pointofview/__init__.py b/src/pointofview/__init__.py index 160245e..81097fa 100644 --- a/src/pointofview/__init__.py +++ b/src/pointofview/__init__.py @@ -7,8 +7,9 @@ """ import re +from collections import OrderedDict from importlib import metadata -from typing import OrderedDict, Optional +from typing import Optional __version__ = metadata.version(__name__) From 560ead75996d8670280cd1f474c9c16dd0b280e3 Mon Sep 17 00:00:00 2001 From: "David L. Day" Date: Thu, 24 Jul 2025 05:56:16 -0400 Subject: [PATCH 2/2] ci: do not cancel in progress release workflow on bump --- .github/workflows/python-release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml index 8c7eba7..9c033f4 100644 --- a/.github/workflows/python-release.yml +++ b/.github/workflows/python-release.yml @@ -10,7 +10,8 @@ on: concurrency: group: bump-and-release-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: + ${{ ! startsWith(github.event.head_commit.message, 'bump:') }} jobs: black: @@ -35,7 +36,7 @@ jobs: release: needs: test - if: ${{ !startsWith(github.event.head_commit.message, 'bump:') }} + if: ${{ ! startsWith(github.event.head_commit.message, 'bump:') }} # Don't run 'bump:' permissions: contents: write