Commit graph

1165 commits

Author SHA1 Message Date
David Murphy
66bbcad197 Added syndic to log rotation 2020-05-07 13:52:05 -07:00
Pedro Algarvio
e4c3777faf enum34 is no longer a requirement now that Sodium is Py >= 3.5
Fixes #56603
2020-05-06 15:44:01 -07:00
Markus Kramer
6786093ed4 Reverted change for testing 2020-05-05 17:30:15 -07:00
Markus Kramer
390bd1cee4 Uninstall msi-installed salt 2020-05-05 17:30:15 -07:00
twangboy
52a38848f2 Put windows deps in win_req.txt 2020-05-05 14:29:45 -07:00
Charles McMarrow
9875424a9e Update req_win.txt 2020-05-05 14:29:45 -07:00
Charles McMarrow
99f3097bf2 Update req.txt 2020-05-05 14:29:45 -07:00
twangboy
dc4e8dc8a9 Update to python 3.7 - Remove Py2 2020-05-05 14:29:45 -07:00
twangboy
628b15d686 Roll back Python 3.7 changes 2020-05-04 01:19:18 -07:00
twangboy
1447fb595e Add distro to req.txt 2020-05-04 01:19:18 -07:00
twangboy
a3cb026164 Add removal of Python Launcher 2020-05-04 01:19:18 -07:00
twangboy
73e18a9096 Update to python 3.7 - Remove Py2 2020-05-04 01:19:18 -07:00
Elias Probst
34fb50b134
Fix typos (the the > the) (#52711)
* Fix typos (`the the` > `the`)

It looks like humans aren't only very bad at recognizing a double `the` in a sentence when reading [1], but they're also very good at sneaking them in unintentionally without noticing.

Fix this by running:
```
ack --ignore-dir=doc/man --ignore-dir=doc/topics/releases -i 'the the\W' -l | xargs sed -i 's|the the\(\W\)|the\1|g'
```

[1] Eye movements and word skipping during reading: Effects of word length and predictability: https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3543826/

* Blacken changed files

* Blacken changed files

* Re-add unintentional delete

* Bad merge fix

* Fix broken docstring

* Another try

* pre-commit should pass now?

Co-authored-by: Daniel A. Wozniak <dwozniak@saltstack.com>
Co-authored-by: Wayne Werner <wwerner@saltstack.com>
2020-04-28 10:02:41 -07:00
Pedro Algarvio
396499c18a Upgrade PyZMQ to 19.0.0 for Py >= 3.8 2020-04-26 20:47:17 -07:00
Daniel Wozniak
12c70d2196
Merge pull request #56871 from s0undt3ch/hotfix/requirements
Update requirements. We no longer support Python 2.
2020-04-23 23:07:22 -07:00
Pedro Algarvio
04f6159d31
Update requirements. We no longer support Python 2. 2020-04-24 01:07:13 +01:00
Pedro Algarvio
a24f6fe7e7
Default crypto library to pycryptodomex 2020-04-23 09:32:34 +01:00
Pedro Algarvio
cc8c3f09c6
Update static requirements to include Py3.8 and Py3.9 (except windows)
Windows required package pywin32 doesn't state that it support any
python version above Py3.7
2020-04-22 12:26:21 +01:00
Pedro Algarvio
7443ad3bed
Fix static requirements 2020-04-13 18:53:05 +01:00
Rino Pascual
212b188861 Add salt-api log file to log rotation 2020-04-11 23:07:09 -07:00
twangboy
6636b18ad4 Update salt icon 2020-04-11 03:18:52 -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
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05: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
Pedro Algarvio
d9791c393f
Revert and fix windows requirements 2020-03-26 17:20:21 +00:00
Pedro Algarvio
4b573c1c94
Revert "Fix win deps"
This reverts commit 6c83beeb9e.
2020-03-26 17:20:11 +00:00
twangboy
8fdf52a243
Update gitpython to 2.1.15 2020-03-24 01:38:53 +00:00
twangboy
afcedc5232
Remove --ignore-installed 2020-03-23 17:36:24 -06:00
Pedro Algarvio
e6cc2a6192
Separate pyobjc requirements 2020-03-23 22:52:24 +00:00
Pedro Algarvio
262ad2e98a
Compile static requirements 2020-03-23 22:36:07 +00:00
twangboy
68a36f2e37
Add req_ext.txt 2020-03-23 13:58:38 -06:00
twangboy
5851a5c2cd
Roll back changes, fix dependencies 2020-03-23 13:58:38 -06:00
twangboy
02dfe4119c
Add pyobjc in its own requirements file 2020-03-20 16:44:20 -06:00
twangboy
6b2ac2be64
Remove pyobjc, enforce pip install location 2020-03-20 14:07:15 -06:00
Salt Admin
30ca5d04ec Remove cryptography, it gets installed by pyopenssl 2020-03-19 14:53:18 -06:00
Salt Admin
1fa9864e3d Don't set a version for pyopenssl 2020-03-19 12:08:16 -06:00
Salt Admin
461b198978 Update dependencies, remove req_ext.txt 2020-03-19 11:59:11 -06:00
twangboy
6c83beeb9e
Fix win deps 2020-03-13 15:24:21 -06:00
twangboy
f00a504a48
Add back the pylauncher 2020-02-05 10:45:28 -07:00
twangboy
30b9c32356
Revert changes to req and req_win 2020-02-05 10:44:18 -07:00
twangboy
98dc0e970c
Fix some warts in the build_env scripts 2020-02-05 10:44:18 -07:00
twangboy
8404141f65
Update dependencies 2020-02-05 10:44:15 -07:00
Daniel A. Wozniak
103890c4fe
backports-abc only for py2 2020-01-31 10:41:16 -07:00
Daniel A. Wozniak
0e4ad85f70
singledispatch only needed for < 3.4 2020-01-31 16:35:14 +00:00
Daniel A. Wozniak
fc8e978160
Remove redundent reqs from windows 2020-01-28 00:25:56 +00:00
Daniel A. Wozniak
6ed189e031
Move tornado requirements to os base files 2020-01-26 13:15:05 -07:00
cmcmarrow
3443468e90
Add pymssql to windows requirements 2020-01-07 10:08:54 +00:00
Daniel Wozniak
06bcd4af96
Merge branch 'master' into 2019_2_1_port_52365 2019-10-24 09:30:43 -07:00