Commit graph

484 commits

Author SHA1 Message Date
Pedro Algarvio
b7630f3b08
Merge 3006.x into 3007.x 2024-02-29 14:25:24 +00:00
Pedro Algarvio
03ad4c6337 Update code to be Py3.7+ to reduce merge forward conflicts 2024-02-29 10:16:58 +00:00
Pedro Algarvio
b9be2dec1b Update and remove obsolete pylint plugins 2024-02-27 08:07:04 +00:00
Pedro Algarvio
92cae105fd Add deprecation warnings and release notes about `setup.py`
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-10 14:51:21 +00:00
Pedro Algarvio
e18d829f36 Drop Python 3.7 support.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-05 20:55:24 +01:00
cmcmarrow
13437829fc Merge remote-tracking branch 'upstream/3006.x' into merge-forward/3006.x/master 2023-04-20 17:39:55 -05:00
Megan Wilhite
b35db04826 Fix setup.py called with salt args 2023-04-20 13:39:44 +00:00
Pedro Algarvio
7160266006
Merge 3006.x into master 2023-04-01 09:41:41 +01:00
Twangboy
11e97b168f Remove some remaining fragments 2023-03-30 20:00:55 +01:00
Twangboy
7f47174fab Clean some lint 2023-03-30 20:00:55 +01:00
Twangboy
df1b5c488a Remove unneeded download code 2023-03-30 20:00:55 +01:00
Twangboy
2418a8504f Use relenv OpenSSL 2023-03-30 20:00:55 +01:00
Daniel A. Wozniak
6b9463836e Remove un-needed 'scripts' property in setup.py 2023-03-09 06:12:41 +00:00
Pedro Algarvio
4315342238 Add, and use, the setup-salt-version action
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-01-18 14:34:13 +00:00
Pedro Algarvio
d35a55e619 Remove code no longer required
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-01-09 12:31:51 -07:00
Pedro Algarvio
42b7d1be89 Stop relying on salt/_version.py to write Salt's version.
Instead use `salt/_version.txt` which only contains the version string.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-01-09 12:31:51 -07:00
Daniel A. Wozniak
a600a8b4c1 Add salt-pip wrapper script 2022-12-23 16:24:54 +00:00
Twangboy
bdfcb806c6 Remove libsodium libraries from install 2022-12-23 10:25:16 +00:00
Daniel A. Wozniak
701633d181 Initial commit of relenv debian package 2022-12-22 07:59:07 -07:00
David Murphy
75b1be30a6 Further cleanup, removed used of looseversion and packaging 2022-12-20 07:07:21 -07:00
David Murphy
fb1178de60 Reverted to allowing Python >= 3.6 2022-12-20 07:07:21 -07:00
David Murphy
0bc4a359a6 Removed up debug code 2022-12-20 07:07:21 -07:00
David Murphy
41ad6c1922 Debug version, running for PR tests wip 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
c0c9402e63 Add ability to build all binaries. SALT_BUILD_ALL_BINS 2022-12-16 12:30:22 -07:00
Twangboy
31152aaf1b Remove uneeded binaries from Windows 2022-12-16 12:30:22 -07:00
Pedro Algarvio
1b7fac1599
Disable the setuptools user warning "Setuptools is replacing distutils."
Once we stop relying on distutils, this filter can be removed.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-10-11 21:19:21 +01:00
Benjamin Drung
ad95c4fcac Make default pki directory configurable
The files in `/etc/salt/pki` are not configuration files in the sense of
the FHS ("local file used to control the operation of a program").
Debian wants to change the default location to `/var/lib/salt/pki` (to
properly follow FHS and to allow setting StateDirectory in the salt
master systemd configuration).

Therefore introduce a `LIB_STATE_DIR` syspaths variable which defaults
to `CONFIG_DIR`, but can be individually customized.

