saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
113460 commits 34 branches 292 tags 803 MiB
Commit graph

453 commits

Author SHA1 Message Date
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
Pedro Algarvio
0706ce9aa5
Use the locked packaging requirements 2020-09-30 09:31:49 +01:00
Pedro Algarvio
d773dfc85f
Salt is not Py2 compatible since Sodium 2020-09-30 09:31:49 +01:00
Pedro Algarvio
9ba8caf26d
Fix duplicate console_scripts entry under windows 2020-08-20 19:31:13 +01:00
Nicole Thomas
051ca53585 Merge pull request #49949 from rares-pop/dev/iepopr/add-saltapi-in-windows-installer 
Add salt-api in windows installer
 2020-08-14 15:23:31 -07:00
Wesley Whetstone
d1726c61c3 add pyobjc back to setup.py 2020-07-14 19:21:24 -07:00
Wesley Whetstone
af280e9a38 remove py2 in macOS build script, fix python build using compiled openssl, move pyobjc back in to req.txt 2020-07-14 19:21:24 -07:00
Pedro Algarvio
d79f3e4718 Remove Sodium related deprecation warnings 
Fixes #57516

Additionally, under Python 2, show and error when salt is imported and exit on CLI usage.
 2020-07-13 16:45:02 -07:00
twangboy
b0c7a811ac Don't do build_ext on osx anymore 2020-06-05 08:30:59 -07:00
twangboy
821d0def61 Add libsodium to setup.py for Windows 2020-05-21 20:52:52 -07:00
twangboy
4b4b5a36f3 Remove msvcr from setup 
This needs to be installed as a pre-req
 2020-05-21 20:52:52 -07:00
Daniel A. Wozniak
604c6263a3 Proceed when pip not found 2020-05-17 05:17:47 -07:00
Daniel A. Wozniak
473f8907f7 Fix pre-commit 2020-05-16 07:28:31 -07:00
Daniel A. Wozniak
291bbf1433 Write _version.py file when running bdist_egg 2020-05-16 07:28:31 -07:00
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05:00
Pedro Algarvio
e6cc2a6192
Separate pyobjc requirements 2020-03-23 22:52:24 +00:00
twangboy
5851a5c2cd
Roll back changes, fix dependencies 2020-03-23 13:58:38 -06:00
Daniel Wozniak
d2a5bd8add
Merge pull request #56417 from twangboy/update_mac_build_scripts 
Update mac build scripts
 2020-03-23 11:45:33 -07:00
twangboy
02dfe4119c
Add pyobjc in its own requirements file 2020-03-20 16:44:20 -06:00
ch3ll
a8a22a4040
Ensure version.py included before we install 2020-03-19 17:23:42 -04:00
Salt Admin
461b198978 Update dependencies, remove req_ext.txt 2020-03-19 11:59:11 -06:00
ch3ll
22cccd2107
Use virtualenv test helper that already exists and fix setup.py 2020-03-16 15:33:43 -04:00
ch3ll
0cbf6d3246
Ensure SaltStackVersion attributes in _version.py correct 2020-03-16 13:52:48 -04:00
ch3ll
39cdf5382d
Include _version.py if building wheel 2020-03-16 13:52:44 -04:00
Daniel Wozniak
2f783d247e
Merge pull request #56099 from s0undt3ch/hotfix/requirements 
Fix Windows and macOS requirements handling in setup.py
 2020-03-10 17:04:36 -07:00
Pedro Algarvio
1e7bc8fc8f
Also take into account macOS requirements 2020-03-10 16:25:31 +00:00
Pedro Algarvio
7eef14952c
Also include req_win.txt 2020-03-10 16:15:46 +00:00
Ryan Addessi (raddessi)
82773a9799 Removed now-unused StrictVersion import from setup.py 2020-02-26 11:32:34 -07:00
Ryan Addessi (raddessi)
31bb0f7cd1 Changed StrictVersion checking of setuptools to LooseVersion 2020-02-20 22:02:20 -07:00
Pedro Algarvio
ac90bb4d9f
Allow pycrypto to be included in parsed requirements 2020-01-31 21:11:38 +00:00
Pedro Algarvio
f55dbb06b3
Include requirements/crypto.txt if transport is zeromq 2020-01-30 13:23:16 +00:00
Pedro Algarvio
ada6f6d96d
Switch to setuptools alone. Work around pypa/setuptools#456. 2020-01-27 23:01:17 +00:00