Skip to content

Commit 85f625c

Browse files
committed
fix editable install collisions
1 parent 47b4d30 commit 85f625c

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

docs/source/developers/python/building.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ Windows tab under the :ref:`pyarrow_build_section` section.
204204
205205
$ export ARROW_HOME=$(pwd)/dist
206206
$ export LD_LIBRARY_PATH=$(pwd)/dist/lib:$LD_LIBRARY_PATH
207+
$ export DYLD_LIBRARY_PATH=$(pwd)/dist/lib:$DYLD_LIBRARY_PATH
207208
$ export CMAKE_PREFIX_PATH=$ARROW_HOME:$CMAKE_PREFIX_PATH
208209
209210
.. tab-item:: Windows

python/CMakeLists.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,6 +927,11 @@ if(CYTHON_VERSION VERSION_GREATER_EQUAL "3.1.0a0")
927927
list(APPEND CYTHON_FLAGS "-Xfreethreading_compatible=True")
928928
endif()
929929

930+
set(PYARROW_EDITABLE_BUILD OFF)
931+
if(SKBUILD_STATE STREQUAL "editable")
932+
set(PYARROW_EDITABLE_BUILD ON)
933+
endif()
934+
930935
foreach(module ${CYTHON_EXTENSIONS})
931936
string(REPLACE "." ";" directories ${module})
932937
list(GET directories -1 module_name)
@@ -968,6 +973,9 @@ foreach(module ${CYTHON_EXTENSIONS})
968973
continue()
969974
endif()
970975
endif()
976+
if(PYARROW_EDITABLE_BUILD AND module_name STREQUAL "lib" AND output STREQUAL "lib.h")
977+
continue()
978+
endif()
971979
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${output} DESTINATION ".")
972980
endforeach()
973981
endforeach()
@@ -1033,10 +1041,15 @@ endif()
10331041
# alongside the package so type checkers can find them (PEP 561).
10341042
set(PYARROW_STUBS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/pyarrow-stubs/pyarrow")
10351043
if(EXISTS "${PYARROW_STUBS_SOURCE_DIR}")
1044+
set(PYARROW_STUB_INSTALL_ARGS
1045+
FILES_MATCHING
1046+
PATTERN "*.pyi")
1047+
if(PYARROW_EDITABLE_BUILD)
1048+
list(APPEND PYARROW_STUB_INSTALL_ARGS PATTERN "lib.pyi" EXCLUDE)
1049+
endif()
10361050
install(DIRECTORY "${PYARROW_STUBS_SOURCE_DIR}/"
10371051
DESTINATION "."
1038-
FILES_MATCHING
1039-
PATTERN "*.pyi")
1052+
${PYARROW_STUB_INSTALL_ARGS})
10401053

10411054
if(PYARROW_REQUIRE_STUB_DOCSTRINGS)
10421055
install(CODE "

0 commit comments

Comments
 (0)