Commit graph

48 commits

Author SHA1 Message Date
Pedro Algarvio
e35033aebc Consolidate requirements into requirements/base.txt
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-08 16:56:36 +00:00
Pedro Algarvio
c8f5d589d2
Merge 3006.x into master 2023-10-29 22:25:59 +00:00
Megan Wilhite
ec38a2e5bb [3006.4] Update gitpython to 3.1.37 2023-10-12 12:52:14 -06:00
Pedro Algarvio
5f50947763 Set gitpython>=3.1.35
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-10-02 08:51:34 +01:00
Pedro Algarvio
9cf8048421 The 3006.x branch is Python >= 3.7 already. Remove unnecessary python_version markers.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-10-02 08:51:34 +01:00
Caleb Beard
60b5fd0b00
Merge branch 'master' into dependabot/master/pygithub 2023-09-20 16:18:29 -04:00
MKLeb
aaf493adba Update to >=3.1.35 2023-09-18 15:42:12 -04:00
MKLeb
a1e2b9cfcf Update gitpython to >=3.1.34 2023-09-18 15:42:12 -04:00
Pedro Algarvio
74f43bb5d2
Upgrade requirements downgraded during the merge forward conflict resolve
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-09-13 16:24:16 +01:00
Pedro Algarvio
f389c29473
Merge 3006.x into master
Conflicts:
 * requirements/darwin.txt
 * requirements/pytest.txt
 * requirements/static/ci/common.in
 * requirements/static/ci/darwin.in
 * requirements/static/ci/freebsd.in
 * requirements/static/ci/linux.in
 * requirements/static/ci/py3.10/cloud.txt
 * requirements/static/ci/py3.10/darwin.txt
 * requirements/static/ci/py3.10/freebsd.txt
 * requirements/static/ci/py3.10/lint.txt
 * requirements/static/ci/py3.10/linux.txt
 * requirements/static/ci/py3.10/windows.txt
 * requirements/static/ci/py3.11/windows.txt
 * requirements/static/ci/py3.7/cloud.txt
 * requirements/static/ci/py3.7/freebsd.txt
 * requirements/static/ci/py3.7/lint.txt
 * requirements/static/ci/py3.7/linux.txt
 * requirements/static/ci/py3.8/cloud.txt
 * requirements/static/ci/py3.8/freebsd.txt
 * requirements/static/ci/py3.8/lint.txt
 * requirements/static/ci/py3.8/linux.txt
 * requirements/static/ci/py3.8/windows.txt
 * requirements/static/ci/py3.9/cloud.txt
 * requirements/static/ci/py3.9/darwin.txt
 * requirements/static/ci/py3.9/freebsd.txt
 * requirements/static/ci/py3.9/lint.txt
 * requirements/static/ci/py3.9/linux.txt
 * requirements/static/ci/py3.9/windows.txt
 * requirements/static/pkg/freebsd.in
 * requirements/static/pkg/linux.in
 * requirements/static/pkg/py3.10/darwin.txt
 * requirements/static/pkg/py3.10/windows.txt
 * requirements/static/pkg/py3.11/windows.txt
 * requirements/static/pkg/py3.8/windows.txt
 * requirements/static/pkg/py3.9/darwin.txt
 * requirements/static/pkg/py3.9/windows.txt
 * requirements/windows.txt
2023-09-13 16:09:29 +01:00
Pedro Algarvio
c3477da2dd The 3006.x branch is Python >= 3.7 already. Remove unnecessary python_version markers.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-09-12 09:23:32 +01:00
Pedro Algarvio
22107ebd32
Merge 3006.x into master 2023-08-15 22:29:25 +01:00
Pedro Algarvio
af59576d96
Merge 3006.x into master 2023-08-06 08:13:52 +01:00
Megan Wilhite
a46d846ab6 Update to cryptography==41.0.3 due to https://github.com/advisories/GHSA-jm77-qphf-c4w8 2023-08-06 07:31:13 +01:00
Megan Wilhite
b0dfa09544 [3006.2] Update cryptography to 41.0.3 2023-08-03 13:11:11 +00:00
Megan Wilhite
c069d99ea8 [3006.2] Update cryptography 2023-07-20 08:03:43 +01:00
Pedro Algarvio
df09fd980d
Merge 3006.x into master 2023-07-18 16:37:08 +01:00
Pedro Algarvio
5b2e752d5e Bump to cryptography==41.0.2 to address GHSA-cf7p-gm2m-833m
The cryptography package before 41.0.2 for Python mishandles SSH certificates that have critical options.
References:

