Commit Graph

95682 Commits

Author SHA1 Message Date
Benjamin Drung
e6cf3c4a94 Do not mock json when building the documentation
Building the documentation on Debian unstable with Python 3.7 fails:

```
debian-unstable$ HTML_THEME=saltstack make -C doc html
make: Entering directory 'doc'
No need to update translations. Skipping...
sphinx-build -b html -d _build/doctrees    . _build/html
Running Sphinx v1.7.9
loading translations [en]... done

Exception occurred:
  File "/usr/lib/python3/dist-packages/sphinx/util/jsonimpl.py", line 22, in <module>
    class SphinxJSONEncoder(json.JSONEncoder):
TypeError: __mro_entries__ must return a tuple
The full traceback has been saved in /tmp/sphinx-err-wzl9_n0k.log, if you want to report the issue to the developers.
Please also report this if it was a user error, so that a better error message can be provided next time.
A bug report can be filed in the tracker at <https://github.com/sphinx-doc/sphinx/issues>. Thanks!
make: *** [Makefile:72: html] Error 2
make: Leaving directory 'doc'
debian-unstable$ cat /tmp/sphinx-err-wzl9_n0k.log

Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/sphinx/cmdline.py", line 303, in main
    args.warningiserror, args.tags, args.verbosity, args.jobs)
  File "/usr/lib/python3/dist-packages/sphinx/application.py", line 187, in __init__
    self.setup_extension(extension)
  File "/usr/lib/python3/dist-packages/sphinx/application.py", line 411, in setup_extension
    self.registry.load_extension(self, extname)
  File "/usr/lib/python3/dist-packages/sphinx/registry.py", line 315, in load_extension
    mod = __import__(extname, None, None, ['setup'])
  File "/usr/lib/python3/dist-packages/sphinx/builders/applehelp.py", line 20, in <module>
    from sphinx.builders.html import StandaloneHTMLBuilder
  File "/usr/lib/python3/dist-packages/sphinx/builders/html.py", line 43, in <module>
    from sphinx.util import jsonimpl, logging, status_iterator
  File "/usr/lib/python3/dist-packages/sphinx/util/jsonimpl.py", line 22, in <module>
    class SphinxJSONEncoder(json.JSONEncoder):
TypeError: __mro_entries__ must return a tuple
```

The json module is a standard module. I is always present. So do not mock it.

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2018-12-19 13:27:54 +01:00
Cédric Bosdonnat
4acaf459b4 Fix sphynx error about tornado.version_info
This is fix errors like the following when building docs:

WARNING: autodoc: failed to import module 'salt.states.saltmod'; the following exception was raised:
Traceback (most recent call last):
  File "/public/src/salt/env/lib/python3.6/site-packages/sphinx/ext/autodoc/importer.py", line 140, in import_module
    __import__(modname)
  File "/public/src/salt/salt/states/saltmod.py", line 36, in <module>
    import salt.output
  File "/public/src/salt/salt/output/__init__.py", line 19, in <module>
    import salt.loader
  File "/public/src/salt/salt/loader.py", line 23, in <module>
    import salt.config
  File "/public/src/salt/salt/config/__init__.py", line 27, in <module>
    import salt.utils.network
  File "/public/src/salt/salt/utils/network.py", line 35, in <module>
    import salt.utils.zeromq
  File "/public/src/salt/salt/utils/zeromq.py", line 39, in <module>
    if tornado.version_info < (5,):
TypeError: '<' not supported between instances of 'Mock' and 'tuple'

(cherry picked from commit 8199700fdb)
2018-12-19 12:13:09 +01:00
Thomas S Hatch
f4e6b88ae4
Merge pull request #50906 from garethgreenaway/50892_archive_extracted_source_hash_case_sensitive
[2018.3] Ensure source_hash returned from get_source_sum is lowercase.
2018-12-18 21:22:22 -07:00
Gareth J. Greenaway
bcf8f06aa4
fixing lint 2018-12-18 16:48:14 -08:00
Gareth J. Greenaway
543ec7bc79
Ensure source_hash returned from get_source_sum is lowercase. 2018-12-18 16:51:26 -07:00
Gareth J. Greenaway
b95b44fa90
Merge pull request #50867 from Ch3LL/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-12-14 13:32:22 -08:00
Ch3LL
512293fd93
Remove dunder_dictionaries.rst. Was added to modules/developing.rst 2018-12-14 12:55:39 -05:00
Ch3LL
89b4e096db
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/topics/development/dunder_dictionaries.rst
  - salt/grains/core.py
  - salt/netapi/rest_tornado/saltnado.py
