Skip to content

Bring 7.1.x changes into main - cascadetoml undo + alarm fixes #5761

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 8 commits into from
Dec 23, 2021
Merged

Conversation

dhalbert
Copy link
Collaborator

Reverts #5754 now that there is a fixed release of cascadetoml.

@dhalbert dhalbert requested review from tannewt and jepler December 21, 2021 22:58
Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

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

I think this should revert the windows changes as well. I missed that with my revert.

@dhalbert dhalbert requested a review from tannewt December 22, 2021 02:44
@dhalbert
Copy link
Collaborator Author

I think this should revert the windows changes as well. I missed that with my revert.

The windows change was never merged into main. I closed the PR: #5756 before it was merged, so I think it's OK. I don't see any change in main: did I miss something?

@jepler
Copy link

jepler commented Dec 22, 2021

I agree, this needs to revert f527ef0.

@dhalbert
Copy link
Collaborator Author

I agree, this needs to revert f527ef0.

That commit is only in 7.1.x? Could you submit a 7.1.x revert PR? Thanks.

@tannewt
Copy link
Member

tannewt commented Dec 22, 2021

I made #5765 through the github UI.

@dhalbert dhalbert changed the title Revert cascadetoml and tomlkit pinning - main Bring 7.1.x changes into main - cascadetoml undo + alarm fixes Dec 23, 2021
@dhalbert
Copy link
Collaborator Author

This PR is now a general main update from 7.1.x.

Copy link

@jepler jepler left a comment

Choose a reason for hiding this comment

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

now it should be good to go

@jepler jepler merged commit 900ec91 into main Dec 23, 2021
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.

3 participants