From 634c9ec1c062dff01a50a2a478719ad5cd6c6bfc Mon Sep 17 00:00:00 2001
From: Francesc Alted <francesc@blosc.org>
Date: Wed, 27 Sep 2023 06:08:04 +0200
Subject: [PATCH] Some more fixes (ext not working yet)

---
 blosc2/CMakeLists.txt | 5 +++--
 pyproject.toml        | 6 ++++--
 setup.py              | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/blosc2/CMakeLists.txt b/blosc2/CMakeLists.txt
index 1400cfa6..9e42e1bf 100644
--- a/blosc2/CMakeLists.txt
+++ b/blosc2/CMakeLists.txt
@@ -7,7 +7,6 @@ add_custom_command(
   COMMAND "${CYTHON}" "${CMAKE_CURRENT_SOURCE_DIR}/blosc2_ext.pyx" --output-file
           "${CMAKE_CURRENT_BINARY_DIR}/blosc2_ext.c")
 
-Python_add_library(blosc2_ext MODULE "${CMAKE_CURRENT_BINARY_DIR}/blosc2_ext.c" WITH_SOABI)
 
 if(USE_SYSTEM_BLOSC2)
     set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
@@ -31,5 +30,7 @@ else()
 endif()
 
 include_directories("${Python_NumPy_INCLUDE_DIRS}")
+Python_add_library(blosc2_ext MODULE "${CMAKE_CURRENT_BINARY_DIR}/blosc2_ext.c"
+                   WITH_SOABI)
 
-install(TARGETS blosc2_ext DESTINATION ${SKBUILD_PROJECT_NAME})
+install(TARGETS blosc2_ext LIBRARY DESTINATION ${SKBUILD_PROJECT_NAME})
diff --git a/pyproject.toml b/pyproject.toml
index ba2c1e79..bc38e4b2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,6 @@
 [build-system]
-requires = ["scikit-build-core", "cython", "numpy>=1.20.3", "ndindex>=1.4", "msgpack"]
+requires = ["scikit-build-core", "cython", "numpy>=1.20.3"]
+#requires = ["scikit-build-core", "cython", "oldest-supported-numpy"]
 build-backend = "scikit_build_core.build"
 
 [project]
@@ -31,6 +32,7 @@ dependencies = [
     "numpy>=1.20.3",
     "ndindex>=1.4",
     "msgpack",
+    "py-cpuinfo",
 ]
 
 [tool.scikit-build]
@@ -46,7 +48,7 @@ homepage = "https://github.com/Blosc/python-blosc2"
 documentation = "https://www.blosc.org/python-blosc2/python-blosc2.html"
 
 [tool.cibuildwheel]
-skip = "cp36-* cp37-* pp37-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux*"
+skip = "cp36-* cp37-* pp37-* cp38-* pp38-* *-musllinux*"
 
 [tool.black]
 line-length = 109
diff --git a/setup.py b/setup.py
index fb121db5..307d4b2f 100644
--- a/setup.py
+++ b/setup.py
@@ -17,4 +17,5 @@ def exclude_pkgconfig(cmake_manifest):
 setup(
     packages=["blosc2"],
     cmake_process_manifest_hook=exclude_pkgconfig,
+    # include_package_data=True,
 )