Replace setuptools with meson-python

.github/workflows/python-wheels.yaml

@@ -107,9 +107,16 @@ jobs:
  fetch-tags: true
 
  - uses: actions/setup-python@v5
+ if: ${{ matrix.config.label != "windows" }}
  with:
  python-version: "3.12"
 
+ - uses: actions/setup-python@v5
+ if: ${{ matrix.config.label == "windows" }}
+ with:
+ python-version: "3.12"
+ architecture: x64
+
  - name: Install cibuildwheel
  run: python -m pip install cibuildwheel==2.21.1
 

.gitignore

@@ -33,5 +33,8 @@ __pycache__
 subprojects/*
 !subprojects/packagefiles
 !subprojects/*.wrap
+python/subprojects/*
+!python/subprojects/packagefiles
+!python/subprojects/*.wrap
 
 compile_commands.json

dev/release/rat_exclude_files.txt

@@ -15,3 +15,4 @@ dist/flatcc.c
 src/nanoarrow/ipc/flatcc_generated.h
 thirdparty/*
 python/src/nanoarrow/dlpack_abi.h
+python/subprojects/arrow-nanoarrow

dev/release/release_tools.py

@@ -84,7 +84,7 @@ def set_python_dev_version_command(args):
  _, last_dev_tag = find_last_dev_tag()
  dev_distance = len(find_commits_since(last_dev_tag))
 
- version_file = src_path("python", "src", "nanoarrow", "_static_version.py")
+ version_file = src_path("python", "meson.build")
  file_regex_replace(
  r'"([0-9]+\.[0-9]+\.[0-9]+)\.dev[0-9]+"',
  f'"\\1.dev{dev_distance}"',

dev/release/source_build.sh

@@ -43,7 +43,7 @@ main() {
  # Resolve all hard and symbolic links
  rm -rf "${base_name}.tmp/"
  mv "${base_name}/" "${base_name}.tmp/"
- cp -R -L "${base_name}.tmp" "${base_name}"
+ cp -R -d "${base_name}.tmp" "${base_name}"
  rm -rf "${base_name}.tmp/"
 
  # Create new tarball

dev/release/utils-prepare.sh

@@ -52,10 +52,10 @@ update_versions() {
  git add DESCRIPTION
  popd
 
- pushd "${NANOARROW_DIR}/python/src/nanoarrow"
- sed -i.bak -E "s/version = \".+\"/version = \"${python_version}\"/" _static_version.py
- rm _static_version.py.bak
- git add _static_version.py
+ pushd "${NANOARROW_DIR}/python/"
+ sed -i.bak -E "s/version = '.+'/version = '${python_version}'/" meson.build
+ rm meson.build.bak
+ git add meson.build
  popd
 }
 

meson.build

@@ -103,7 +103,7 @@ if get_option('ipc')
  )
  nanoarrow_ipc_dep = declare_dependency(include_directories: [incdir],
  link_with: nanoarrow_ipc_lib,
- dependencies: [nanoarrow_dep, flatcc_dep])
+ dependencies: [nanoarrow_dep])
 endif
 
 needs_device = get_option('device') or get_option('metal') or get_option('cuda')
@@ -137,6 +137,10 @@ if needs_device
  install: true,
  cpp_args: device_defines,
  )
+
+ nanoarrow_device_dep = declare_dependency(include_directories: [incdir],
+ link_with: nanoarrow_device_lib,
+ dependencies: device_deps)
 endif
 
 needs_testing = get_option('testing') or get_option('tests')

python/MANIFEST.in

@@ -20,5 +20,6 @@ recursive-include src/nanoarrow *.pxd
 recursive-include src/nanoarrow *.h
 
 exclude bootstrap.py
+exclude generate_dist.py
 exclude src/nanoarrow/*.c
 recursive-exclude src/nanoarrow *.o *.so

python/bootstrap.py

@@ -58,7 +58,9 @@ def generate_pxd(self, file_in, file_out):
  output.write(header.encode("UTF-8"))
 
  output.write(
- f'\ncdef extern from "{file_in_name}" nogil:\n'.encode("UTF-8")
+ f'\ncdef extern from "nanoarrow/{file_in_name}" nogil:\n'.encode(
+ "UTF-8"
+ )
  )
 
  # A few things we add in manually
@@ -228,7 +230,9 @@ def _write_defs(self, output):
 # strictly necessary for things like installing from GitHub.
 def copy_or_generate_nanoarrow_c():
  this_dir = pathlib.Path(__file__).parent.resolve()
- source_dir = this_dir.parent
+ subproj_dir = this_dir / "subprojects"
+ source_dir = subproj_dir / "arrow-nanoarrow"
+
  vendor_dir = this_dir / "vendor"
 
  vendored_files = [
@@ -244,16 +248,6 @@ def copy_or_generate_nanoarrow_c():
  for f in dst.values():
  f.unlink(missing_ok=True)
 
- is_cmake_dir = (source_dir / "CMakeLists.txt").exists()
- is_in_nanoarrow_repo = (
- is_cmake_dir and (source_dir / "src" / "nanoarrow" / "nanoarrow.h").exists()
- )
-
- if not is_in_nanoarrow_repo:
- raise ValueError(
- "Attempt to build source distribution outside the nanoarrow repo"
- )
-
  vendor_dir.mkdir(exist_ok=True)
  subprocess.run(
  [

python/generate_dist.py

@@ -0,0 +1,53 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import os
+import pathlib
+import shutil
+
+
+def main():
+ src_dir = pathlib.Path(os.environ["MESON_SOURCE_ROOT"]).parent.resolve()
+ dist_dir = pathlib.Path(os.environ["MESON_DIST_ROOT"]).resolve()
+ subproj_dir = dist_dir / "subprojects" / "arrow-nanoarrow"
+
+ if subproj_dir.is_symlink():
+ subproj_dir.unlink()
+
+ subproj_dir.mkdir()
+ shutil.copy(src_dir / "meson.build", subproj_dir / "meson.build")
+ shutil.copy(src_dir / "meson.options", subproj_dir / "meson.options")
+
+ subproj_subproj_dir = subproj_dir / "subprojects"
+ subproj_subproj_dir.mkdir()
+ for f in (src_dir / "subprojects").glob("*.wrap"):
+ shutil.copy(f, subproj_subproj_dir / f.name)
+
+ target_src_dir = subproj_dir / "src"
+ shutil.copytree(src_dir / "src", target_src_dir)
+
+ # this files are only needed by bootstrap.py
+ shutil.copy(src_dir / "CMakeLists.txt", subproj_dir / "CMakeLists.txt")
+ subproj_ci_scripts_dir = subproj_dir / "ci" / "scripts"
+ subproj_ci_scripts_dir.mkdir(parents=True)
+ shutil.copy(
+ src_dir / "ci" / "scripts" / "bundle.py", subproj_ci_scripts_dir / "bundle.py"
+ )
+
+
+if __name__ == "__main__":
+ main()

python/src/nanoarrow/_static_version.py → python/meson.build

@@ -14,12 +14,24 @@
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
-# This file is part of 'miniver': https://github.com/jbweston/miniver
 
-# Replaced by version-bumping scripts at release time
-version = "0.7.0.dev0"
+project(
+ 'nanoarrow',
+ 'cpp', 'cython',
+ version: '0.6.0.dev0', # TODO: do we need git archive support?
+ license: 'Apache-2.0',
+ meson_version: '>=1.2.0',
+ default_options: [
+ 'warning_level=2',
+ 'cpp_std=c++17',
+ 'default_library=static',
+ # We need to set these options at the project default_option level
+ # due to https://github.com/mesonbuild/meson/issues/6728
+ 'arrow-nanoarrow:ipc=true',
+ 'arrow-nanoarrow:device=true',
+ ],
+)
+
+subdir('src/nanoarrow')
 
-# These values are only set if the distribution was created with 'git archive'
-refnames = "$Format:%D$"
-git_hash = "$Format:%h$"
+meson.add_dist_script('python', meson.current_source_dir() / 'generate_dist.py')

python/pyproject.toml

@@ -38,7 +38,11 @@ Changelog = "https://github.com/apache/arrow-nanoarrow/blob/main/CHANGELOG.md"
 
 [build-system]
 requires = [
- "setuptools >= 61.0.0",
+ "meson-python",
  "Cython"
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "mesonpy"
+
+[tool.meson-python.args]
+install = ['--skip-subprojects']
+dist = ['--include-subprojects']

python/src/nanoarrow/__init__.py

@@ -24,6 +24,8 @@
 Arrow C Data and Arrow C Stream interfaces.
 """
 
+import importlib.metadata
+
 from nanoarrow._utils import c_version
 from nanoarrow.c_array import c_array_from_buffers, c_array
 from nanoarrow.c_array_stream import c_array_stream
@@ -75,7 +77,8 @@
 from nanoarrow.array import array, Array
 from nanoarrow.array_stream import ArrayStream
 from nanoarrow.visitor import nulls_as_sentinel, nulls_forbid, nulls_separate
-from nanoarrow._version import __version__ # noqa: F401
+
+__version__ = importlib.metadata.version("nanoarrow")
 
 # Helps Sphinx automatically populate an API reference section
 __all__ = [