2018-12-14 11:15:48 -05:00
Thomas S Hatch
858cfac113
Merge pull request #50863 from 5uper5hoot/fix-issue-50848
Unpack exception args in python3 compatible way.
2018-12-14 08:36:14 -07:00
Thomas S Hatch
216fa14fee
Merge pull request #50859 from garethgreenaway/50850_python_key_cache_file_binary
[2018.3] Fixes for key_cache and python3
2018-12-13 16:57:06 -07:00
Peter Schutt
c90d2019c8 Unpack exception args in python3 compatible way.
Fixes #50848
2018-12-14 10:12:26 +11:00
Gareth J. Greenaway
ebc9a01b38
When reading and writing the key cache file, when using Python3, ensuring the file is read & written in binary mode. 2018-12-13 13:09:13 -08:00
Mike Place
e28b2baf31
Merge pull request #50752 from kstreee/fix-memory-leak
Fixes a memory leak which is caused by un-cleared stream connections.
2018-12-13 09:41:59 -07:00
Mike Place
6b45aad5e7
Merge pull request #50828 from twangboy/fix_lgpo
Fix issues with lgpo state and util
2018-12-13 09:37:32 -07:00
Mike Place
1f57602043
Merge pull request #50837 from Ch3LL/pyren_doc
Clarify py render docs when data context is available
2018-12-13 09:37:14 -07:00
Mike Place
fdff67594c
Merge pull request #50844 from twangboy/fix_grains
Fix grains for future windows releases
2018-12-13 09:35:26 -07:00
Gareth J. Greenaway
05baa95e59
Merge branch '2018.3' into fix_lgpo 2018-12-12 13:23:12 -08:00
Daniel Wozniak
6ea059d308
Merge pull request #50843 from bdrung/fix-tests
Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi
2018-12-12 13:36:31 -07:00
twangboy
473f4d7a24
Fix some unrelated lint 2018-12-12 13:19:01 -07:00
twangboy
fd1a0726aa
Fix grains for future windows releases 2018-12-12 13:02:23 -07:00
Daniel Wozniak
14d7d1d68b
Merge pull request #50839 from terminalmage/issue50829
Fix UnicodeDecodeError in ps module
2018-12-12 12:59:11 -07:00
Benjamin Drung
0d00ae4f8e Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi
If the `pyvmomi` library is missing, all tests from the
tests.unit.modules.RemoveCapacityFromDiskgroupTestCase will fail:

