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

Loader Contexts #58853

Merged
merged 12 commits into from
Dec 6, 2020
Merged

Loader Contexts #58853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df44efc
Run loaded methods in a context specific to the laoder
dwoz Nov 19, 2020
ada1176
Slow test fixes
dwoz Nov 20, 2020
dab4e96
Use patch_if to clean up tests
dwoz Nov 25, 2020
54d959f
Add more tests and better docstrings
dwoz Nov 26, 2020
ea4d868
Fix test_loader_globals case
dwoz Nov 30, 2020
e703f39
Fix typo
dwoz Dec 1, 2020
dd2232d
Combine isinstance checks
dwoz Dec 1, 2020
af1b9b2
Syntax cleanup
dwoz Dec 1, 2020
d358c8b
Make sure test fails without loader changes
dwoz Dec 1, 2020
df75670
Make sure boto apigateway tests pass under pytest
dwoz Dec 3, 2020
a34cde9
fix pre-commit issues
dwoz Dec 3, 2020
2661472
Fix older pytest runs
dwoz Dec 3, 2020
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 requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ PyYAML
MarkupSafe
requests>=1.0.0
distro>=1.5
contextvars; python_version < '3.7'
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.5/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,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"
croniter==0.3.29
cryptography==3.2
distlib==0.3.0 # via virtualenv
Expand All @@ -44,6 +45,7 @@ gitdb2==2.0.6
gitpython==2.1.15
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.14
importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.3.1 # via virtualenv
iniconfig==1.0.1 # via pytest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.5/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ cheetah3==3.1.0
cheroot==6.5.4
cherrypy==17.3.0
contextlib2==0.5.5
contextvars==2.4 ; python_version < "3.7"
croniter==0.3.29
cryptography==3.2
distlib==0.3.0 # via virtualenv
Expand All @@ -43,6 +44,7 @@ gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
hgtools==8.1.1
idna==2.8
immutables==0.14
importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.5.0 # via virtualenv
iniconfig==1.0.1 # via pytest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.5/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ cheroot==6.5.4
cherrypy==17.3.0
click==7.1.1 # via geomet
contextlib2==0.5.5
contextvars==2.4 ; python_version < "3.7"
croniter==0.3.29
cryptography==3.2
distlib==0.3.0 # via virtualenv
Expand All @@ -128,6 +129,7 @@ gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
hgtools==8.1.1
idna==2.8
immutables==0.14
importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.5.0 # via virtualenv
iniconfig==1.0.1 # via pytest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.5/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ cherrypy==17.4.1
click==7.1.2 # via geomet
colorama==0.4.1 # via pytest
contextlib2==0.6.0.post1
contextvars==2.4 ; python_version < "3.7"
cryptography==3.2
distlib==0.3.0 # via virtualenv
distro==1.5.0
Expand All @@ -40,6 +41,7 @@ gitdb2==2.0.5
gitpython==2.1.10
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.14
importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.5.0 # via virtualenv
iniconfig==1.0.1 # via pytest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.6/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ click==7.0 # via geomet
clustershell==1.8.1
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.6.0.post1
contextvars==2.4 ; python_version < "3.7"
croniter==0.3.29
cryptography==3.2
distlib==0.3.0 # via virtualenv
Expand All @@ -46,6 +47,7 @@ gitdb2==2.0.6
gitpython==2.1.15
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.14
importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.3.1 # via virtualenv
iniconfig==1.0.1 # via pytest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.6/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ cherrypy==17.3.0
ciscoconfparse==1.5.19 # via napalm
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.5.5
contextvars==2.4 ; python_version < "3.7"
croniter==0.3.29
cryptography==3.2
distlib==0.3.0 # via virtualenv
Expand All @@ -45,6 +46,7 @@ gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
hgtools==8.1.1
idna==2.8
immutables==0.14
importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.5.0 # via virtualenv
iniconfig==1.0.1 # via pytest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.6/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ ciscoconfparse==1.5.19 # via napalm
click==7.1.1 # via geomet
colorama==0.4.3 # via ciscoconfparse
contextlib2==0.5.5
contextvars==2.4 ; python_version < "3.7"
croniter==0.3.29
cryptography==3.2
distlib==0.3.0 # via virtualenv
Expand All @@ -130,6 +131,7 @@ gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
hgtools==8.1.1
idna==2.8
immutables==0.14
importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.5.0 # via virtualenv
iniconfig==1.0.1 # via pytest
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.6/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ cherrypy==17.4.1
click==7.1.2 # via geomet
colorama==0.4.1 # via pytest
contextlib2==0.6.0.post1
contextvars==2.4 ; python_version < "3.7"
cryptography==3.2
distlib==0.3.0 # via virtualenv
distro==1.5.0
Expand All @@ -40,6 +41,7 @@ gitdb2==2.0.5
gitpython==2.1.10
google-auth==1.6.3 # via kubernetes
idna==2.8
immutables==0.14
importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.5.0 # via virtualenv
iniconfig==1.0.1 # via pytest
Expand Down
2 changes: 2 additions & 0 deletions 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,11 +12,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 ; python_version < "3.7"
cryptography==3.2
distro==1.5.0
gitdb2==2.0.6 # via gitpython
gitpython==2.1.15
idna==2.8
immutables==0.14 # via contextvars
ipaddress==1.0.22
jaraco.functools==2.0 # via cheroot, tempora
jinja2==2.10.1
Expand Down
2 changes: 2 additions & 0 deletions 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,9 +12,11 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
contextlib2==0.5.5 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
cryptography==3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
immutables==0.14 # 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.5/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
contextlib2==0.5.5 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
cryptography==3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
immutables==0.14 # 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.5/windows.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 ; python_version < "3.7"
cryptography==3.2
distro==1.5.0
gitdb2==2.0.5 # via gitpython
gitpython==2.1.10
idna==2.8
immutables==0.14 # via contextvars
ioloop==0.1a0
ipaddress==1.0.22
jaraco.functools==2.0 # via cheroot, tempora
Expand Down
2 changes: 2 additions & 0 deletions 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,11 +12,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 ; python_version < "3.7"
cryptography==3.2
distro==1.5.0
gitdb2==2.0.6 # via gitpython
gitpython==2.1.15
idna==2.8
immutables==0.14 # via contextvars
ipaddress==1.0.22
jaraco.functools==2.0 # via cheroot, tempora
jinja2==2.10.1
Expand Down
2 changes: 2 additions & 0 deletions 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,9 +12,11 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
contextlib2==0.5.5 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
cryptography==3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
immutables==0.14 # 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.6/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ chardet==3.0.4 # via requests
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
contextlib2==0.5.5 # via cherrypy
contextvars==2.4 ; python_version < "3.7"
cryptography==3.2 # via pyopenssl
distro==1.5.0
idna==2.8 # via requests
immutables==0.14 # 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.6/windows.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 ; python_version < "3.7"
cryptography==3.2
distro==1.5.0
gitdb2==2.0.5 # via gitpython
gitpython==2.1.10
idna==2.8
immutables==0.14 # via contextvars
ioloop==0.1a0
ipaddress==1.0.22
jaraco.functools==2.0 # via cheroot, tempora
Expand Down
2 changes: 1 addition & 1 deletion salt/cli/caller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def call(self):
sys.stderr.write(trace)
sys.exit(salt.defaults.exitcodes.EX_GENERIC)
try:
retcode = sys.modules[func.__module__].__context__.get("retcode", 0)
retcode = self.minion.executors.pack["__context__"].get("retcode", 0)
except AttributeError:
retcode = salt.defaults.exitcodes.EX_GENERIC

Expand Down
Loading