From 8c4bbe13c8fe0994216261e96ce36bf11cd2ef00 Mon Sep 17 00:00:00 2001 From: Serguei Ossokine Date: Thu, 5 Oct 2023 10:45:19 +0200 Subject: [PATCH] Progress towards Python 3.12 support --- gsl_dist/array_includes.py | 8 ++------ gsl_dist/gsl_Extension.py | 8 +------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/gsl_dist/array_includes.py b/gsl_dist/array_includes.py index 76d4975..c1825e5 100644 --- a/gsl_dist/array_includes.py +++ b/gsl_dist/array_includes.py @@ -1,8 +1,4 @@ -""" - - WARNING: File Generated during build. DO NOT MODIFY!!! - """ +import numpy as np array_include_dirs = [] -from numpy.distutils.misc_util import get_numpy_include_dirs -array_include_dirs = get_numpy_include_dirs() +array_include_dirs.append(np.get_include()) diff --git a/gsl_dist/gsl_Extension.py b/gsl_dist/gsl_Extension.py index b791227..98ce7ff 100644 --- a/gsl_dist/gsl_Extension.py +++ b/gsl_dist/gsl_Extension.py @@ -16,7 +16,6 @@ import re import string import types -import imp from sys import argv,version_info from gsl_Location import gsl_Location @@ -108,12 +107,7 @@ def __init__(self, name, sources, # test if Numeric module is available if define_macros is None: define_macros=[] - try: - imp.find_module("Numeric") - define_macros = define_macros + [("NUMERIC",1),] - except ImportError: - define_macros = define_macros + [("NUMERIC",0), ] - + define_macros = define_macros + [("NUMERIC",0), ] if undef_macros == None: undef_macros = [] if 'NDEBUG' not in undef_macros: