Merge maintenance/3.0.x into main following 3.0.1 release

[jacobtylerwalls]

No description provided.

[jacobtylerwalls]

@Pierre-Sassoulas would you be (whenever you have the chance) able to help me out understanding how we do these forwardports? I find myself manually reverting the changes to the version number, which apparently adds a commit to the maintenance branch I wouldn't have expected.

[jacobtylerwalls]

This github diff isn't very helpful 🤣

[codecov]

Codecov Report

Merging #2323 (d511533) into main (0883b04) will increase coverage by 0.00%.
Report is 4 commits behind head on main.
The diff coverage is 100.00%.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2323   +/-   ##
=======================================
  Coverage   92.85%   92.86%           
=======================================
  Files          94       94           
  Lines       11056    11065    +9     
=======================================
+ Hits        10266    10275    +9     
  Misses        790      790           

Flag	Coverage Δ
linux	92.67% <100.00%> (+<0.01%)	⬆️
pypy	90.99% <88.88%> (-0.01%)	⬇️
windows	92.45% <100.00%> (+<0.01%)	⬆️

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

Files	Coverage Δ
astroid/nodes/node_classes.py	94.83% <100.00%> (+0.01%)	⬆️
astroid/protocols.py	90.28% <100.00%> (+0.06%)	⬆️

[Pierre-Sassoulas]

I'm also reverting the version change manually but I amend the merge commit instead of creating a new commit (heavy process that prevent us to release say after each merge request)

[Pierre-Sassoulas]

The github diff should be only the changelog, it seems something went wrong (?)

[jacobtylerwalls]

I'm stumped; the code exists in both branches.

[Pierre-Sassoulas]

I think it's github doing some magic so you can see what's on the merged branch (?). Merge commit seems fine: dd16f34

[jacobtylerwalls]

Thanks for looking with me!

[jacobtylerwalls]

@Pierre-Sassoulas should we restore maintenance/3.0.x?

[Pierre-Sassoulas]

Restore ?

[jacobtylerwalls]

It was deleted. Won't we keep it for a year or so?

[Pierre-Sassoulas]

Ha sure, I didn't realize I deleted it. Probably something is wrong with the branch protection regex if I was able to do that.

[Pierre-Sassoulas]

(We should to keep it until 3.1.0 is out)