Commit graph

48 commits

Author SHA1 Message Date
Pedro Algarvio
5840ab68a5 We depend on `msgpack >= 1.0`, simplify logic 2024-02-27 08:07:04 +00:00
Pedro Algarvio
5a8607c2e7 Create and use requirements/constraints.txt now that setuptools 69.0 broke builds again
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-27 21:13:22 +00:00
David Murphy
80785185ac Remove cython and other pyyaml changes, now pyyaml 6.0.1 fixes cython 3.0 issue 2023-07-28 18:24:59 +01:00
David Murphy
af8d19061a Updated test to use importorskip, downgrade pyyaml to 5.3.1 to work around cython 3.0 issues 2023-07-28 18:24:59 +01:00
Pedro Algarvio
4ecfd3d3d5 Use packaging for version parsing. looseversion when needed only.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-01-09 12:31:51 -07:00
David Murphy
75b1be30a6 Further cleanup, removed used of looseversion and packaging 2022-12-20 07:07:21 -07:00
David Murphy
e8441238e1 Initial removal usage of distutils and replacement with setuptools 2022-12-20 07:07:21 -07:00
Twangboy
87ac8341e5 Add comment to base.txt that we need contextvars 2022-11-15 13:37:56 -07:00
Gareth J. Greenaway
20fb0beb38 package jmespath 2022-09-12 12:13:00 -07:00
Wayne Werner
b0450ce6ac remove erroneous empty line 2022-04-07 15:52:57 -04:00
Wayne Werner
f4e12fc7ba Updating msgpack version for windows
Before it was pinned to an out of date buggy version, this should fix
some errors and inconsistencies.
2022-04-07 15:52:57 -04:00
cmcmarrow
86d7c2dd05 fix pre 2021-09-24 20:20:32 -07:00
cmcmarrow
d4c283925f run pre 2021-09-24 20:20:32 -07: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
Pedro Algarvio
2c6da2a5c5 Best salt-extensions load at runtime support is using `importlib-metadata` 2021-08-27 07:21:24 -04:00
Megan Wilhite
66cf74140b
Merge Freeze into Master (#60074)
* Merge 3002.6 bugfix changes (#59822)

* Pass `CI_RUN` as an environment variable to the test run.

This allows us to know if we're running the test suite under a CI
environment or not and adapt/adjust if needed

* Migrate `unit.setup` to PyTest

* Backport ae36b15 just for test_install.py

* Only skip tests on CI runs

* Always store git sha in _version.py during installation

* Fix PEP440 compliance.

The wheel metadata version 1.2 states that the package version MUST be
PEP440 compliant.

This means that instead of `3002.2-511-g033c53eccb`, the salt version
string should look like `3002.2+511.g033c53eccb`, a post release of
`3002.2` ahead by 511 commits with the git sha `033c53eccb`

* Fix and migrate `tests/unit/test_version.py` to PyTest

* Skip test if `easy_install` is not available

* We also need to be PEP440 compliant when there's no git history

* Allow extra_filerefs as sanitized kwargs for SSH client

* Fix regression on cmd.run when passing tuples as cmd

Co-authored-by: Alexander Graul <agraul@suse.com>

* Add unit tests to ensure cmd.run accepts tuples

* Add unit test to check for extra_filerefs on SSH opts

* Add changelog file

* Fix comment for test case

* Fix unit test to avoid failing on Windows

* Skip failing test on windows

* Fix test to work on Windows

* Add all ssh kwargs to sanitize_kwargs method

* Run pre-commit

* Fix pylint

* Fix cmdmod loglevel and module_names tests

* Fix pre-commit

* Skip ssh tests if binary does not exist

* Use setup_loader for cmdmod test

* Prevent argument injection in restartcheck

* Add changelog for restartcheck fix

* docs_3002.6

* Add back tests removed in merge

Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
Co-authored-by: Megan Wilhite <megan.wilhite@gmail.com>
Co-authored-by: Bryce Larson <brycel@vmware.com>
Co-authored-by: Pablo Suárez Hernández <psuarezhernandez@suse.com>
Co-authored-by: Alexander Graul <agraul@suse.com>
Co-authored-by: Frode Gundersen <fgundersen@saltstack.com>

* Remove glance state module in favor of glance_image

* update wording in changelog

* bump deprecation warning to Silicon.

* Updating warnutil version to Phosphorous.

* Update salt/modules/keystone.py

Co-authored-by: Megan Wilhite <megan.wilhite@gmail.com>

* Check $HOMEBREW_PREFIX when linking against libcrypto

When loading `libcrypto`, Salt checks for a Homebrew installation of `openssl`
at Homebrew's default prefix of `/usr/local`. However, on Apple Silicon Macs,
Homebrew's default installation prefix is `/opt/homebrew`. On all platforms,
the prefix is configurable.  If Salt doesn't find one of those `libcrypto`s,
it will fall back on the un-versioned `/usr/lib/libcrypto.dylib`, which will
cause the following crash:

    Application Specific Information:
    /usr/lib/libcrypto.dylib
    abort() called
    Invalid dylib load. Clients should not load the unversioned libcrypto dylib as it does not have a stable ABI.

This commit checks $HOMEBREW_PREFIX instead of hard-coding `/usr/local`.

* Add test case

* Add changelog for 59808

* Add changelog entry

* Make _find_libcrypto fail on Big Sur if it can't find a library

Right now, if `_find_libcrypto` can't find any externally-managed versions of
libcrypto, it will fall back on the pre-Catalina un-versioned system libcrypto.
This does not exist on Big Sur and it would be better to raise an exception
here rather than crashing later when trying to open it.

* Update _find_libcrypto tests

This commit simplifies the unit tests for _find_libcrypto by mocking out the
host's filesystem and testing the common libcrypto installations (brew, ports,
etc.) on Big Sur. It simplifies the tests for falling back on system versions
of libcrypto on previous versions of macOS.

* Fix description of test_find_libcrypto_with_system_before_catalina

* Patch sys.platform for test_rsax931 tests

* modules/match: add missing "minion_id" in Pillar example

The documented Pillar example for `match.filter_by` lacks the `minion_id` parameter. Without it, the assignment won't work as expected.
- fix documentation
- add tests:
  - to prove the misbehavior of the documented example
  - to prove the proper behaviour when supplying `minion_id`
  - to ensure some misbehaviour observed with compound matchers doesn't occur

* Fix for issue #59773

- When instantiating the loader grab values of grains and pillars if
  they are NamedLoaderContext instances.
- The loader uses a copy of opts.
- Impliment deepcopy on NamedLoaderContext instances.

* Add changelog for #59773

* _get_initial_pillar function returns pillar

* Fix linter issues

* Clean up test

* Bump deprecation release for neutron

* Uncomment Sulfur release name

* Removing the _ext_nodes deprecation warning and alias.

* Adding changelog.

* Renaming changelog file.

* Update 59804.removed

* Initial pass at fips_mode config option

* Fix pre-commit

* Fix tests and add changelog

* update docs 3003

* update docs 3003 - newline

* Fix warts in changelog

* update releasenotes 3003

* add ubuntu-2004-amd64 m2crypto pycryptodome and tcp tests

* add distro_arch

* changing the cloud platforms file missed in 1a9b7be0e2

* Update __utils__ calls to import utils in azure

* Add changelog for 59744

* Fix azure unit tests and move to pytest

* Use contextvars from site-packages for thin

If a contextvars package exists one of the site-packages locations use
it for the generated thin tarball. This overrides python's builtin
contextvars and allows salt-ssh to work with python <=3.6 even when the
master's python is >3.6 (Fixes #59942)

* Add regression test for #59942

* Add changelog for #59942

* Update filemap to include test_py_versions

* Fix broken thin tests

* Always install the `contextvars` backport, even on Py3.7+

Without this change, salt-ssh cannot target systems with Python <= 3.6

* Use salt-factories to handle the container. Don't override default roster

* Fix thin tests on windows

* No need to use warn log level here

* Fix getsitepackages for old virtualenv versions

* Add explicit pyobjc reqs

* Add back the passthrough stuff

* Remove a line so pre-commit will run

* Bugfix release docs

* Bugfix release docs

* Removing pip-compile log files

* Fix failing test tests.unit.grains.test_core.CoreGrainsTestCase.test_xen_virtual

* Fix pre-commit for docs.txt reqs

Co-authored-by: Daniel Wozniak <dwozniak@saltstack.com>
Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
Co-authored-by: Bryce Larson <brycel@vmware.com>
Co-authored-by: Pablo Suárez Hernández <psuarezhernandez@suse.com>
Co-authored-by: Alexander Graul <agraul@suse.com>
Co-authored-by: Frode Gundersen <fgundersen@saltstack.com>
Co-authored-by: Gareth J. Greenaway <gareth@saltstack.com>
Co-authored-by: Gareth J. Greenaway <gareth@wiked.org>
Co-authored-by: Hoa-Long Tam <hoalong@apple.com>
Co-authored-by: krionbsd <krion@freebsd.org>
Co-authored-by: Elias Probst <e.probst@ssc-services.de>
Co-authored-by: Daniel A. Wozniak <dwozniak@vmware.com>
Co-authored-by: Frode Gundersen <frogunder@gmail.com>
Co-authored-by: twangboy <slee@saltstack.com>
Co-authored-by: twangboy <leesh@vmware.com>
Co-authored-by: ScriptAutomate <derek@icanteven.io>
2021-04-27 11:47:47 -04:00
Alexander Graul
5c9c0ab9cd Set distro requirement to oldest supported version
In the released Salt packages, python3-distro is taken from the
officially repositories on supported operating systems. The oldest
supported python3-distro version is 1.0.1 in Ubuntu18.04 universe and
Debian 9.
The mismatch between the version specified in requirements/base.txt and
what is actually used by the released packages can be confusing.
2021-02-24 14:10:54 -05:00
Daniel A. Wozniak
83f551aeca Run loaded methods in a context specific to the laoder 2020-12-05 17:49:51 -07:00
Pedro Algarvio
67b25add12
Add packaging static requirements 2020-09-30 09:31:49 +01:00
Charles McMarrow
e85eea8178
fix msg_pack (#57571)
* remove < 1.0.0

* update msgpack

* fix msg_test

* fix .decode

* fix .decode 2

* fix failing tests

* undo decode 2

* fix strict_map_key

* fix tab error

* add back raw True

* fix upack kwargs

* add raw false

* move raw false

* raw=false move

* clean up

Co-authored-by: Daniel Wozniak <dwozniak@saltstack.com>
2020-07-14 19:20:55 -07:00
Daniel Wozniak
cea42a1f3a Revert "Uncap msgpack version"
This reverts commit 190131b4c9.
2020-06-05 08:40:23 -07:00
Alberto Planas
190131b4c9 Uncap msgpack version 2020-06-05 08:39:07 -07:00
Pedro Algarvio
fe075aaace Distro is now a hard dependency
Refs #55310
Refs #55835
2020-05-11 19:06:03 -07:00
Pedro Algarvio
04f6159d31
Update requirements. We no longer support Python 2. 2020-04-24 01:07:13 +01: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
e4ee32f2a0
Do not allow msgpack 1.0.0rc1 2020-01-28 18:12:55 +00:00
Daniel A. Wozniak
6ed189e031
Move tornado requirements to os base files 2020-01-26 13:15:05 -07:00
Daniel A. Wozniak
28a9bde5e3
Update requirements for tornado changes 2020-01-26 17:04:07 +00:00
Pedro Algarvio
0d13fbc2ed
Address static requirements security vulnerabilities 2019-10-17 20:22:46 +01:00
Pedro Algarvio
cee9480ee3
Lock PyYAML to < 5.1
The reason being that at least one unit test case will leak memory until
exhaustion.
2019-03-15 16:45:54 +00:00
rallytime
cdb45874de
Merge branch '2017.7.6' into '2017.7'
Conflicts:
  - doc/topics/releases/2017.7.6.rst
  - requirements/base.txt
2018-06-13 15:04:55 -04:00
Daniel Wallace
81bd01f5af
add tests.txt for running tests with tox requirements 2018-06-05 18:55:04 -05:00
Daniel Wallace
987ae6358b
quote python_version in requirements.txt 2018-05-29 16:08:13 -05:00
Daniel Wallace
a1c1b5b5cf
allow tornado 5.0 to be installed only for python2 2018-05-29 13:57:54 -05:00
rallytime
e458f4a031
Merge branch '2017.7.6' into '2017.7'
No conflicts.
2018-05-21 10:34:10 -04:00
Daniel Wallace
550ef2e272
allow using tornado 5.0 2018-05-17 08:41:32 -05:00
Daniel Wallace
0d06da6944
Merge pull request #47626 from gtmanfred/2017.7
Implement Pipfile and remove extra requirements.txt files
2018-05-15 19:03:11 -05:00
Daniel Wallace
f78b81db94
simplify dev and base.txt to single files
Instead of having different files for different python versions, just have one,
and use the built in `python_version` to handle which dependencies to install.
2018-05-13 08:38:34 -04:00
Daniel Wallace
84aa034e03
Update dependency to msgpack 2018-05-09 12:47:07 -05:00
rallytime
6439bce4a8
Don't install msgpack 0.5.5
This version has known critical issues.

See da902f9c1d (r27725642)
for more information.
2018-03-02 13:39:33 -05:00
rallytime
b94d73c53e
Pin tornado version in requirements file
tornado needs to be >= 4.2.1, but less that 5.0.

Tornado 5.0 is introducing backwards-incompatible changes. Therefore,
we need to pin the version of tornado in base.txt until we can fix
supporting Tornado 5.0 in Salt.

Refs #45790
2018-02-16 12:05:18 -05:00
TheBigBear
08af68727c Update base.txt 2015-08-26 23:03:04 +01:00
Jenkins
fc97f38854 Bump required Tornado version to 4.2.1 2015-08-21 09:21:13 -06:00
Vladimir Didenko
ed8e068bf7 Switch resolver to threaded variant since ExecutorResolver by default uses blocking implementation 2015-04-29 11:08:29 +03:00
Thomas Jackson
dfd606a365 Add tornado dependancy 2015-04-07 21:01:43 -07:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Renamed from _requirements.txt (Browse further)