Migrate build system to scikit-build-core (#61)

ratt-ru · Oct 5, 2023 · 7fe0101 · 7fe0101
1 parent 51db1d5
commit 7fe0101
Show file tree

Hide file tree

Showing 24 changed files with 108 additions and 94 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,6 @@ set(CMAKE_JOB_POOL_COMPILE "compile")
 set(CMAKE_JOB_POOL_LINK "link")
 set(CMAKE_JOB_POOLS "compile=${ncores};link=2")
 
-set(ARCAE_LIB_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/arcae/lib)
 
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
@@ -22,13 +21,13 @@ endif(CCACHE_FOUND)
 
 include(FindPyArrow)
 include(SetupVCPKG)
-project(main CXX C)
+project(arcae CXX)
 
 include_directories(cpp)
 add_subdirectory(cpp)
 
 if(SKBUILD)
-    add_subdirectory(arcae)
+    add_subdirectory(src/arcae)
 else()
     message(WARNING "scikit-build not available, Cython extensions not built")
 endif()
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -4,6 +4,7 @@ History
 
 X.Y.Z (YYYY-MM-DD)
 ------------------
+* Migrate build system to scikit-build-core (:pr:`61`)
 * Upgrade to Cython 3 and pyarrow 13.0.0 (:pr:`60`)
 * Introduce a more canonical C++ project structure (:pr:`57`. :pr:`59`)
 * Consistently use CamelCase throughout the C++ layer (:pr:`56`)

diff --git a/README.rst b/README.rst
@@ -22,7 +22,7 @@ In the user or, even better, a virtual environment:
 .. code-block:: python
 
   $ pip install -U pip cibuildwheel
-  $ bash scripts/run_cbuildwheel.sh -p 3.8
+  $ bash scripts/run_cbuildwheel.sh -p 3.10
 
 .. warning::
   Only linux wheels are currently supported.
@@ -35,9 +35,8 @@ In the directory containing the source, setup your development environment as fo
 .. code-block:: python
 
   $ pip install -U pip virtualenv
-  $ virtualenv -p python3.8 /venv/arcaedev
+  $ virtualenv -p python3.10 /venv/arcaedev
   $ . /venv/arcaedev/bin/activate
-  # Edit pyproject.toml with instructions in https://github.com/ratt-ru/arcae/issues/52
   (arcaedev) export VCPKG_TARGET_TRIPLET=x64-linux-dynamic-cxx17-abi1-dbg
   (arcaedev) pip install -e .[test]
   (arcaedev) export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/vcpkg/installed/$VCPKG_TARGET_TRIPLET/lib

diff --git a/arcae/CMakeLists.txt b/arcae/CMakeLists.txt
diff --git a/cmake_modules/FindPyArrow.cmake b/cmake_modules/FindPyArrow.cmake
@@ -17,10 +17,13 @@ if(NOT DEFINED NUMPY_INCLUDE)
     message(FATAL_ERROR "Unable to find numpy include directory. Set NUMPY_INCLUDE")
 endif()
 
+
 if(NOT DEFINED PYARROW_INCLUDE AND DEFINED ENV{PYARROW_INCLUDE})
     set(PYARROW_INCLUDE ENV{PYARROW_INCLUDE})
 endif()
 
+execute_process(COMMAND ${Python_EXECUTABLE} -c "import pyarrow; pyarrow.create_library_symlinks()")
+
 if(NOT DEFINED PYARROW_INCLUDE AND Python_Interpreter_FOUND)
     execute_process(COMMAND ${Python_EXECUTABLE} -c "import pyarrow; print(pyarrow.get_include())"
                     OUTPUT_VARIABLE PYARROW_INCLUDE

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -19,4 +19,4 @@ target_compile_options(arcae PUBLIC "-D_GLIBCXX_USE_CXX11_ABI=1")
 set_target_properties(arcae PROPERTIES
     POSITION_INDEPENDENT_CODE 1)
 
-    install(TARGETS arcae LIBRARY DESTINATION ${ARCAE_LIB_INSTALL_PATH})
+install(TARGETS arcae LIBRARY DESTINATION arcae/lib)
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,11 +1,52 @@
+[project]
+name = "arcae"
+version = "0.1.0"
+authors = [
+    {name = "Simon Perkins", email = "[email protected]"}
+]
+description = "Arrow bindings for casacore"
+readme = {file = "README.rst", content-type = "test/rst"}
+requires_python = ">= 3.8"
+license = {file = "LICENSE"}
+classifiers = [
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python :: 3"
+]
+dependencies = [
+    "appdirs",
+    "click",
+    "rich",
+    "pyarrow == 13.0.0"
+]
+
+[project.optional-dependencies]
+dev = [
+    "black == 22.1.0",
+    "flake8 == 4.0.1",
+    "tbump"
+]
+test = [
+    "duckdb",
+    "pytest >= 7.0.0",
+    "python-casacore >= 3.5.0",
+    "requests"
+]
+
+[project.scripts]
+arcae = "arcae.applications.entrypoint:main"
+
+[project.urls]
+Repository = "https://github.com/ratt-ru/arcae"
+
 [build-system]
 requires = [
-    "setuptools",
-    "cmake>=3.18",
     "cython>=3.0.2",
-    "ninja; platform_system!='Windows'",
-    "numpy>=1.24.1,<2.0.0",
-    "requires",
-    "scikit-build>=0.16.7",
+    "scikit-build-core",
     "pyarrow == 13.0.0"]
-build-backend = "setuptools.build_meta"
+build-backend = "scikit_build_core.build"
+
+[tools.setuptools.packages]
+find = {}
+
+[tool.scikit-build]
+# build-dir = "/tmp/arcae"
diff --git a/scripts/run_cibuildwheel.sh b/scripts/run_cibuildwheel.sh
@@ -45,6 +45,7 @@ export MANYLINUX_PLATFORM=manylinux_x86_64
 export CIBW_BUILD=$CPYTHON_VERSION-$MANYLINUX_PLATFORM
 export CIBW_BUILD_FRONTEND=build
 export CIBW_BEFORE_ALL_LINUX="yum install -y zip flex bison gcc-gfortran"
+export CIBW_MANYLINUX_X86_64_IMAGE="quay.io/pypa/manylinux_2_28_x86_64"
 export VCPKG_TARGET_TRIPLET=x64-linux-dynamic-cxx17-abi1-rel
 export CIBW_ENVIRONMENT_LINUX="\
 VCPKG_DEFAULT_BINARY_CACHE=/host$VCPKG_HOST_BINARY_CACHE \

diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/src/arcae/CMakeLists.txt b/src/arcae/CMakeLists.txt
@@ -0,0 +1,46 @@
+find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
+find_package(PkgConfig REQUIRED)
+find_program(CYTHON_FOUND "cython" REQUIRED)
+
+pkg_check_modules(casacore REQUIRED IMPORTED_TARGET casacore)
+
+add_custom_command(
+    OUTPUT arrow_tables.cc
+    VERBATIM
+    COMMAND cython ${CMAKE_CURRENT_SOURCE_DIR}/arrow_tables.pyx
+            --output-file ${CMAKE_CURRENT_BINARY_DIR}/arrow_tables.cc
+            --cplus -vvv)
+
+# Check and correct Python_SOABI if it has an .so suffix
+if(${Python_SOABI} MATCHES "\\.so$")
+    string(REGEX REPLACE "\\.so$" "" Python_SOABI_FIXED "${Python_SOABI}")
+    message(STATUS "Removing extra .so from ${Python_SOABI}")
+else()
+    set(Python_SOABI_FIXED ${Python_SOABI})
+endif()
+
+message(STATUS "Python_SOABI_FIXED: ${Python_SOABI_FIXED}")
+
+python_add_library(arrow_tables MODULE arrow_tables.cc)
+set_target_properties(arrow_tables PROPERTIES OUTPUT_NAME "arrow_tables.${Python_SOABI_FIXED}")
+
+target_link_libraries(arrow_tables PUBLIC arcae PkgConfig::casacore)
+target_link_directories(arrow_tables PUBLIC ${PYARROW_LIBDIRS})
+target_include_directories(arrow_tables PUBLIC
+                            PkgConfig::casacore
+                            ${PYARROW_INCLUDE}
+                            ${NUMPY_INCLUDE}
+                            ${CMAKE_SOURCE_DIR}/cpp)
+target_compile_options(arrow_tables PUBLIC "-D_GLIBCXX_USE_CXX11_ABI=1")
+
+string(REPLACE " " ";" _PYARROW_LIBS ${PYARROW_LIBS})
+
+foreach(PYARROW_LIB ${_PYARROW_LIBS})
+    message("Linking arrow_tables against ${PYARROW_LIB}")
+    target_link_libraries(arrow_tables PUBLIC ${PYARROW_LIB})
+endforeach()
+
+set_target_properties(arrow_tables PROPERTIES
+    POSITION_INDEPENDENT_CODE 1)
+
+install(TARGETS arrow_tables LIBRARY DESTINATION arcae/lib)
diff --git a/arcae/__init__.py → src/arcae/__init__.py b/arcae/__init__.py → src/arcae/__init__.py
diff --git a/arcae/applications/__init__.py → src/arcae/applications/__init__.py b/arcae/applications/__init__.py → src/arcae/applications/__init__.py
diff --git a/arcae/applications/entrypoint.py → src/arcae/applications/entrypoint.py b/arcae/applications/entrypoint.py → src/arcae/applications/entrypoint.py
diff --git a/arcae/applications/ms_export.py → src/arcae/applications/ms_export.py b/arcae/applications/ms_export.py → src/arcae/applications/ms_export.py
diff --git a/arcae/arrow_tables.pxd → src/arcae/arrow_tables.pxd b/arcae/arrow_tables.pxd → src/arcae/arrow_tables.pxd
diff --git a/arcae/arrow_tables.pyx → src/arcae/arrow_tables.pyx b/arcae/arrow_tables.pyx → src/arcae/arrow_tables.pyx
diff --git a/arcae/config.py → src/arcae/config.py b/arcae/config.py → src/arcae/config.py
diff --git a/arcae/lib/__init__.py → src/arcae/lib/__init__.py b/arcae/lib/__init__.py → src/arcae/lib/__init__.py
diff --git a/arcae/tests/__init__.py → src/arcae/tests/__init__.py b/arcae/tests/__init__.py → src/arcae/tests/__init__.py
diff --git a/arcae/tests/conftest.py → src/arcae/tests/conftest.py b/arcae/tests/conftest.py → src/arcae/tests/conftest.py
diff --git a/arcae/tests/test_descriptor.py → src/arcae/tests/test_descriptor.py b/arcae/tests/test_descriptor.py → src/arcae/tests/test_descriptor.py
diff --git a/arcae/tests/test_pytable.py → src/arcae/tests/test_pytable.py b/arcae/tests/test_pytable.py → src/arcae/tests/test_pytable.py
diff --git a/tbump.toml b/tbump.toml
@@ -15,3 +15,7 @@ tag_template = "{new_version}"
 [[file]]
 src = "arcae/__init__.py"
 search = "__version__ = \"{current_version}\""
+
+[[file]]
+src = "pyproject.toml"
+search = "version = \"{current_version}\""