From 0fe05e35d1cf98d17594185f38e6a1695d792269 Mon Sep 17 00:00:00 2001 From: Matthew Summers Date: Tue, 5 Jan 2021 10:23:25 -0600 Subject: [PATCH] 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 --- setup.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 08c84344eaa..a5663305b2e 100755 --- a/setup.py +++ b/setup.py @@ -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