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.

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

[freeze] Add contextvars from site-packages to thin tarball #59981

Merged
merged 10 commits into from
Apr 19, 2021

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented Apr 7, 2021

What does this PR do?

Adds contextvars package from site-packages to thin tarball instead of python's builtin contextvars if the contextvars package from pypi is installed. This makes salt-ssh work with targets that have python <3.7

What issues does this PR fix or reference?

Fixes: #59942

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

@dwoz dwoz requested review from s0undt3ch and a team as code owners April 7, 2021 00:57
@dwoz dwoz added 3003.1 Aluminium Release Post Mg and Pre Si point-release minor release and removed 3003.1 labels Apr 7, 2021
@dwoz dwoz force-pushed the issue/freeze/59942 branch 5 times, most recently from 1b67940 to 9dbee0f Compare April 8, 2021 23:43
salt/utils/thin.py Outdated Show resolved Hide resolved
dwoz and others added 9 commits April 13, 2021 16:19
If a contextvars package exists one of the site-packages locations use
it for the generated thin tarball. This overrides python's builtin
contextvars and allows salt-ssh to work with python <=3.6 even when the
master's python is >3.6 (Fixes saltstack#59942)
Without this change, salt-ssh cannot target systems with Python <= 3.6
Ch3LL
Ch3LL previously approved these changes Apr 14, 2021
@Ch3LL
Copy link
Contributor

Ch3LL commented Apr 14, 2021

looks good other than some test failures on mac

@dwoz
Copy link
Contributor Author

dwoz commented Apr 15, 2021

re-run macos centos

@Ch3LL Ch3LL merged commit 4013eeb into saltstack:freeze Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Aluminium Release Post Mg and Pre Si has-failing-test point-release minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants