From 03e40911fda2831149843d8e5ed24adbf121b19c Mon Sep 17 00:00:00 2001 From: Ben Jeffery Date: Thu, 27 Jun 2024 01:57:47 +0100 Subject: [PATCH] Remove numpy build cludge --- .github/workflows/docker/shared.env | 2 +- python/setup.py | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/docker/shared.env b/.github/workflows/docker/shared.env index 3f299243a5..c10e471e72 100644 --- a/.github/workflows/docker/shared.env +++ b/.github/workflows/docker/shared.env @@ -1,6 +1,6 @@ PYTHON_VERSIONS=( + cp312-cp312 cp311-cp311 cp310-cp310 cp39-cp39 - cp38-cp38 ) diff --git a/python/setup.py b/python/setup.py index 1d9e932140..51330bacb9 100644 --- a/python/setup.py +++ b/python/setup.py @@ -3,22 +3,10 @@ from setuptools import Extension from setuptools import setup -from setuptools.command.build_ext import build_ext IS_WINDOWS = platform.system() == "Windows" -class local_build_ext(build_ext): - def finalize_options(self): - build_ext.finalize_options(self) - import builtins - - builtins.__NUMPY_SETUP__ = False - import numpy - - self.include_dirs.append(numpy.get_include()) - - libdir = "lib" kastore_dir = os.path.join(libdir, "subprojects", "kastore") tsk_source_files = [ @@ -53,5 +41,4 @@ def finalize_options(self): setup( ext_modules=[_tskit_module], - cmdclass={"build_ext": local_build_ext}, )