Skip to content

Commit 7834f0a

Browse files
Merge pull request #295 from wphillipmoore/release/1.1.5
release: 1.1.5
2 parents 8623fd9 + 5dc6096 commit 7834f0a

8 files changed

Lines changed: 209 additions & 85 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ jobs:
245245
with:
246246
language: python
247247

248-
integration-test:
249-
name: integration-test
248+
integration-tests:
249+
name: integration-tests
250250
runs-on: ubuntu-latest
251251
needs: docs-only
252252
if: needs.docs-only.outputs.docs-only != 'true'

.github/workflows/publish.yml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,8 @@ jobs:
161161
- name: Create version bump PR
162162
if: steps.bump_check.outputs.needed == 'true'
163163
env:
164-
GH_TOKEN: ${{ secrets.PR_BUMP_TOKEN || github.token }}
164+
GH_TOKEN: ${{ github.token }}
165165
run: |
166-
git remote set-url origin \
167-
"https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git"
168166
git checkout -b "${{ steps.next_version.outputs.branch }}" origin/develop
169167
git merge origin/main --no-edit
170168
@@ -191,22 +189,35 @@ jobs:
191189
git commit -m "chore: bump version to ${{ steps.next_version.outputs.version }}"
192190
git push origin "${{ steps.next_version.outputs.branch }}"
193191
194-
gh pr create \
192+
pr_url=$(gh pr create \
195193
--base develop \
196194
--head "${{ steps.next_version.outputs.branch }}" \
197195
--title "chore: bump version to ${{ steps.next_version.outputs.version }}" \
198-
--body "$(cat <<'EOF'
199-
Automated patch version bump after publishing ${{ steps.version.outputs.version }}.
196+
--body "Automated patch version bump after publishing ${{ steps.version.outputs.version }}.
200197
201-
This merges `main` back into `develop` to pick up the changelog and any
198+
This merges \`main\` back into \`develop\` to pick up the changelog and any
202199
other release-branch artifacts, then sets the working version to the next
203200
expected patch release. Change this to a minor or major bump if the next
204201
release warrants it.
205202
206203
Dependencies are refreshed to their latest compatible versions
207-
via `uv lock --upgrade`.
208-
EOF
209-
)"
204+
via \`uv lock --upgrade\`.")
205+
206+
pr_number="${pr_url##*/}"
207+
gh pr edit "$pr_number" --body "Automated patch version bump after publishing ${{ steps.version.outputs.version }}.
208+
209+
This merges \`main\` back into \`develop\` to pick up the changelog and any
210+
other release-branch artifacts, then sets the working version to the next
211+
expected patch release. Change this to a minor or major bump if the next
212+
release warrants it.
213+
214+
Dependencies are refreshed to their latest compatible versions
215+
via \`uv lock --upgrade\`.
216+
217+
Ref #${pr_number}"
218+
219+
gh pr close "$pr_number"
220+
gh pr reopen "$pr_number"
210221
211222
gh pr merge \
212223
--auto --merge --delete-branch \

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](https://semver.org/).
77

8+
## [1.1.5] - 2026-02-16
9+
10+
### Bug fixes
11+
12+
- move SBOM generation after PyPI publish step (#284) (#287)
13+
- sync prepare_release.py merge message fix from canonical (#291)
14+
- sync prepare_release.py changelog conflict fix from canonical (#293)
15+
16+
### Styling
17+
18+
- fix ruff lint errors in prepare_release.py (#288)
19+
820
## [1.1.4] - 2026-02-16
921

1022
### Bug fixes
@@ -13,6 +25,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
1325
- disable MD041 for mkdocs snippet-include files
1426
- correct snippets base_path resolution for fragment includes (#267)
1527
- run mike from repo root so snippet base_path resolves in CI (#268)
28+
- remove PR_BUMP_TOKEN and add issue linkage to version bump PR
29+
- rename integration-test job to integration-tests
30+
- move SBOM generation after PyPI publish step (#284)
31+
- sync prepare_release.py with canonical version (#286)
1632

1733
### Documentation
1834

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "pymqrest"
7-
version = "1.1.4"
7+
version = "1.1.5"
88
description = "Python wrapper for the IBM MQ REST API"
99
readme = "README.md"
1010
license = "GPL-3.0-or-later"

requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cyclonedx-python-lib==11.6.0
1717
# via pip-audit
1818
defusedxml==0.7.1
1919
# via py-serializable
20-
filelock==3.24.0
20+
filelock==3.24.2
2121
# via cachecontrol
2222
idna==3.11
2323
# via requests
@@ -53,7 +53,7 @@ pip-audit==2.10.0
5353
pip-licenses==5.5.1
5454
pip-requirements-parser==32.0.1
5555
# via pip-audit
56-
platformdirs==4.9.1
56+
platformdirs==4.9.2
5757
# via pip-audit
5858
pluggy==1.6.0
5959
# via

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cyclonedx-python-lib==11.6.0
1717
# via pip-audit
1818
defusedxml==0.7.1
1919
# via py-serializable
20-
filelock==3.24.0
20+
filelock==3.24.2
2121
# via cachecontrol
2222
idna==3.11
2323
# via requests
@@ -53,7 +53,7 @@ pip-audit==2.10.0
5353
pip-licenses==5.5.1
5454
pip-requirements-parser==32.0.1
5555
# via pip-audit
56-
platformdirs==4.9.1
56+
platformdirs==4.9.2
5757
# via pip-audit
5858
pluggy==1.6.0
5959
# via

0 commit comments

Comments
 (0)