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

gh-64595: Fix regression in file write logic in Argument Clinic #106449

Merged
merged 2 commits into from
Jul 5, 2023
Merged

gh-64595: Fix regression in file write logic in Argument Clinic #106449

merged 2 commits into from
Jul 5, 2023

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Jul 5, 2023 •
edited by bedevere-bot
Loading

@bedevere-bot bedevere-bot mentioned this pull request Jul 5, 2023
Open
@erlend-aasland
Copy link
Contributor Author

For now, revert the offending commits.

@erlend-aasland
Copy link
Contributor Author

I'm not sure this needs a NEWS item; clinic is an internal tool.

@AlexWaygood
Copy link
Member

What was the regression?

@erlend-aasland
Copy link
Contributor Author

What was the regression?

Clinic would not update files with custom output blocks. For example: output preset block, as used in Lib/test/clinic.test.c. So that test was in practice rendered useless.

@AlexWaygood
Copy link
Member

AlexWaygood commented Jul 5, 2023 •
edited
Loading

Okay, I'm not familiar with the history/background here, so I'm probably not the best reviewer for this one 👍

@AlexWaygood AlexWaygood removed their request for review July 5, 2023 10:16
@erlend-aasland
Copy link
Contributor Author

Okay, I'm not familiar with the history/background here, so I'm probably not the best reviewer for this one 👍

Well, given there were no reviews on the offending PRs, I'd rather just roll back this to the previous behaviour.

@AlexWaygood
Copy link
Member

Okay, I'm not familiar with the history/background here, so I'm probably not the best reviewer for this one 👍

Well, given there were no reviews on the offending PRs, I'd rather just roll back this to the previous behaviour.

Sounds reasonable, but note that some clinic tests are failing on this PR

@erlend-aasland
Copy link
Contributor Author

Sounds reasonable, but note that some clinic tests are failing on this PR

Yeah, I forgot to revert the tests ;)

@ambv ambv merged commit 9d1d4f9 into python:main Jul 5, 2023
@miss-islington
Copy link
Contributor

Thanks @erlend-aasland for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

Sorry, @erlend-aasland and @ambv, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 9d1d4f9c73a71192b22ab52a2eb9278737f98ddb 3.12

@erlend-aasland erlend-aasland deleted the clinic/fix-regression branch July 5, 2023 12:41
@bedevere-bot
Copy link

GH-106452 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jul 5, 2023
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Jul 5, 2023
@erlend-aasland
[3.12] pythongh-64595: Fix regression in file write logic in Argument…
b02430a 
… Clinic (python#106449)

Revert the two commits that introduced the regressions:

 - pythongh-104152
 - pythongh-104507

(cherry picked from commit 9d1d4f9)

Co-authored-by: Erlend Aasland <[email protected]>
erlend-aasland added a commit that referenced this pull request Jul 5, 2023
@erlend-aasland
[3.12] gh-64595: Fix regression in file write logic in Argument Clinic (
b72601e 
#106449) (#106452)

Revert the two commits that introduced the regressions:

 - gh-104152
 - gh-104507

(cherry picked from commit 9d1d4f9)
carljm added a commit to carljm/cpython that referenced this pull request Jul 5, 2023
@carljm
Merge branch 'main' into modulelocals
4c59e51 
* main: (39 commits)
  pythongh-102542 Remove unused bytes object and bytes slicing (python#106433)
  Clarify state of CancelledError in doc (python#106453)
  pythongh-64595: Fix regression in file write logic in Argument Clinic (python#106449)
  pythongh-104683: Rename Lib/test/clinic.test as Lib/test/clinic.test.c (python#106443)
  tp_flags docs: fix indentation (python#106420)
  pythongh-104050: Partially annotate Argument Clinic CLanguage class (python#106437)
  pythongh-106368: Add tests for formatting helpers in Argument Clinic (python#106415)
  pythongh-104050: Annotate Argument Clinic parameter permutation helpers (python#106431)
  pythongh-104050: Annotate toplevel functions in clinic.py (python#106435)
  pythongh-106320: Fix specialize.c compilation by including pycore_pylifecycle.h (python#106434)
  Add some codeowners for `Tools/clinic/` (python#106430)
  pythongh-106217: Truncate the issue body size of `new-bugs-announce-notifier` (python#106423)
  pythongh-61215: Rename `wait_until_any_call` to `wait_until_any_call_with` (python#106414)
  pythongh-106162: array: suppress warning in test_array (python#106404)
  pythongh-106320: Remove _PyInterpreterState_HasFeature() (python#106425)
  pythonGH-106360: Support very basic superblock introspection (python#106422)
  pythongh-106406: Fix _Py_IsInterpreterFinalizing() in _winapi.c (python#106408)
  pythongh-106396: Special-case empty format spec to gen empty JoinedStr node (python#106401)
  pythongh-106368: Add tests for permutation helpers in Argument Clinic (python#106407)
  pythonGH-106008: Fix refleak when peepholing `None` comparisons (python#106367)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ambv ambv

Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@erlend-aasland @AlexWaygood @miss-islington @bedevere-bot @ambv