fixes #3396
Bug-Debian: https://bugs.debian.org/698898
Signed-off-by: Benjamin Drung <benjamin.drung@ionos.com>
2022-09-29 12:52:52 -06:00
Pedro Algarvio
bf24613010
Merge freeze forward into master (#62403)
* Update versionadded from 3006 to 3005

* Add known issue about SSC 8.9.0 dependency

* Add explanation for the issue

* Update release candidate documentation

* Add clarification per Shane's review

* Add RHEL GPG key info

* Revise topic per Murphy's review

* Switch to the SaltStack ORG on quay.io

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

* Update the salt pip executable to salt-pip

* Fix pre-install and post-install scripts

Make the date display in the logs properly

* Add pyinstaller hook which pulls in all of salt and the standard library

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

* Add changelog for #62383 which fixes #62362

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

* Windows search path is different

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

* Salt should not do any logic to include/exclude requirements. That's pip's job.

Refs #62386
Fixes #62392

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

Co-authored-by: Megan Wilhite <mwilhite@vmware.com>
Co-authored-by: Alyssa Rock <alyssa.rock@gmail.com>
Co-authored-by: Twangboy <leesh@vmware.com>
2022-08-01 17:44:17 -07:00
Victor Zhestkov
83c5e0f05a suse_ip module implementation 2022-05-26 09:01:22 -07:00
Pedro Algarvio
0d16398787 Switch to proving the proper hooks to PyInstaller
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-04-08 09:14:01 -04:00
Pedro Algarvio
f112349d27 Stop stripping the requirements markers.
Fixes ``tests.pytests.scenarios.setup.test_install.test_setup_install[USE_STATIC_REQUIREMENTS=0]``

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-03-15 20:14:04 -07:00
Gareth J. Greenaway
4b2bce83b8 Deprecating and removing salt-unity. 2021-12-07 16:15:56 -05:00
Joe Eacott
8d9e40b936 restore setup.py file 2021-09-26 08:48:45 -07:00
Joe Eacott
a9e9ef7b4c keeping this 2021-09-26 08:48:45 -07:00
Pedro Algarvio
76e50885b0 Fix strings 2021-08-06 13:09:47 -07:00
twangboy
5aed369606 Update salt url, update amis for windows 2021-07-23 13:06:52 -07:00
twangboy
5b602ea1e0 Update changelog, use basename 2021-07-23 13:06:52 -07:00
twangboy
c000729155 Update OpenSSL to 1.1.1k 2021-07-23 13:06:52 -07:00
twangboy
a483b87297 Upgrade OpenSSL dlls to 1.1.1j 2021-07-23 13:06:52 -07:00
twangboy
647c1e90d3 Allow pre-commit for Python 3.8 2021-07-23 13:06:52 -07:00
twangboy
dcd1925475 Don't download OpenSSL Libs 2021-07-23 13:06:52 -07:00
David Murphy
5af99c46ff Remove check for TIAMAT_BUILD enforcing USE_STATIC_REQUIREMENTS, this is now controled by Tiamat v7.10.1 and above 2021-07-21 13:59:19 -07:00
Pedro Algarvio
248222070b Allow writing the `salt/_version.py file because we don't upload the .git` directory for CI 2021-07-12 19:07:53 -07:00
Pedro Algarvio
82c373de91 Address traceback on macOS
```
Traceback (most recent call last):
  File "setup.py", line 1448, in <module>
    setup(distclass=SaltDistribution)
  File "/Users/jenkins/setup-tests/.venv/lib/python3.7/site-packages/setuptools/__init__.py", line 153, in setup
    return distutils.core.setup(**attrs)
  File "/opt/salt/lib/python3.7/distutils/core.py", line 108, in setup
    _setup_distribution = dist = klass(attrs)
  File "setup.py", line 1068, in __init__
    self.update_metadata()
  File "setup.py", line 1074, in update_metadata
    attrvalue = getattr(self, attrname, None)
  File "setup.py", line 1182, in _property_install_requires
    install_requires += _parse_requirements_file(reqfile)
  File "setup.py", line 270, in _parse_requirements_file
    platform.python_version(), _parse_op(op), _parse_ver(ver)
  File "setup.py", line 247, in _check_ver
    return getattr(operator, "__{}__".format(op))(pyver, wanted)
  File "/opt/salt/lib/python3.7/distutils/version.py", line 46, in __eq__
    c = self._cmp(other)
  File "/opt/salt/lib/python3.7/distutils/version.py", line 337, in _cmp
    if self.version < other.version:
TypeError: '<' not supported between instances of 'str' and 'int'
```
2021-05-12 08:05:34 -04:00
Bryce Larson
bb43f4c3e1 update setup.py 2021-04-01 14:18:52 -07:00
Pedro Algarvio
16751fa002 Address Bandit's B602(subprocess_popen_with_shell_equals_true) flagged issue 2021-03-03 06:21:53 -05:00
Matthew Summers
0fe05e35d1 Fixes setup.py for OSX and WINDOWS when USE_STATIC_REQUIREMENTS=0
Fixes PR #59225

The existing tests only ran with USE_STATIC_REQUIREMENTS=1 missing the
broken code paths in setup.py
2021-01-27 17:46:28 +00:00
Pedro Algarvio
14bf175aa7
Strip out any pip flags when parsing requirements. 2020-09-30 09:31:50 +01:00
Pedro Algarvio
c3ff9de942
Allow choosing static vs base requirements.
Additionally, detect if setup is running under a tiamat build(single
binary).

If so, provide the locked requirements for linux instead of the base
requirements.
Windows and macOS already provide locked requirements, running under
pop-build or not.
2020-09-30 09:31:49 +01:00