From ef87339298b0de70292e8ba36e46765a2624ef93 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 10 Dec 2021 14:26:17 +0530 Subject: [PATCH] Use a private copy of the bypy scripts so it doesnt conflict with the developments for the qt6 branch --- setup/installers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup/installers.py b/setup/installers.py index 64ffa9faf1..d48d7f61a9 100644 --- a/setup/installers.py +++ b/setup/installers.py @@ -13,7 +13,9 @@ d = os.path.dirname def get_paths(): base = d(d(os.path.abspath(__file__))) - bypy = os.path.join(d(base), 'bypy') + traditional_bypy_location = os.path.join(d(base), 'bypy') + compat_bypy_location = os.path.join(base, 'bypy', 'b', 'bypy-old') + bypy = compat_bypy_location if os.path.exists(compat_bypy_location) else traditional_bypy_location bypy = os.environ.get('BYPY_LOCATION', bypy) if not os.path.isdir(bypy): raise SystemExit(