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.

Sign up for GitHub

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

Jump to bottom

Switch from setup.py to pyproject.toml #665

Merged
merged 5 commits into from
Oct 7, 2024
Merged

Switch from setup.py to pyproject.toml #665

merged 5 commits into from
Oct 7, 2024

Conversation

pquentin
Copy link
Member

@pquentin pquentin commented Oct 6, 2024

Based on #664.

@pquentin pquentin requested a review from sethmlarson October 6, 2024 18:10
sethmlarson
sethmlarson approved these changes Oct 6, 2024
View reviewed changes
Copy link

@sethmlarson sethmlarson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@sethmlarson
Copy link

sethmlarson commented Oct 6, 2024 •
edited
Loading

@pquentin Actually looks like there's a conflict with the latest merge that can't be resolved in the UI, want to take a look on CLI?

@pquentin
Copy link
Member Author

pquentin commented Oct 7, 2024 •
edited
Loading

Thanks! It looks like the deletion of a modified file was the issue here.

@pquentin pquentin merged commit 83ffe51 into python-trio:main Oct 7, 2024
19 checks passed
@pquentin pquentin deleted the pyproject.toml branch October 7, 2024 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sethmlarson sethmlarson sethmlarson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pquentin @sethmlarson