Meson configuration cleanup

apache · Oct 3, 2024 · 5a77ae0 · 5a77ae0
1 parent 7065fc7
commit 5a77ae0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/python/src/nanoarrow/__init__.py b/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__ = [

diff --git a/python/src/nanoarrow/meson.build b/python/src/nanoarrow/meson.build
@@ -65,7 +65,7 @@ foreach cyf : cyfiles
   cyfile_deps = [nanoarrow_c_dep, nanoarrow_dep]
 
   stem = fs.stem(cyf)
-  if stem == '_device'
+  if stem in ['_array', '_device']
     cyfile_deps += [nanoarrow_device_dep]
   elif stem == '_ipc_lib'
     cyfile_deps += [nanoarrow_ipc_dep]
@@ -76,12 +76,7 @@ foreach cyf : cyfiles
       sources: [cyf],
       cython_args: cython_args,
       include_directories: nanoarrow_src_dir,
-      dependencies: [
-          nanoarrow_c_dep,
-          nanoarrow_dep,
-          nanoarrow_ipc_dep,
-          nanoarrow_device_dep,
-      ],
+      dependencies: cyfile_deps,
       subdir: 'nanoarrow',
       install: true,
   )
@@ -100,8 +95,6 @@ py_sources = [
     'iterator.py',
     '_repr_utils.py',
     'schema.py',
-    '_static_version.py',
-    '_version.py',
     'visitor.py',
 ]