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

Cherry-pick with test fixes #36

Open
wants to merge 1 commit into
base: regression_fix
Choose a base branch
from
Open

Cherry-pick with test fixes #36

wants to merge 1 commit into from

Conversation

nanjekyejoannah
Copy link

@nanjekyejoannah nanjekyejoannah commented Feb 20, 2024 •
edited
Loading

Cherry-pick with fixes, to make string warning ready.

ltratt
ltratt reviewed Feb 21, 2024
View reviewed changes
Lib/test/test_class.py
@@ -3,7 +3,7 @@
import unittest

from test import test_support

Copy link
Member

Choose a reason for hiding this comment

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

A few blank line additions have crept into this commit, which might make merge conflicts a bit more likely later. Probably worth putting things back as they were.

ltratt
ltratt reviewed Feb 21, 2024
View reviewed changes
Lib/warnings.py Outdated Show resolved Hide resolved
@ltratt
Copy link
Member

ltratt commented Feb 21, 2024

Please squash.

1 similar comment
@ltratt
Copy link
Member

ltratt commented Feb 26, 2024

Please squash.

@nanjekyejoannah
Copy link
Author

nanjekyejoannah commented Mar 15, 2024 •
edited
Loading

Squashed

@ltratt ltratt added this pull request to the merge queue Mar 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Mar 15, 2024
@ltratt
Copy link
Member

ltratt commented Mar 15, 2024

Ah, this has failed because CI is set on the migration branch (not regression_fix). Which of those branches would you like to target?

@nanjekyejoannah
Copy link
Author

The PR targets regression_fix

@ltratt
Copy link
Member

ltratt commented Mar 18, 2024

Does that mean we don't want the migration branch?

@nanjekyejoannah
Copy link
Author

nanjekyejoannah commented Mar 19, 2024 •
edited
Loading

Does that mean we don't want the migration branch?

I will explain more tommorrow.

This is going to be merged to migration eventually, that was we discussed when we created this branch IIRC.

@ltratt
Copy link
Member

ltratt commented Mar 19, 2024

OK.

@ltratt
Copy link
Member

ltratt commented Apr 9, 2024

Is this one OK to merge?

@ltratt
Copy link
Member

ltratt commented May 1, 2024

@nanjekyejoannah Shall we merge this?

@ltratt ltratt added this pull request to the merge queue May 1, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks May 1, 2024
@ltratt
Copy link
Member

ltratt commented May 1, 2024

Hmm, this took over an hour in our CI system. I'll try again in case it was a one-off, but I'm wondering if something's making things take unduly long.

@ltratt ltratt added this pull request to the merge queue May 1, 2024
@ltratt
Copy link
Member

ltratt commented May 1, 2024

@nanjekyejoannah In CI a Python process is currently taking 37GiB of RAM, so I think something's gone wrong with this PR. I wonder if it's because of this:

if not sys.py3kwarning:
    sys.setrecursionlimit(1 << 30)

at https://github.com/softdevteam/pygrate2/pull/36/files#diff-1d0c2ffbcb01254c4ab02053d85527be50e03ea2908dc6cdba9fc185b8df9b7bR10 ?

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks May 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ltratt ltratt ltratt left review comments

Assignees

@ltratt ltratt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nanjekyejoannah @ltratt