Skip to content

Commit 7d70fe7

Browse files
timkpainetimkpaine
authored
Merge branch 'main' into tkp/async
2 parents ed71f55 + 165e1df commit 7d70fe7

41 files changed

Lines changed: 6855 additions & 231 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -295,28 +295,28 @@ jobs:
295295
run: make dist-check
296296

297297
- name: Upload Wheel
298-
uses: actions/upload-artifact@v6
298+
uses: actions/upload-artifact@v7
299299
with:
300300
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.10
301301
path: dist/*.whl
302302
if: ${{ matrix.cibuildwheel == 'cp310' }}
303303

304304
- name: Upload Wheel
305-
uses: actions/upload-artifact@v6
305+
uses: actions/upload-artifact@v7
306306
with:
307307
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.11
308308
path: dist/*.whl
309309
if: ${{ matrix.cibuildwheel == 'cp311' }}
310310

311311
- name: Upload Wheel
312-
uses: actions/upload-artifact@v6
312+
uses: actions/upload-artifact@v7
313313
with:
314314
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.12
315315
path: dist/*.whl
316316
if: ${{ matrix.cibuildwheel == 'cp312' }}
317317

318318
- name: Upload Wheel
319-
uses: actions/upload-artifact@v6
319+
uses: actions/upload-artifact@v7
320320
with:
321321
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.13
322322
path: dist/*.whl
@@ -377,7 +377,7 @@ jobs:
377377
run: make dist-check
378378

379379
- name: Upload SDist
380-
uses: actions/upload-artifact@v6
380+
uses: actions/upload-artifact@v7
381381
with:
382382
name: csp-sdist
383383
path: dist/*.tar.gz
@@ -462,7 +462,7 @@ jobs:
462462
run: make requirements
463463

464464
- name: Download wheel
465-
uses: actions/download-artifact@v7
465+
uses: actions/download-artifact@v8
466466
with:
467467
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
468468

@@ -573,7 +573,7 @@ jobs:
573573
- name: Install requirements
574574
run: sudo make dependencies-debian
575575

576-
- uses: actions/download-artifact@v7
576+
- uses: actions/download-artifact@v8
577577
with:
578578
name: csp-sdist
579579
path: dist/
@@ -657,7 +657,7 @@ jobs:
657657
run: sudo apt-get install graphviz
658658

659659
- name: Download wheel
660-
uses: actions/download-artifact@v7
660+
uses: actions/download-artifact@v8
661661
with:
662662
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
663663

@@ -737,7 +737,7 @@ jobs:
737737

738738
steps:
739739
- name: Download wheels and sdist
740-
uses: actions/download-artifact@v7
740+
uses: actions/download-artifact@v8
741741
with:
742742
name:
743743
merge-multiple: true

‎.github/workflows/conda.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- name: Checkout
7979
uses: actions/checkout@v6
8080

81-
- uses: mamba-org/setup-micromamba@v2
81+
- uses: mamba-org/setup-micromamba@v3
8282
with:
8383
micromamba-version: '2.3.2-0'
8484
environment-file: conda/dev-environment-unix.yml
@@ -89,7 +89,7 @@ jobs:
8989
post-cleanup: 'all'
9090
if: ${{ runner.os != 'Windows' }}
9191

92-
- uses: mamba-org/setup-micromamba@v2
92+
- uses: mamba-org/setup-micromamba@v3
9393
with:
9494
micromamba-version: '2.3.2-0'
9595
environment-file: conda/dev-environment-win.yml

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Project Configuration #
33
#########################
44
cmake_minimum_required(VERSION 3.20.0)
5-
project(csp VERSION "0.14.0")
5+
project(csp VERSION "0.15.0")
66
set(CMAKE_CXX_STANDARD 20)
77

88
###################################################################################################################################################

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,10 @@ endif
207207

208208
dependencies-mac: ## install dependencies for mac
209209
HOMEBREW_NO_AUTO_UPDATE=1 brew bundle install
210+
brew tap-new local/old || true
211+
brew extract --version=2.72 autoconf local/old
212+
brew install local/old/autoconf@2.72
213+
brew unlink autoconf && brew link --force autoconf@2.72
210214
brew unlink bison flex && brew link --force bison flex
211215

212216
dependencies-debian: ## install dependencies for linux - note that zip is needed by bootstrap_vcpkg.sh, do not remove

‎ci/scripts/requirements.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ def deps():
99
return requires + develop
1010

1111
def main():
12-
os.system("python -m pip install toml")
13-
os.system("python -m pip install " + " ".join(f'"{_}"' for _ in deps()))
12+
ret = os.system("python -m pip install --prefer-binary toml")
13+
if ret != 0:
14+
raise ValueError("Python requirement install failed: see output for error")
15+
ret = os.system("python -m pip install --prefer-binary " + " ".join(f'"{_}"' for _ in deps()))
16+
if ret != 0:
17+
raise ValueError("Python requirement install failed: see output for error")
1418

1519

1620
if __name__ == "__main__":

‎cpp/cmake/modules/FindDepsArrowAdapter.cmake‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,25 @@ cmake_minimum_required(VERSION 3.7.2)
33
# ARROW
44
find_package(Arrow REQUIRED)
55
include_directories(${ARROW_INCLUDE_DIR})
6+
7+
# Resolve Arrow link targets based on platform and vcpkg configuration.
8+
# Sets CSP_ARROW_LINK_LIBS for use in target_link_libraries().
9+
# On Windows with vcpkg, also applies the ws2_32.dll fix and defines ARROW_STATIC.
10+
if(WIN32)
11+
if(CSP_USE_VCPKG)
12+
set(CSP_ARROW_LINK_LIBS Arrow::arrow_static)
13+
add_compile_definitions(ARROW_STATIC)
14+
else()
15+
# Until we manage to get the fix for ws2_32.dll in arrow-16 into conda, manually fix the error here
16+
get_target_property(LINK_LIBS Arrow::arrow_shared INTERFACE_LINK_LIBRARIES)
17+
string(REPLACE "ws2_32.dll" "ws2_32" FIXED_LINK_LIBS "${LINK_LIBS}")
18+
set_target_properties(Arrow::arrow_shared PROPERTIES INTERFACE_LINK_LIBRARIES "${FIXED_LINK_LIBS}")
19+
set(CSP_ARROW_LINK_LIBS arrow_shared)
20+
endif()
21+
else()
22+
if(CSP_USE_VCPKG)
23+
set(CSP_ARROW_LINK_LIBS arrow_static)
24+
else()
25+
set(CSP_ARROW_LINK_LIBS arrow)
26+
endif()
27+
endif()

‎cpp/csp/adapters/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ if(CSP_BUILD_KAFKA_ADAPTER)
33
add_subdirectory(kafka)
44
endif()
55

6+
if(CSP_BUILD_ARROW_ADAPTER)
7+
add_subdirectory(arrow)
8+
endif()
9+
610
if(CSP_BUILD_PARQUET_ADAPTER)
711
add_subdirectory(parquet)
812
endif()

0 commit comments

Comments
 (0)