saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-15 09:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes setup.py for OSX and WINDOWS when USE_STATIC_REQUIREMENTS=0

Browse source 
Fixes PR #59225

The existing tests only ran with USE_STATIC_REQUIREMENTS=1 missing the
broken code paths in setup.py
This commit is contained in:
Matthew Summers 2021-01-05 10:23:25 -06:00 • committed by Pedro Algarvio
parent 9173f08d72
commit 0fe05e35d1
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
setup.py
View file

@ -134,9 +134,7 @@ SALT_LINUX_LOCKED_REQS = [
)
]
SALT_OSX_REQS = SALT_BASE_REQUIREMENTS + [
os.path.abspath(SETUP_DIRNAME),
"requirements",
"darwin.txt",
os.path.join(os.path.abspath(SETUP_DIRNAME), "requirements", "darwin.txt")
]
SALT_OSX_LOCKED_REQS = [
# OSX packages already defined locked requirements
@ -150,9 +148,7 @@ SALT_OSX_LOCKED_REQS = [
)
]
SALT_WINDOWS_REQS = SALT_BASE_REQUIREMENTS + [
os.path.abspath(SETUP_DIRNAME),
"requirements",
"windows.txt",
os.path.join(os.path.abspath(SETUP_DIRNAME), "requirements", "windows.txt")
]
SALT_WINDOWS_LOCKED_REQS = [
# Windows packages already defined locked requirements