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

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

Merged
merged 10 commits into from
Apr 19, 2021
+399 −90
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
376900b
Use contextvars from site-packages for thin
dwoz Apr 7, 2021
5e9914b
Add regression test for #59942
dwoz Apr 7, 2021
cab58ff
Add changelog for #59942
dwoz Apr 7, 2021
533d992
Update filemap to include test_py_versions
dwoz Apr 7, 2021
34fb3cf
Fix broken thin tests
dwoz Apr 7, 2021
a82b5ef
Always install the `contextvars` backport, even on Py3.7+
s0undt3ch Apr 7, 2021
cb07027
Use salt-factories to handle the container. Don't override default ro…
s0undt3ch Apr 7, 2021
24e2119
Fix thin tests on windows
dwoz Apr 7, 2021
de52bda
No need to use warn log level here
dwoz Apr 13, 2021
ab8ee22
Fix getsitepackages for old virtualenv versions
dwoz Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/59942.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use contextvars libary from site-packages if it is intalled. Fixes salt ssh for targets with python <=3.6
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ PyYAML
MarkupSafe
requests>=1.0.0
distro>=1.0.1
contextvars; python_version < '3.7'
contextvars
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.5/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ cherrypy==17.4.1
click==7.0 # via geomet
clustershell==1.8.1
contextlib2==0.6.0.post1
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.0
decorator==4.4.2 # via networkx
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.5/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ cherrypy==17.4.1
click==7.1.2 # via geomet
clustershell==1.8.3
contextlib2==0.5.5
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.0
decorator==4.4.2 # via networkx
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.5/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ cherrypy==17.4.1
click==7.1.1 # via geomet
clustershell==1.8.3
contextlib2==0.5.5
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.0
decorator==4.4.2 # via networkx
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.6/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ cherrypy==17.4.1
click==7.0 # via geomet
clustershell==1.8.1
contextlib2==0.6.0.post1
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.6/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ cherrypy==17.4.1
click==7.1.2 # via geomet
clustershell==1.8.3
contextlib2==0.5.5
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.6/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ cherrypy==17.4.1
click==7.1.1 # via geomet
clustershell==1.8.3
contextlib2==0.5.5
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.6/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cherrypy==18.6.0
click==7.1.2 # via geomet
clustershell==1.8.3
colorama==0.4.1 # via pytest
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
cryptography==3.4.6
decorator==4.4.2 # via networkx
distlib==0.3.0 # via virtualenv
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.7/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ click==7.0 # via geomet
clustershell==1.8.1
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.6.0.post1
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -132,6 +133,7 @@ gitdb==4.0.5
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
importlib-metadata==0.23 # via jsonschema, pluggy, pytest, virtualenv
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.7/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ click==7.1.2 # via geomet
clustershell==1.8.3
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.5.5
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -134,6 +135,7 @@ gitdb==4.0.5 # via gitpython
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
importlib-metadata==0.23 # via jsonschema, pluggy, pytest, virtualenv
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.7/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ click==7.1.1 # via geomet
clustershell==1.8.3
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.5.5
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -135,6 +136,7 @@ gitdb==4.0.5 # via gitpython
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
importlib-metadata==0.23 # via jsonschema, pluggy, pytest, virtualenv
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.7/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ cherrypy==18.6.0
click==7.1.2 # via geomet
clustershell==1.8.3
colorama==0.4.1 # via pytest
contextvars==2.4
cryptography==3.4.6
decorator==4.4.2 # via networkx
distlib==0.3.0 # via virtualenv
Expand All @@ -42,6 +43,7 @@ gitdb==4.0.5
gitpython==3.1.13
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
importlib-metadata==0.23 # via jsonschema, pluggy, pytest, virtualenv
iniconfig==1.0.1 # via pytest
ioloop==0.1a0
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.8/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ click==7.0 # via geomet
clustershell==1.8.1
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.6.0.post1
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -132,6 +133,7 @@ gitdb==4.0.5
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
isodate==0.6.0 # via msrest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.8/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ click==7.1.2 # via geomet
clustershell==1.8.3
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.5.5
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -134,6 +135,7 @@ gitdb==4.0.5 # via gitpython
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
isodate==0.6.0 # via msrest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.8/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ click==7.1.1 # via geomet
clustershell==1.8.3
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.5.5
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -135,6 +136,7 @@ gitdb==4.0.5 # via gitpython
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
isodate==0.6.0 # via msrest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.9/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ click==7.0 # via geomet
clustershell==1.8.1
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.6.0.post1
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -132,6 +133,7 @@ gitdb==4.0.5
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
isodate==0.6.0 # via msrest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.9/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ click==7.1.2 # via geomet
clustershell==1.8.3
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.5.5
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -134,6 +135,7 @@ gitdb==4.0.5 # via gitpython
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
isodate==0.6.0 # via msrest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.9/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ click==7.1.1 # via geomet
clustershell==1.8.3
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.5.5
contextvars==2.4
croniter==0.3.29 ; sys_platform != "win32"
cryptography==3.3.2
decorator==4.4.2 # via networkx
Expand All @@ -136,6 +137,7 @@ gitdb==4.0.5 # via gitpython
gitpython==3.1.12
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.15
iniconfig==1.0.1 # via pytest
ipaddress==1.0.22 # via kubernetes
isodate==0.6.0 # via msrest
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.5/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
contextlib2==0.6.0.post1 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
cryptography==3.0
distro==1.5.0
gitdb==4.0.5 # via gitpython
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.5/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.4.1
contextlib2==0.5.5 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
cryptography==3.0 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.5/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.4.1
contextlib2==0.5.5 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
cryptography==3.0 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.6/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
contextlib2==0.6.0.post1 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
cryptography==3.3.2
distro==1.5.0
gitdb==4.0.5 # via gitpython
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.6/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.4.1
contextlib2==0.5.5 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
cryptography==3.3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.6/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.4.1
contextlib2==0.5.5 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
cryptography==3.3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.6/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cffi==1.14.5
chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==18.6.0
contextvars==2.4 ; python_version < "3.7"
contextvars==2.4
cryptography==3.4.6
distro==1.5.0
gitdb==4.0.5 # via gitpython
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.7/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
contextlib2==0.6.0.post1 # via cherrypy
contextvars==2.4
cryptography==3.3.2
distro==1.5.0
gitdb==4.0.5 # via gitpython
gitpython==3.1.12
idna==2.8
immutables==0.15 # via contextvars
jaraco.functools==2.0 # via cheroot, tempora
jinja2==2.10.1
linode-python==1.1.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.7/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.4.1
contextlib2==0.5.5 # via cherrypy
contextvars==2.4
cryptography==3.3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
immutables==0.15 # via contextvars
jaraco.functools==2.0 # via tempora
jinja2==2.10.1
markupsafe==1.1.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.7/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.4.1
contextlib2==0.5.5 # via cherrypy
contextvars==2.4
cryptography==3.3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
immutables==0.15 # via contextvars
jaraco.functools==2.0 # via tempora
jinja2==2.10.1
markupsafe==1.1.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.7/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ cffi==1.14.5
chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==18.6.0
contextvars==2.4
cryptography==3.4.6
distro==1.5.0
gitdb==4.0.5 # via gitpython
gitpython==3.1.13
idna==2.8 # via requests
immutables==0.15 # via contextvars
ioloop==0.1a0
jaraco.classes==3.2.1 # via jaraco.collections
jaraco.collections==3.2.0 # via cherrypy
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.8/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
contextlib2==0.6.0.post1 # via cherrypy
contextvars==2.4
cryptography==3.3.2
distro==1.5.0
gitdb==4.0.5 # via gitpython
gitpython==3.1.12
idna==2.8
immutables==0.15 # via contextvars
jaraco.functools==2.0 # via cheroot, tempora
jinja2==2.10.1
linode-python==1.1.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.8/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.4.1
contextlib2==0.5.5 # via cherrypy
contextvars==2.4
cryptography==3.3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
immutables==0.15 # via contextvars
jaraco.functools==2.0 # via tempora
jinja2==2.10.1
markupsafe==1.1.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.8/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.4.1
contextlib2==0.5.5 # via cherrypy
contextvars==2.4
cryptography==3.3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
immutables==0.15 # via contextvars
jaraco.functools==2.0 # via tempora
jinja2==2.10.1
markupsafe==1.1.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.9/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
contextlib2==0.6.0.post1 # via cherrypy
contextvars==2.4
cryptography==3.3.2
distro==1.5.0
gitdb==4.0.5 # via gitpython
gitpython==3.1.12
idna==2.8
immutables==0.15 # via contextvars
jaraco.functools==2.0 # via cheroot, tempora
jinja2==2.10.1
linode-python==1.1.1
Expand Down
Loading