https://nvd.nist.gov/vuln/detail/CVE-2023-38325
[https://github.com/pyca/cryptography/issues/9207](pyca/cryptography#9207)
[https://github.com/pyca/cryptography/issues/9208](pyca/cryptography#9208)
[https://github.com/pyca/cryptography/compare/41.0.1...41.0.2](pyca/cryptography@41.0.1...41.0.2)
https://pypi.org/project/cryptography/#history
[1ca7adc97b](pyca/cryptography@1ca7adc)

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-07-16 17:44:45 -07:00
Pedro Algarvio
7d6f51f871
Merge 3006.x into master 2023-07-08 21:30:11 +01:00
Pedro Algarvio
3d097b8ed5 Upgrade to cryptography==41.0.1(and therefor pyopenssl==23.2.0 due to https://github.com/advisories/GHSA-5cpq-8wj7-hf2v
This only really impacts pip installs of Salt and the windows onedir
since the linux and macos onedir build every package dependency from
source, not from pre-existing wheels.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-07-06 18:04:43 +01:00
Pedro Algarvio
b763dfa21c Bump to pycparser==2.21
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-07 22:28:15 +01:00
Pedro Algarvio
e1f962e0d8 Bump to gitpython==3.1.31
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-07 22:28:15 +01:00
Pedro Algarvio
defca6ba10 Remove ioloop>=0.1a0 from the windows requirements
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-07 22:28:15 +01:00
Pedro Algarvio
6e26da3c9f Bump to cryptography==40.0.2
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-07 22:28:15 +01:00
Twangboy
a32b2f82db Remove mako from Windows and MacOS 2023-04-04 08:33:30 +01:00
Pedro Algarvio
5e7d4e3021 Upgrade to cryptography>=39.0.1
Due to:
  * GHSA-x4qr-2fvf-3mr5
  * GHSA-w7pp-m8wf-vj6r

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-03-22 15:08:20 +00:00
Pedro Algarvio
cea048be5f Update docs related requirements
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-02-04 14:11:36 +00:00
Pedro Algarvio
5a0fd275eb Update setptoctitle requirements to stop getting the PY_SSIZE_T_CLEAN warning
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-01-18 11:54:43 +00:00
Twangboy
2eb4c90f40
Update pythonnet to 3.0.1 to support Python 3.10 2023-01-03 08:59:54 -07:00
Pedro Algarvio
e47e47a7e6 Bump to gitpython==3.1.30 because of https://github.com/advisories/GHSA-hcpj-qp55-gfph
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-12-31 15:02:22 +00:00
Pedro Algarvio
7969d09be9 Bump to wheel==0.38.4 due to https://github.com/advisories/GHSA-qwmp-2cf2-g9g6
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-12-28 15:49:37 +00:00
Twangboy
ca4d05043f Remove libnacl from requirements 2022-12-23 10:25:16 +00:00
Pedro Algarvio
7df5feb62b Bump to certifi>=2022.12.7
Follow up to https://github.com/saltstack/salt/pull/63284

See https://github.com/advisories/GHSA-43fp-rhv2-5gv8 for additional context.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-12-12 04:32:02 +00:00
Pedro Algarvio
f59bf99cda
Drop pycurl requirement, see https://github.com/saltstack/relative-environment-for-python/issues/50
Properly compile windows requirements on Py3.10

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-12-05 05:03:44 +00:00
Carlos Álvaro
b3c6d949ba fix: Update setproctitle version for all platforms 2022-09-01 13:33:16 -06:00
Megan Wilhite
fc7d0a9296
Merge freeze into master (#62438)
* fixes saltstack/salt#62372 unable to use random shuffle and sample functions as Jinja filters

* move random_shuffle and random_sample logic to utils

* static seed in tests seems to have shifted

* static seed in tests require hash module

* Change Tiamat to onedir in release notes

* Reinstate known issues

* Update release notes with onedir package support policy

* need to check the version of Netmiko python library and then import the exceptions from different locations depending on the result.

* Adding changelog.

* swap out if...else for double try...except.

* Remove extra fix we don't need anymore

* [Docs] include onedir system python note

* Update all platforms to use pycparser 2.21 or greater for Py 3.9 or higher, fixes fips fault with openssl v3.x

* Remove the PyObjC dependency

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Add "<tiamat> python" subcommand to allow execution or arbitrary scripts via bundled Python runtime

* Document usage of bundled Python runtime for Client API

* Use explicit locals for custom script execution, handle exception in similar fashion as Python

* Remove old __file__ replacement

* Apply suggestions from code review

Co-authored-by: Pedro Algarvio <pedro@algarvio.me>

Co-authored-by: nicholasmhughes <nicholasmhughes@gmail.com>
Co-authored-by: Alyssa Rock <alyssa.rock@gmail.com>
Co-authored-by: Gareth J. Greenaway <gareth@saltstack.com>
Co-authored-by: Twangboy <leesh@vmware.com>
Co-authored-by: David Murphy < dmurphy@saltstack.com>
Co-authored-by: Pedro Algarvio <palgarvio@vmware.com>
Co-authored-by: Lukas Raska <lukas@raska.me>
Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
2022-08-08 11:27:10 -06:00
Daniel Wozniak
d9343cca65
Merge forward 3004.2 (#62200)
* Check only ssh-rsa encyption for set_known_host

* Windows test fix

* Fix pre-commit

* add CentOS Stream to _OS_FAMILY_MAP, fix #59161

* added changelog and test

* fix syntax

* Use centosstream 8 for testing

* Use ? for matching spaces

Technically this isn't *quite* right as 'CentOSyStream' would also
match, but it's pretty reasonable:

- OS grains shouldn't ever be that kind of close
- This test is only swapping out spaces, and only for the os grain. That
  would mean there would have to be two OSes with grains that only
  differ by one having a space where another one has any other
  character.
- This test really isn't even about matching grains, we're just using
  compound matching and that's a reasonable one to use.

* Add centos stream when detecting package manager name

* Fix pre-commit

* Remove tests for fedora 32/33 EOL

* Remove tests for fedora 32/33 EOL

* Remove tests for fedora 33 EOL

* Use centosstream 8 for testing

* Use ? for matching spaces

Technically this isn't *quite* right as 'CentOSyStream' would also
match, but it's pretty reasonable:

- OS grains shouldn't ever be that kind of close
- This test is only swapping out spaces, and only for the os grain. That
  would mean there would have to be two OSes with grains that only
  differ by one having a space where another one has any other
  character.
- This test really isn't even about matching grains, we're just using
  compound matching and that's a reasonable one to use.

* 3002.9: Fix pre-commit

* 3003.5 Fix pre-commit

* [3002.9] Replace use of 'sl' with 'paper' for Arch tests, due to 'sl' having key issues

* Remove mojave testing

* Remove mojave and high sierra testing

* Remove mojave testing

* [3002.9] Fix cloud vultr size issue

* Update package name to aspnetcore-runtime-6.0 for redhat 8 pkg tests

* Update package name to aspnetcore-runtime-6.0 for redhat 8 pkg tests

* change amazon linux AMI

* Migrate `unit.modules.test_gpg` to PyTest

* Don't leave any `gpg-agent`'s running behind

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Start a background process to generate entropy.

Some tests have failed because of not enough entropy which then makes
the test timeout.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* A different approach at generating entropy

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Turn entropy generation into a helper

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* change amazon linux AMI

* change amazon linux AMI

* [3004.2] Fix cloud vultr size issue

* Fix cloud requirements

* Skip pam tests on windows

* Update ami to try to get the tests running

* Update amis to try to get the tests running

* Fixing test_publish_to_pubserv_ipc_tcp, moving the call to socket.socket into the while loop.

* Add static requirements for 3.8 and 3.9 on Windows

* Fix requirements

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* The whole CI process is already slower than GH Actions, no caches.

* Pre-commit must not run with ``PIP_EXTRA_INDEX_URL`` set.

* Lint fixes

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Compile cloud requirements

* Run add requirements files for 3.8 and 3.9

* Fix docs and cloud requirements

* [3003.5] Fix cloud vultr size issue

* Windows test fix

* Skip test if docker not running

* [3003.5] Fix pre-commit

* Update Markup and contextfunction imports for jinja versions >=3.1.

* update bootstrap to 2022.03.15

* update bootstrap to 2022.03.15

* skipping tests/pytests/integration/modules/test_virt.py on 3002.x and 3003.x branches.

* Windows test fix

* Skip PAM tests on Windows

Windows has no ctypes with the PAM bits, so we should go ahead and skip
on Windows.

* Skip PAM auth tests on Windows

Windows lacks the correct bits, so...

* Fix pre-commit

* Skipping tests since they're also skipped on the master branch

Fixes #403

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Skip test that only runs because the patch binary is now available.

The feature though, was only added in 3004.

Fixes #404

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Skip test which is only supposed to run in Linux

Fixes https://github.com/saltstack/salt-priv/issues/405

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* GPG tests do not work on windows yet

* Fix tests

* Fix pre-commit

* skip tests.integration.modules.test_mac_brew_pkg.BrewModuleTest.test_list_upgrades and tests.integration.modules.test_state.StateModuleTest.test_get_file_from_env_in_top_match on Mac OS.

* skip tests.integration.modules.test_mac_brew_pkg.BrewModuleTest.test_list_upgrades and tests.integration.modules.test_state.StateModuleTest.test_get_file_from_env_in_top_match on Mac OS.

* Removing skip, moving it to different PR.

* Skipping tests on 3002.9.

* test fix

* Do not run patch tests on 3003.5. Feature not added till 3004

* skipping tests/pytests/integration/modules/test_virt.py on 3002.x and 3003.x branches.

* Fix pre-commit

* [3004.2] Update freebsd ami

* Bump the git version for freebsd CI tests

* removing versions that are no longer available from the tests.pytests.scenarios.compat.test_with_versions tests.

* Skip tests on windows when NOT using static requirements

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* removing versions that are no longer available from the tests.pytests.scenarios.compat.test_with_versions tests.

* test_issue_36469_tcp causes a fatal python error when run on Mac OS, so skipping.

* Fix tests

* Fix pre-commit

* Do not run patch tests on 3003.5. Feature not added till 3004

* Skip archive tar tests on windows

* [3002.9] Skip archive tar tests on windows

* GPG tests do not work on windows yet

* Skip test which is only supposed to run in Linux

Fixes https://github.com/saltstack/salt-priv/issues/405

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Skip test that only runs because the patch binary is now available.

The feature though, was only added in 3004.

Fixes #404

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Skipping tests since they're also skipped on the master branch

Fixes #403

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Fix pre-commit

* Fix pre-commit

* Fix pre-commit

* Fix pre-commit

* retry sdb.get if it returns None

None is an entirely valid return - see EtcdClient.get in
salt/utils/etcd_util.py

* drop py2/six

* fix etcd sdb.set as well

* Fix etdcd-sdb test failure

If docker container is up and running, but etcd isn't responding yet
it's possible that we get some failing tests. This should wait a
reasonable amount of time for things to come up. Or just skip the test.

* Fix etdcd-sdb test failure

If docker container is up and running, but etcd isn't responding yet
it's possible that we get some failing tests. This should wait a
reasonable amount of time for things to come up. Or just skip the test.

* Skip the tests from unit/transport/test_zero.py that are hanging on Mac.

* skip tests in tests/pytests/unit/states/test_archive.py for 3002.9

* 3002.9 Skipping  CA permissions tests on Windows, similar to 3003.5 and 3004.2

* change skipif to skip

* Rollback Windows AMIs to use Python 3.7

* Rollback AMI's to Python 3.7... fix tests

* Fix failing test_archive tests

* Build using pyenv

* Add symlinks to openssl and rpath

* Add shasum for zeromq 4.3.4

* Fix docs on scripts

* Build zeromq earlier, fix symlinks

* Bring 61446 to 3004.1 branch

* Add changelog and tests

* Fix schedule test flakiness

* Retry with new port if in use

* fixing failing tests, ensuring that the correct path is used.

* fixing failing tests, ensuring that the correct path is used.

* fixing failing tests, ensuring that the correct path is used.

* Re-enable tiamat-pip on windows

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

* Bump duration time for windwos for test_retry_option_success

* Skip test cauing hangs

* go go pylint disable

* more pre-commit

* oh lint

* so many weird hook failures

* Add unit tests for PAM auth CVE

We could add functional tests if it's important enough, but this is the
narrowest place to test.

* Fix PAM auth CVE

Credit to @ysf

Previously we weren't checking the result of PAM_ACCT_MGMT.

* pylint disable

* rewrite hook changes

* Skip PAM auth tests on Windows

Since Windows ends out lacking the correct bits, no need to run tests
there.

* pre-commit fixes

* docs 3004.2 release

* Fix bug in tcp transport

* Fix the test_zeromq_filtering test

* skip test_npm_install_url_referenced_package on centos 7 and 8.

* Swapping CentOS Linux-8 for CentOS Stream-8

* Update build scripts to use pyenv

* Fix tests on MacOS

* Fix bug in tcp transport

* Fix test failures

* Update release notes and man pages for 3003.5

* Add 3002.9 changelog, release notes, man pages

* Update doc/topics/releases/3002.9.rst

Co-authored-by: Megan Wilhite <mwilhite@vmware.com>

* Fix requirements

* Fix imports

* Test fixup

* Fix merge warts

* fix merge wart in changelog

* Fix merge warts in tests

Co-authored-by: krionbsd <krion@FreeBSD.org>
Co-authored-by: Megan Wilhite <megan.wilhite@gmail.com>
Co-authored-by: Alexander Kriventsov <akriventsov@nic.ru>
Co-authored-by: Megan Wilhite <mwilhite@vmware.com>
Co-authored-by: Wayne Werner <wwerner@vmware.com>
Co-authored-by: Gareth J. Greenaway <gareth@saltstack.com>
Co-authored-by: David Murphy < dmurphy@saltstack.com>
Co-authored-by: Twangboy <leesh@vmware.com>
Co-authored-by: MKLeb <calebb@vmware.com>
Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
Co-authored-by: Pedro Algarvio <palgarvio@vmware.com>
Co-authored-by: Thomas Phipps <tphipps@vmware.com>
Co-authored-by: Frode Gundersen <frogunder@gmail.com>
Co-authored-by: Alyssa Rock <alyssa.rock@gmail.com>
Co-authored-by: Alyssa Rock <43180546+barbaricyawps@users.noreply.github.com>
2022-06-29 10:10:06 -06:00
cmcmarrow
8ca010de71 add psutil to re 2021-09-24 20:20:32 -07:00
Pedro Algarvio
bd7195c3c6 `importlib-metadata` is a packaging requirement instead.
This is so that timat builds will pull it in but we don't force
distributions to have that package available
2021-08-27 07:21:24 -04:00
twangboy
bb45935799 Update deps 2021-07-23 13:06:52 -07:00
Pedro Algarvio
3d4387f76f Enable Py3.9 requirements on windows 2021-07-23 13:06:52 -07:00
twangboy
bd8a58b000 Update requirements for Windows 2021-02-23 12:49:10 -05:00
Pedro Algarvio
12f0657306 Cleanup salt/_compat.py now that Salt is Py3.5+ only 2021-02-19 08:35:12 -05:00
Pedro Algarvio
5a45212467 Bump lxml requirement to 4.6.2
CVE-2020-27783
moderate severity
Vulnerable versions: < 4.6.2
Patched version: 4.6.2

A XSS vulnerability was discovered in python-lxml's clean module. The module's parser didn't properly imitate browsers, which caused different behaviors between the sanitizer and the user's page. A remote attacker could exploit this flaw to run arbitrary HTML/JS code.
2021-01-08 16:01:29 +00:00
Pedro Algarvio
49556caf05
Rework static requirements. Darwin and Windows packaging are now also static.
Refs https://github.com/saltstack/release-planning/issues/238
2020-09-30 09:31:49 +01:00
twangboy
57d5f781f4 Use req files in pkg\windows for setup 2017-04-27 09:47:46 -06:00
twangboy
02757db1e4 Add python 3 installer for Windows 2017-03-10 21:52:38 +00:00
twangboy
a817aef1c2 Add windows requirements file 2016-09-16 15:43:36 -06:00