Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v3.8.4 #7207

Merged
merged 1 commit into from
Feb 12, 2023
Merged

Release v3.8.4 #7207

merged 1 commit into from
Feb 12, 2023

Conversation

Dreamsorcerer
Copy link
Member

@webknjaz So, squash commit this into 3.8, add a tag, then merge commit to 3.9?

@Dreamsorcerer
Copy link
Member Author

Is tools/cleanup_changes.py needed for anything?

@codecov
Copy link

codecov bot commented Feb 12, 2023

Codecov Report

Merging #7207 (ec7fabb) into 3.8 (28854a4) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##              3.8    #7207   +/-   ##
=======================================
  Coverage   97.41%   97.41%           
=======================================
  Files         107      107           
  Lines       30996    30996           
  Branches     3924     3924           
=======================================
  Hits        30194    30194           
- Misses        599      600    +1     
+ Partials      203      202    -1     
Flag Coverage Δ
CI-GHA 97.27% <100.00%> (ø)
OS-Linux 96.92% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.23% <ø> (ø)
OS-macOS 96.65% <100.00%> (-0.01%) ⬇️
Py-3.10.9 96.85% <100.00%> (+0.05%) ⬆️
Py-3.11.0 95.18% <100.00%> (ø)
Py-3.6.15 96.38% <100.00%> (-0.01%) ⬇️
Py-3.6.8 94.76% <ø> (ø)
Py-3.7.15 96.53% <100.00%> (ø)
Py-3.7.9 94.89% <ø> (ø)
Py-3.8.10 94.81% <ø> (-0.01%) ⬇️
Py-3.8.16 96.44% <100.00%> (ø)
Py-3.9.13 94.81% <ø> (-0.01%) ⬇️
Py-3.9.16 96.46% <100.00%> (ø)
Py-pypy7.3.11 93.94% <100.00%> (-0.02%) ⬇️
VM-macos-latest 96.65% <100.00%> (-0.01%) ⬇️
VM-ubuntu-20.04 96.89% <100.00%> (+0.04%) ⬆️
VM-ubuntu-latest 96.45% <100.00%> (ø)
VM-windows-latest 95.23% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
aiohttp/__init__.py 100.00% <100.00%> (ø)
tests/test_web_functional.py 98.08% <0.00%> (-0.07%) ⬇️
tests/autobahn/test_autobahn.py 100.00% <0.00%> (+1.66%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@webknjaz
Copy link
Member

s/0.8.4/3.8.4/ tho

@webknjaz
Copy link
Member

So, squash commit this into 3.8, add a tag, then merge commit to 3.9?

Yes, and follow up with another post-dev bump.

@webknjaz webknjaz changed the title Release 0.8.4 Release v3.8.4 Feb 12, 2023
@webknjaz
Copy link
Member

Is tools/cleanup_changes.py needed for anything?

I don't think I ever used it. I think only Andrew did.

@webknjaz
Copy link
Member

I just checked that script and it seems it attempts emulate fragment removal but this should usually happen with git merge if done properly.

@Dreamsorcerer Dreamsorcerer merged commit 33953f1 into 3.8 Feb 12, 2023
@Dreamsorcerer Dreamsorcerer deleted the release/v3.8.4 branch February 12, 2023 17:18
@Dreamsorcerer
Copy link
Member Author

s/0.8.4/3.8.4/ tho

Ha, fortunately only the commit message, wiped out with the squash commit.

@webknjaz
Copy link
Member

@Dreamsorcerer remember to do a post-release bump, plus merge 3.8 into 3.9 locally, and 3.9 into master, after that. You'll probably have to deal with conflict resolutions and there's a chance of accidentally reintroducing removed things, because the merge could be complex. So I'd recommend inspecting said merge commit and amending it as necessary before pushing. You could also push to a temporary branch to see the CI status and then, fast-forward the real one to the tested commit.

@Dreamsorcerer
Copy link
Member Author

I've run git merge locally, but that doesn't delete the fragments. I'm not sure why it would actually, because the files were added in separate branches, so they don't have a common history..

@Dreamsorcerer
Copy link
Member Author

That script seems to work though, and seems to have found a few that were missed from some previous releases:

rm 'CHANGES/5901.bugfix'
rm 'CHANGES/6189.bugfix'
rm 'CHANGES/6195.bugfix'
rm 'CHANGES/6201.bugfix'
rm 'CHANGES/6205.misc'
rm 'CHANGES/6240.doc'
rm 'CHANGES/6276.doc'
rm 'CHANGES/6278.doc'
rm 'CHANGES/6305.bugfix'
rm 'CHANGES/6638.bugfix'
rm 'CHANGES/7180.bugfix'

Also README.rst, so that needs to be fixed atleast.

@webknjaz
Copy link
Member

I'm not sure why it would actually, because the files were added in separate branches, so they don't have a common history..

Typically, it'd track those when the cherry-pick comment is preserved. FWIW you can delete them with that script and amend.

@Dreamsorcerer
Copy link
Member Author

OK, all done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants