Skip to content

gh-131277: allow EnvironmentVarGuard to unset more than one environment variable at once#131280

Merged
picnixz merged 4 commits into
python:mainfrom
picnixz:feat/test/environ-guard-131277
Mar 16, 2025
Merged

gh-131277: allow EnvironmentVarGuard to unset more than one environment variable at once#131280
picnixz merged 4 commits into
python:mainfrom
picnixz:feat/test/environ-guard-131277

Conversation

@picnixz

@picnixz picnixz commented Mar 15, 2025 •
edited by github-actions Bot
Loading

Copy link
Copy Markdown
Member

@picnixz picnixz requested review from a team, FFY00, barneygale and hugovk as code owners March 15, 2025 11:49
@bedevere-app bedevere-app Bot mentioned this pull request Mar 15, 2025
Closed
3 tasks
hugovk
hugovk approved these changes Mar 15, 2025
View reviewed changes
Comment thread Lib/test/support/os_helper.py Outdated
@picnixz @hugovk
Update Lib/test/support/os_helper.py
3115a05 
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@picnixz picnixz merged commit 3185e31 into python:main Mar 16, 2025
@picnixz picnixz deleted the feat/test/environ-guard-131277 branch March 16, 2025 13:09
@picnixz

picnixz commented Mar 16, 2025

Copy link
Copy Markdown
Member Author

@hugovk To ease backports, should I backport this? (it's technically a feature but it's a test feature so...)

@hugovk

hugovk commented Mar 16, 2025

Copy link
Copy Markdown
Member

I think so, but let's ask @serhiy-storchaka.

@serhiy-storchaka

serhiy-storchaka commented Mar 17, 2025

Copy link
Copy Markdown
Member

I have no strong opinion. We usually backport test changes to easy future backports (and to easy comparison between developed and maintained versions). But since it is already documented, it would need an extra work to properly document the change. You can no longer use "versionchanged: next".

@picnixz

picnixz commented Mar 17, 2025

Copy link
Copy Markdown
Member Author

You can no longer use "versionchanged: next".

Arf, I didn't think about this. Can we maybe not document it? Technically... it's not breaking anything (it's still backwards compatible) as we're just handling more arguments. So we could say that it's only a public feature in 3.14?

plashchynski pushed a commit to plashchynski/cpython that referenced this pull request Mar 17, 2025
@picnixz @hugovk @plashchynski
pythongh-131277: allow EnvironmentVarGuard to unset more than one e…
c7470ac 
…nvironment variable at once (python#131280)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@serhiy-storchaka

serhiy-storchaka commented Mar 18, 2025

Copy link
Copy Markdown
Member

It is up to you. You are a core dev, you do the work, you decide.

I am +0 for backporting.

@picnixz

picnixz commented Mar 18, 2025

Copy link
Copy Markdown
Member Author

I'll backport this. I don't want to cause un-necessary work for future backports.

@picnixz picnixz added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Mar 18, 2025
@miss-islington-app

miss-islington-app Bot commented Mar 18, 2025

Copy link
Copy Markdown

Thanks @picnixz for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Mar 18, 2025

Copy link
Copy Markdown

Thanks @picnixz for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Mar 18, 2025

Copy link
Copy Markdown

Sorry, @picnixz, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3185e3115c918ec189e16cf9f5b51a13a0146556 3.12

@miss-islington-app

miss-islington-app Bot commented Mar 18, 2025

Copy link
Copy Markdown

Sorry, @picnixz, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3185e3115c918ec189e16cf9f5b51a13a0146556 3.13

@picnixz

picnixz commented Mar 18, 2025

Copy link
Copy Markdown
Member Author

Ah I should do a manual backport as I don't want to expose this.

picnixz added a commit to picnixz/cpython that referenced this pull request Mar 18, 2025
@picnixz @hugovk
pythongh-131277: allow EnvironmentVarGuard to unset more than one e…
df51813 
…nvironment variable at once (python#131280)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@bedevere-app

bedevere-app Bot commented Mar 18, 2025

Copy link
Copy Markdown

GH-131409 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label Mar 18, 2025
picnixz added a commit to picnixz/cpython that referenced this pull request Mar 18, 2025
@picnixz @hugovk
pythongh-131277: allow EnvironmentVarGuard to unset more than one e…
5122348 
…nvironment variable at once (python#131280)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@bedevere-app

bedevere-app Bot commented Mar 18, 2025

Copy link
Copy Markdown

GH-131409 is a backport of this pull request to the 3.13 branch.

@bedevere-app

bedevere-app Bot commented Mar 18, 2025

Copy link
Copy Markdown

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

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Mar 18, 2025
picnixz added a commit that referenced this pull request Mar 18, 2025
@picnixz @hugovk
[3.12] gh-131277: allow EnvironmentVarGuard to unset more than one en…
865bd6d 
…vironment variable at once (GH-131280) (#131410)

(cherry picked from commit 3185e31)

---------

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
picnixz added a commit that referenced this pull request Mar 18, 2025
@picnixz @hugovk
[3.13] gh-131277: allow EnvironmentVarGuard to unset more than one en…
85c2037 
…vironment variable at once (GH-131280) (#131409)

(cherry picked from commit 3185e31)

---------

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hugovk hugovk hugovk approved these changes

@barneygale barneygale Awaiting requested review from barneygale barneygale is a code owner

@FFY00 FFY00 Awaiting requested review from FFY00 FFY00 is a code owner

Assignees

@picnixz picnixz

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@picnixz @hugovk @serhiy-storchaka