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

[2018.3] Merge forward from 2017.7 to 2018.3 #51577

Merged
merged 46 commits into from Feb 13, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 11, 2019

Merge branch '2017.7' into merge-2017.7

Conflicts:

  • salt/modules/pillar.py
  • salt/states/pip_state.py
  • salt/utils/data.py
  • tests/unit/modules/inspectlib/test_fsdb.py
  • tests/unit/output/test_json_out.py
  • tests/unit/test_test_module_names.py
astronouth7303 and others added 30 commits Jan 17, 2019
[2017.7] Allow running runtests.py using tox
We need to handle python_version filters in requirement files in order
to install cleanly using pip
…globals

Document the client-defined dunders
Use gems.github.com no longer exists, use gemcutter.org
Add testing path to run_script commands
…onfig_2017
dwoz and others added 11 commits Jan 30, 2019
Cloud provider and profile configs are merged [2017.7]
Handle pipenv like version restrictions
Erik Johnson
Fix raise 2017.7
Backport #50963 to 2017.7
 Conflicts:
	salt/modules/pillar.py
	salt/states/pip_state.py
	salt/utils/data.py
	tests/unit/modules/inspectlib/test_fsdb.py
	tests/unit/output/test_json_out.py
	tests/unit/test_test_module_names.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Feb 11, 2019
@codecov

This comment has been minimized.

Copy link

commented Feb 11, 2019

Codecov Report

Merging #51577 into 2018.3 will decrease coverage by 18.95%.
The diff coverage is 55.55%.

Impacted file tree graph

@@             Coverage Diff             @@
##           2018.3   #51577       +/-   ##
===========================================
- Coverage   48.94%   29.99%   -18.96%     
===========================================
  Files        1511     1358      -153     
  Lines      256892   228680    -28212     
  Branches    55644    48647     -6997     
===========================================
- Hits       125734    68590    -57144     
- Misses     130866   151494    +20628     
- Partials      292     8596     +8304
Flag Coverage Δ
#arch ?
#centos6 29.99% <55.55%> (-2.24%) ⬇️
#centos7 ?
#debian8 ?
#debian9 ?
#fedora28 ?
#fedora29 ?
#m2crypto ?
#opensuse42 ?
#proxy ?
#py2 29.99% <55.55%> (-2.61%) ⬇️
#py3 ?
#pycryptodomex ?
#tornado ?
#transport ?
#ubuntu1404 ?
#ubuntu1604 ?
#ubuntu1804 ?
#windows2019 ?
Impacted Files Coverage Δ
salt/client/mixins.py 43.63% <ø> (-8.49%) ⬇️
salt/modules/win_dsc.py 8.64% <0%> (-24.69%) ⬇️
salt/cloud/__init__.py 15.35% <12.5%> (-0.12%) ⬇️
salt/states/pip_state.py 40.44% <37.5%> (-16.46%) ⬇️
salt/utils/data.py 62.22% <62.22%> (-26.6%) ⬇️
salt/modules/pillar.py 50.86% <66.66%> (-14.98%) ⬇️
salt/output/nested.py 91.66% <85.71%> (+8.53%) ⬆️
salt/utils/validate/__init__.py 0% <0%> (-100%) ⬇️
salt/executors/__init__.py 0% <0%> (-100%) ⬇️
salt/tops/__init__.py 0% <0%> (-100%) ⬇️
... and 1469 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f7d50b1...f9d6828. Read the comment docs.

1 similar comment
@codecov

This comment has been minimized.

Copy link

commented Feb 11, 2019

Codecov Report

Merging #51577 into 2018.3 will decrease coverage by 18.95%.
The diff coverage is 55.55%.

Impacted file tree graph

@@             Coverage Diff             @@
##           2018.3   #51577       +/-   ##
===========================================
- Coverage   48.94%   29.99%   -18.96%     
===========================================
  Files        1511     1358      -153     
  Lines      256892   228680    -28212     
  Branches    55644    48647     -6997     
===========================================
- Hits       125734    68590    -57144     
- Misses     130866   151494    +20628     
- Partials      292     8596     +8304
Flag Coverage Δ
#arch ?
#centos6 29.99% <55.55%> (-2.24%) ⬇️
#centos7 ?
#debian8 ?
#debian9 ?
#fedora28 ?
#fedora29 ?
#m2crypto ?
#opensuse42 ?
#proxy ?
#py2 29.99% <55.55%> (-2.61%) ⬇️
#py3 ?
#pycryptodomex ?
#tornado ?
#transport ?
#ubuntu1404 ?
#ubuntu1604 ?
#ubuntu1804 ?
#windows2019 ?
Impacted Files Coverage Δ
salt/client/mixins.py 43.63% <ø> (-8.49%) ⬇️
salt/modules/win_dsc.py 8.64% <0%> (-24.69%) ⬇️
salt/cloud/__init__.py 15.35% <12.5%> (-0.12%) ⬇️
salt/states/pip_state.py 40.44% <37.5%> (-16.46%) ⬇️
salt/utils/data.py 62.22% <62.22%> (-26.6%) ⬇️
salt/modules/pillar.py 50.86% <66.66%> (-14.98%) ⬇️
salt/output/nested.py 91.66% <85.71%> (+8.53%) ⬆️
salt/utils/validate/__init__.py 0% <0%> (-100%) ⬇️
salt/executors/__init__.py 0% <0%> (-100%) ⬇️
salt/tops/__init__.py 0% <0%> (-100%) ⬇️
... and 1469 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f7d50b1...f9d6828. Read the comment docs.

salt/modules/pillar.py Outdated Show resolved Hide resolved
salt/output/nested.py Outdated Show resolved Hide resolved
@dwoz dwoz merged commit e3d5fbe into saltstack:2018.3 Feb 13, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2017.7 branch Feb 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.