```
ERROR: test__get_proxy_target_call
(unit.modules.test_vsphere.RemoveCapacityFromDiskgroupTestCase)
[CPU:0.0%|MEM:35.1%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "salt/utils/vmware.py", line 485, in disconnect
    Disconnect(service_instance)
NameError: name 'Disconnect' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "salt/modules/vsphere.py", line 381, in _gets_service_instance_via_proxy
    salt.utils.vmware.disconnect(local_service_instance)
  File "salt/utils/vmware.py", line 486, in disconnect
    except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "salt/utils/vmware.py", line 485, in disconnect
    Disconnect(service_instance)
NameError: name 'Disconnect' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "tests/unit/modules/test_vsphere.py", line 1568, in test__get_proxy_target_call
    capacity_disk_ids=['fake_disk1', 'fake_disk2'])
  File "salt/modules/vsphere.py", line 295, in __supports_proxies
    return fn(*args, **salt.utils.args.clean_kwargs(**kwargs))
  File "salt/modules/vsphere.py", line 386, in _gets_service_instance_via_proxy
    salt.utils.vmware.disconnect(local_service_instance)
  File "/home/bdrung/projects/salt/debian/salt/utils/vmware.py", line 486, in disconnect
    except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2018-12-12 20:21:49 +01:00
Erik Johnson
3a3d9b7d3e
Ensure that unicode types returned from compatibility funcs 2018-12-12 11:41:43 -06:00
Erik Johnson
1a00abc5f6
Add unit test for _get_proc_cmdline 2018-12-12 11:41:18 -06:00
Erik Johnson
9eaa2edfe3
Remove extraneous comments 2018-12-12 11:11:12 -06:00
Mike Place
264a04292d
Merge pull request #50653 from lexvella/2018.3
Check file_mode in file.directory and _check_directory
2018-12-12 09:30:51 -07:00
twangboy
1233e2b480
Fix some lint 2018-12-12 09:10:43 -07:00
Erik Johnson
b855fd9e7c
Fix misspelling in comment 2018-12-12 09:55:08 -06:00
Ch3LL
a873019a57
Clarify py render docs when data context is available 2018-12-12 10:31:57 -05:00
twangboy
56c0e55581
Fix issues with lgpo state and util
Fix py3 issues in win_lgpo_netsh
Make the state case insensitive for policy lookups
2018-12-11 16:49:39 -07:00
Mike Place
a8ad17aaa4
Merge pull request #50823 from terminalmage/issue45026
salt.modules.mysql: Decode fetch results before making string comparisons
2018-12-11 14:04:40 -07:00
Erik Johnson
ec8e116f7e
Decode fetch results before making string comparisons 2018-12-11 13:58:15 -06:00
Megan Wilhite
e31e731697
Merge pull request #50817 from dubb-b/2018.3
Adding git 'v' to the bootstrap options
2018-12-11 12:28:09 -05:00
Brett Benassi
48fc01fb13
Adding git 'v' to the bootstrap options 2018-12-11 10:24:44 -07:00
Gareth J. Greenaway
32dfabab50
Merge pull request #50816 from dubb-b/2017.7
Pinning bootstrap to the tagged version of salt.
2018-12-11 09:20:01 -08:00
Brett Benassi
dc7ff48822
Pinning bootstrap to the tagged version of salt. 2018-12-11 10:09:35 -07:00
Daniel Wozniak
9b6b39ce49
Merge pull request #50780 from twangboy/lgpo_netsh
Add netsh mechanism in the LGPO module
2018-12-10 15:09:19 -07:00
twangboy
5eea728879
Fix some lint 2018-12-10 14:05:48 -07:00
Jenkins
f077783cbd
Add some tests 2018-12-10 13:43:54 -07:00
twangboy
2dde12add3
Fix one more lint item 2018-12-10 13:43:53 -07:00
twangboy
c55b7b4343
Fix some lint 2018-12-10 13:43:53 -07:00
twangboy
1247598f28
Add more policies
Adds more policies
Fixes bug in netsh salt util
Uses __context__ to speed things up
Fixes bug in the state where it was reporting changes when no changes
occurred
2018-12-10 13:43:53 -07:00
twangboy
b2b97959d0
Fix overly long lines 2018-12-10 13:43:53 -07:00
twangboy
f18d1aa890
Add additional policies that use netsh 2018-12-10 13:43:52 -07:00
twangboy
cb50648715
Add versionadded tags 2018-12-10 13:43:52 -07:00
twangboy
00cbf26d5e
Add the netsh mechanism to the lgpo module
Creates a new salt util for netsh and lgpo
Adds the netsh mechanism to the lgpo module
Adds additional functions to the firewall module
2018-12-10 13:43:39 -07:00
Mike Place
035129646e
Merge pull request #50783 from sathieu/gitfs_stalerefs_unicode
gitfs/git_pillar: Fix UnicodeDecodeError while cleaning stale refs
2018-12-10 13:34:52 -07:00
Mike Place
b1e5f3f887
Merge pull request #50709 from mattLLVW/service_unmask
service.running unmask option
2018-12-10 12:13:31 -07:00
Mike Place
e4e9563be1
Merge pull request #50633 from astronouth7303/loader-docs
Loader docs
2018-12-10 11:14:46 -07:00
Mike Place
deadf9c2d0
Merge pull request #50765 from ClaudiuPID/fix-icinga2-cert-path
Fix icinga2 cert path
2018-12-10 11:10:23 -07:00