Skip to content

Commit

Permalink
Revert "Replace meson with cmake"
Browse files Browse the repository at this point in the history
This reverts commit d8ddf08.
  • Loading branch information
WillAyd committed Aug 21, 2024
1 parent 739bc60 commit 294cf2a
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 58 deletions.
36 changes: 0 additions & 36 deletions CMakeLists.txt

This file was deleted.

1 change: 1 addition & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ project(
py = import('python').find_installation()
nanoarrow_dep = dependency(
'nanoarrow',
default_options: ['default_library=static'],
)
nanobind_dep = dependency('nanobind')

Expand Down
28 changes: 7 additions & 21 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[build-system]
requires = [
"scikit-build-core",
"nanobind",
'meson-python',
'meson',
'cmake', # for nanobind
'wheel',
]
build-backend = "scikit_build_core.build"

build-backend= 'mesonpy'

[project]
name = 'capsule_bug'
Expand Down Expand Up @@ -34,21 +37,4 @@ build = "cp39-*64 cp310-*64 cp311-*64 cp312-*64"
skip = "*musllinux*"

test-command = "python -m pytest {project}/tests"
test-requires = ["pytest", "pyarrow"]

[tool.cibuildwheel.linux]
repair-wheel-command = """
auditwheel repair -w {dest_dir} {wheel}
"""

[tool.cibuildwheel.macos]
# we do not want delocate to relocate the tableauhyperapi.lib as our CMake
# config already handles that, and the tableauhyperapi.lib necessicates
# the hyper bin being relative to it, which delocate does not know about
repair-wheel-command = """
delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
"""

[tool.cibuildwheel.windows]
before-build = "python -m pip install delvewheel"
repair-wheel-command = "python -m delvewheel repair -v --add-path C:/Windows/System32 -w {dest_dir} {wheel}"
test-requires = ["pytest", "pyarrow"]
8 changes: 8 additions & 0 deletions subprojects/nanoarrow.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[wrap-file]
directory = arrow-nanoarrow-793590e45abfefa93f9fd1447b4b5d98266ccfca
source_url = https://github.com/apache/arrow-nanoarrow/archive/793590e45abfefa93f9fd1447b4b5d98266ccfca.tar.gz
source_filename = apache-arrow-nanoarrow-793590e45abfefa93f9fd1447b4b5d98266ccfca.tar.gz
source_hash = fdb238ae7b2ce24d0bbbbf795d0b2babc4c0c0eb0b3ce158c9fe7d109c00e67a

[provide]
nanoarrow = nanoarrow_dep
9 changes: 9 additions & 0 deletions subprojects/nanobind.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[wrap-git]
method = cmake
url = https://github.com/wjakob/nanobind/
revision = v2.0.0
depth = 1
clone-recursive = true

[provide]
nanobind = nanobind_static_dep
2 changes: 1 addition & 1 deletion tests/test_bug.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pyarrow as pa

from capsule_bug import capsule_bug
import capsule_bug

def test_bug():
schema = pa.schema([("col", pa.decimal128(38, 10))])
Expand Down

0 comments on commit 294cf2a

Please sign in to comment.