From 9a77a819635a355dfee5805b5c87b7a6be219037 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Jul 2022 15:32:55 -0700 Subject: [PATCH 1/2] sage.env.sage_include_directories: Do not append distutils.sysconfig.get_python_inc() --- src/sage/env.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/sage/env.py b/src/sage/env.py index 911f34b1bc6..0542ff4471b 100644 --- a/src/sage/env.py +++ b/src/sage/env.py @@ -383,12 +383,9 @@ def sage_include_directories(use_sources=False): sage: any(os.path.isfile(os.path.join(d, file)) for d in dirs) True """ - import distutils.sysconfig - TOP = SAGE_SRC if use_sources else SAGE_LIB - dirs = [TOP, - distutils.sysconfig.get_python_inc()] + dirs = [TOP] try: import numpy dirs.insert(1, numpy.get_include()) From e2688ef47fac633e5f5a299106e807e23f942d28 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Jul 2022 16:21:53 -0700 Subject: [PATCH 2/2] sage.env.sage_include_directories: Append sysconfig variable INCLUDEPY --- src/sage/env.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/sage/env.py b/src/sage/env.py index 0542ff4471b..e71e625308b 100644 --- a/src/sage/env.py +++ b/src/sage/env.py @@ -383,14 +383,20 @@ def sage_include_directories(use_sources=False): sage: any(os.path.isfile(os.path.join(d, file)) for d in dirs) True """ - TOP = SAGE_SRC if use_sources else SAGE_LIB - - dirs = [TOP] + if use_sources: + dirs = [SAGE_SRC] + else: + import sage + dirs = [os.path.dirname(directory) + for directory in sage.__path__] try: import numpy - dirs.insert(1, numpy.get_include()) + dirs.append(numpy.get_include()) except ModuleNotFoundError: pass + + dirs.append(sysconfig.get_config_var('INCLUDEPY')) + return dirs def get_cblas_pc_module_name() -> str: