pylint-dev / pylint

It's not just a linter that annoys you!
https://pylint.readthedocs.io/en/latest/
GNU General Public License v2.0
5.26k stars 1.12k forks source link

Merge maintenance/3.2.x into main following 3.2.7 release #9903

Closed jacobtylerwalls closed 4 weeks ago

codecov[bot] commented 4 weeks ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 95.80%. Comparing base (d5f9360) to head (4830dec). Report is 8 commits behind head on main.

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/pylint-dev/pylint/pull/9903/graphs/tree.svg?width=650&height=150&src=pr&token=ZETEzayrfk&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=pylint-dev)](https://app.codecov.io/gh/pylint-dev/pylint/pull/9903?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=pylint-dev) ```diff @@ Coverage Diff @@ ## main #9903 +/- ## ======================================= Coverage 95.80% 95.80% ======================================= Files 174 174 Lines 18918 18918 ======================================= Hits 18124 18124 Misses 794 794 ```
jacobtylerwalls commented 4 weeks ago

I can't find the additional commits here, which is the entire point?

Pierre-Sassoulas commented 4 weeks ago

What I did:

git switch post-3.2.7
git reset --hard origin/main
git merge origin/maintenance/3.2.x
# (resolve merge conflicts)
git merge --continue
git push --force
jacobtylerwalls commented 4 weeks ago

Yes, I had to move them on the backport to stay under the 50 file limit, let's not create dupes on main

Pierre-Sassoulas commented 4 weeks ago

Aye aye, came to the same conclusion, it's duplicated between reg and reg02.

Pierre-Sassoulas commented 4 weeks ago

(Same thing for the rc file for unreacheable, we don't need that on main as we dropped 3.8)

jacobtylerwalls commented 4 weeks ago

Thanks for the help!