Tweak RELEASING.md instructions for patch releases (#1347) · rytilahti/python-kasa@8150fd6 · GitHub

1. rytilahti
2. python-kasa

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 8150fd6

Browse filesBrowse the repository at this point in the historyBrowse files

sdb9696

authored and

rytilahti

committed

Tweak RELEASING.md instructions for patch releases (python-kasa#1347)

1 parent 5df80b9 commit 8150fd6
Copy full SHA for 8150fd6

1 file changed

+4-1Lines changed: 4 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• RELEASING.md

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎RELEASING.md‎

Copy file name to clipboardExpand all lines: RELEASING.md

+4-1Lines changed: 4 additions & 1 deletion

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -283,9 +283,12 @@ git rebase upstream/master
283	283	git checkout -b janitor/merge_patch
284	284	git fetch upstream patch
285	285	git merge upstream/patch --no-commit
	286	+ # If there are any merge conflicts run the following command which will simply make master win
	287	+ # Do not run it if there are no conflicts as it will end up checking out upstream/master
286	288	git diff --name-only --diff-filter=U | xargs git checkout upstream/master
	289	+ # Check the diff is as expected
287	290	git diff --staged
288		- # The only diff should be the version in pyproject.toml and CHANGELOG.md
	291	+ # The only diff should be the version in pyproject.toml and uv.lock, and CHANGELOG.md
289	292	# unless a change made on patch that was not part of a cherry-pick commit
290	293	# If there are any other unexpected diffs `git checkout upstream/master [thefilename]`
291	294	git commit -m "Merge patch into local master" -S

0 commit comments

Comments

0 (0)