Commit graph

106173 commits

Author SHA1 Message Date
Daniel Wozniak
6ed2bd8c80
Merge pull request #56601 from s0undt3ch/hotfix/drop-py2-builds
Drop static requirements for Sodium unsupported versions
2020-04-10 13:38:57 -07:00
Daniel Wozniak
98d5f7f295
Merge pull request #56586 from waynew/black-with-any-salt
Pre-commit fixes
2020-04-10 13:34:25 -07:00
Wayne Werner
7d42fee94a
Fix toml file 2020-04-10 14:52:32 -05:00
Daniel Wozniak
50a7ac0b2d
Merge pull request #56485 from sagetherage/master
Update issue and PR templates, add config, stale bot not
2020-04-10 10:01:09 -07:00
Wayne Werner
cf0c6c5d65
Back to .isort.cfg
At least until version 5 of isort is actually released.
2020-04-10 09:10:05 -05:00
Pedro Algarvio
68c90783f8
Drop static requirements for Sodium unsupported versions 2020-04-10 10:04:51 +01:00
Wayne Werner
35c4d92bc6
Also install isort[pyproject] for toml dependency 2020-04-09 15:51:15 -05:00
Wayne Werner
a8ef59e76f
Fix pre-commit excludes
When pre-commit provides paths to isort/black, their default excludes
are ignored. So we have to tell pre-commit to *also* exclude black and
isort excludes.
2020-04-09 14:25:01 -05:00
Wayne Werner
7ed3111efc
Set default language version 2020-04-09 14:25:01 -05:00
Wayne Werner
1b88d1816d
Remove black py language version
This is not, strictly speaking, necessary. Removing the language version
allows use of one's default supported python (3.6+).
2020-04-09 14:25:01 -05:00
Sage the Rage
d6adf60a6c
Merge branch 'master' into master 2020-04-09 10:12:59 -07:00
Daniel Wozniak
6258f6b61b
Merge pull request #56363 from s0undt3ch/hotfix/requirements
Upgrade `psutil` to v5.6.6 because of CVE-2019-18874
2020-04-09 09:48:43 -07:00
Daniel Wozniak
22ceb603e9
Merge pull request #56350 from s0undt3ch/hotfix/libnacl
Update `libnacl` to 1.7.1
2020-04-09 09:48:27 -07:00
Daniel Wozniak
8ffea8fc32
Merge pull request #56380 from s0undt3ch/hotfix/pip-constrains-fix
Use the right assert methods
2020-04-09 09:43:25 -07:00
Daniel Wozniak
a36d417c22
Merge pull request #56578 from s0undt3ch/hotfix/pre-commit
Add pre-commit Jenkins job
2020-04-09 09:42:28 -07:00
Daniel Wozniak
23f5511b27
Merge pull request #56594 from s0undt3ch/hotfix/coverage-reporting
Disable codecov commit status
2020-04-09 08:30:43 -07:00
Pedro Algarvio
4c9a10265c
Disable codecov commit status 2020-04-09 06:20:05 +01:00
Pedro Algarvio
ed9b1cc399
Add pre-commit Jenkins job 2020-04-08 18:12:32 +01:00
Sage the Rage
8bf372d4c4
Merge branch 'master' into master 2020-04-07 15:07:49 -07:00
Daniel Wozniak
94c8ca527c
Merge pull request #56459 from oeuftete/add-grains-cache-exp-doc
Add grains_cache_expiration to minion conf doc
2020-04-07 10:07:18 -07:00
Daniel Wozniak
0cd706ccb2
Merge pull request #56520 from simonflood/patch-2
Fixed typo in requisites.rst
2020-04-07 10:06:08 -07:00
Daniel Wozniak
d9919f3436
Merge pull request #56518 from simonflood/patch-1
Fixed typo in requisites.rst
2020-04-07 10:05:27 -07:00
Sage the Rage
da5b9c32f0
Merge branch 'master' into master 2020-04-07 09:01:15 -07:00
Dmitry Kuzmenko
d035a8c922
Merge branch 'master' into hotfix/pip-constrains-fix 2020-04-07 17:38:40 +03:00
Dmitry Kuzmenko
96370ee000
Merge branch 'master' into patch-2 2020-04-07 03:43:33 +03:00
Dmitry Kuzmenko
932ded480e
Merge branch 'master' into patch-1 2020-04-07 03:43:01 +03:00
Daniel Wozniak
a670b4ae72
Merge pull request #55765 from waynew/blacken-salt
Blacken salt (Implements SEP 15)
2020-04-06 16:45:58 -07:00
Sage the Rage
78e0c4fe4b
Update .github/PULL_REQUEST_TEMPLATE.md
Co-Authored-By: Wayne Werner <waynejwerner@gmail.com>
2020-04-06 15:34:10 -07:00
Dmitry Kuzmenko
2593504b3d
Merge branch 'master' into hotfix/pip-constrains-fix 2020-04-06 21:18:53 +03:00
Sage the Rage
28eb800c1d
update pr_temp master in URL-2
update PR template to include the correct URL to be master not latest
2020-04-03 14:39:08 -07:00
Sage the Rage
dacb715ae0
update stale no close
update configuration to not close issues
2020-04-03 14:26:46 -07:00
Sage the Rage
5c83219b45
add docs and changelog
add docs and changelog question to PR template
2020-04-03 14:25:56 -07:00
Sage the Rage
ebcabd5ef9
update bug_report-1
Make Versions Report section collapse
2020-04-03 14:24:38 -07:00
Sage the Rage
b1a93066ee
Merge branch 'master' into master 2020-04-03 14:13:54 -07:00
Wayne Werner
fdbd555857
Add Blacken Salt to git-blame-ignore-revs 2020-04-03 13:06:34 -05:00
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05:00
Simon Flood
28e7609fb2
Fixed typo in requisites.rst
(second section header) runas -> listen
2020-04-03 16:30:58 +01:00
Simon Flood
8caf781c7c
Fixed typo in requisites.rst
Glog -> Glob
2020-04-03 14:26:42 +01:00
Wayne Werner
c1baa329c6
Add black and isort to precommit
E203 is *not* pep8 compliant, pylint.
2020-04-03 08:10:58 -05:00
Dmitry Kuzmenko
3222fbf7b2
Merge branch 'master' into add-grains-cache-exp-doc 2020-04-03 05:27:24 +03:00
Pedro Algarvio
7fc0d5460f
Upgrade psutil to v5.6.6 because of CVE-2019-18874
https://github.com/advisories/GHSA-qfc5-mcwq-26q8
2020-04-01 19:51:10 +01:00
Pedro Algarvio
489155feeb
Update libnacl to 1.7.1
```
Failed to import utils nacl, this is due most likely to a syntax error:
20:27:00         Traceback (most recent call last):
20:27:00           File "/tmp/kitchen/testing/salt/loader.py", line 1607, in _load_module
20:27:00             mod = imp.load_module(mod_namespace, fn_, fpath, desc)
20:27:00           File "/tmp/kitchen/testing/salt/utils/nacl.py", line 26, in <module>
20:27:00             import libnacl.secret
20:27:00           File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-zeromq/local/lib/python2.7/site-packages/libnacl/__init__.py", line 119, in <module>
20:27:00             crypto_box_SEEDBYTES = nacl.crypto_box_seedbytes()
20:27:00           File "/usr/lib64/python2.7/ctypes/__init__.py", line 374, in __getattr__
20:27:00             func = self.__getitem__(name)
20:27:00           File "/usr/lib64/python2.7/ctypes/__init__.py", line 379, in __getitem__
20:27:00             func = self._FuncPtr((name_or_ordinal, self))
20:27:00         AttributeError: /usr/lib64/libsodium.so.4: undefined symbol: crypto_box_seedbytes

20:27:13         20:27:12,714 [salt.loader                                               :1624][ERROR   ] Failed to import module nacl, this is due most likely to a syntax error:
20:27:13         Traceback (most recent call last):
20:27:13           File "/tmp/kitchen/testing/salt/loader.py", line 1607, in _load_module
20:27:13             mod = imp.load_module(mod_namespace, fn_, fpath, desc)
20:27:13           File "/tmp/kitchen/testing/salt/modules/nacl.py", line 157, in <module>
20:27:13             import salt.utils.nacl
20:27:13           File "/tmp/kitchen/testing/salt/utils/nacl.py", line 26, in <module>
20:27:13             import libnacl.secret
20:27:13           File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-zeromq/local/lib/python2.7/site-packages/libnacl/__init__.py", line 119, in <module>
20:27:13             crypto_box_SEEDBYTES = nacl.crypto_box_seedbytes()
20:27:13           File "/usr/lib64/python2.7/ctypes/__init__.py", line 374, in __getattr__
20:27:13             func = self.__getitem__(name)
20:27:13           File "/usr/lib64/python2.7/ctypes/__init__.py", line 379, in __getitem__
20:27:13             func = self._FuncPtr((name_or_ordinal, self))
20:27:13         AttributeError: /usr/lib64/libsodium.so.4: undefined symbol: crypto_box_seedbytes

20:27:15         20:27:15,353 [salt.loader                                               :1624][ERROR   ] Failed to import utils nacl, this is due most likely to a syntax error:
20:27:15         Traceback (most recent call last):
20:27:15           File "/tmp/kitchen/testing/salt/loader.py", line 1607, in _load_module
20:27:15             mod = imp.load_module(mod_namespace, fn_, fpath, desc)
20:27:15           File "/tmp/kitchen/testing/salt/utils/nacl.py", line 26, in <module>
20:27:15             import libnacl.secret
20:27:15           File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-zeromq/local/lib/python2.7/site-packages/libnacl/__init__.py", line 119, in <module>
20:27:15             crypto_box_SEEDBYTES = nacl.crypto_box_seedbytes()
20:27:15           File "/usr/lib64/python2.7/ctypes/__init__.py", line 374, in __getattr__
20:27:15             func = self.__getitem__(name)
20:27:15           File "/usr/lib64/python2.7/ctypes/__init__.py", line 379, in __getitem__
20:27:15             func = self._FuncPtr((name_or_ordinal, self))
20:27:15         AttributeError: /usr/lib64/libsodium.so.4: undefined symbol: crypto_box_seedbytes
```
2020-04-01 19:50:43 +01:00
Daniel Wozniak
cdca5aafe0
Merge pull request #56492 from s0undt3ch/hotfix/drop-py2-builds
Remove Py2 Pipelines
2020-04-01 10:57:10 -07:00
Pedro Algarvio
42c63f2284
Remove Py2 Pipelines 2020-04-01 16:12:00 +01:00
Sage the Rage
7e970eb621
Update feature_request temp
Added wording that if this is an addition or big change to use the SEP process and link
2020-03-31 13:21:18 -07:00
Sage the Rage
2f80821bb9
Update config to include security
Added security email for contact links
2020-03-31 13:18:45 -07:00
Sage the Rage
76e94b55f9
Update .github/ISSUE_TEMPLATE/config.yml
fix misspelling

Co-Authored-By: Wayne Werner <waynejwerner@gmail.com>
2020-03-31 07:58:34 -07:00
Sage
23e56a4fba
Merge branch 'master' of github.com:sagetherage/salt 2020-03-30 19:43:27 -07:00
Sage
de71aa8f66
Signed commit 2020-03-30 19:42:39 -07:00
Sage the Rage
2a6e5e8151
Merge pull request #3 from sagetherage/sagetherage-PR-temp-syntax
Update PR template
2020-03-30 16:31:41 -07:00