Skip to content

[setuptools] Force the upgrade of setuptools > 77 #2715

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

Merged
merged 1 commit into from
Mar 26, 2025
Merged

Conversation

Pierre-Sassoulas
Copy link
Member

Type of Changes

Type
🔨 Refactoring

@Pierre-Sassoulas Pierre-Sassoulas added Maintenance Discussion or action around maintaining astroid or the dev workflow backport maintenance/3.3.x labels Mar 25, 2025
@Pierre-Sassoulas Pierre-Sassoulas added this to the 3.3.10 milestone Mar 25, 2025
Copy link

codecov bot commented Mar 25, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.21%. Comparing base (cf64a90) to head (ad1b0a8).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2715   +/-   ##
=======================================
  Coverage   93.21%   93.21%           
=======================================
  Files          93       93           
  Lines       11071    11071           
=======================================
  Hits        10320    10320           
  Misses        751      751           
Flag Coverage Δ
linux 93.08% <ø> (ø)
pypy 93.21% <ø> (ø)
windows 93.19% <ø> (ø)

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@cdce8p cdce8p merged commit 9a2d66a into main Mar 26, 2025
22 checks passed
@cdce8p cdce8p deleted the upgrading-setuptools branch March 26, 2025 11:39
Copy link
Contributor

The backport to maintenance/3.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-maintenance/3.3.x maintenance/3.3.x
# Navigate to the new working tree
cd .worktrees/backport-maintenance/3.3.x
# Create a new branch
git switch --create backport-2715-to-maintenance/3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9a2d66a398160b5fb73742371883e57d054a3330
# Push it to GitHub
git push --set-upstream origin backport-2715-to-maintenance/3.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-maintenance/3.3.x

Then, create a pull request where the base branch is maintenance/3.3.x and the compare/head branch is backport-2715-to-maintenance/3.3.x.

@cdce8p
Copy link
Member

cdce8p commented Mar 26, 2025

It seems we didn't backport two previous PRs this one relied on:

Not sure if it's worth it at this point to do the backport manually. The bug which was fixed here won't happen on the backport branch since that hasn't adopted PEP 639 yet. What do you think @Pierre-Sassoulas ?

@Pierre-Sassoulas
Copy link
Member Author

I'm going to do it as we might want to release a lot of patch version before astroid 4.0.0 is out

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport maintenance/3.3.x Maintenance Discussion or action around maintaining astroid or the dev workflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants