Skip to content

Commit 7d9af32

Browse files
timkpainetimkpaine
authored
Merge branch 'main' into dependabot/pip/pyarrow-gte-15-and-lt-25
2 parents 5d6487a + 4fc832c commit 7d9af32

92 files changed

Lines changed: 9180 additions & 5335 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
* @robambalu @AdamGlustein @svatasoiu @alexddobkin
33

44
# Packaging code
5-
conda @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
6-
CMakeLists.txt @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
7-
Makefile @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
8-
MANIFEST.in @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
9-
pyproject.toml @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
10-
setup.py @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
11-
vcpkg.json @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
5+
conda @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
6+
CMakeLists.txt @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
7+
Makefile @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
8+
MANIFEST.in @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
9+
pyproject.toml @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
10+
setup.py @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
11+
vcpkg.json @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
1212

1313
# CI/CD
14-
.github @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
15-
ci @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
14+
.github @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
15+
ci @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @arhamchopra
1616

1717
# Administrative
1818
.github/CODEOWNERS @robambalu

‎.github/actions/setup-caches/action.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
steps:
1313
# Setup CCache
1414
- name: Setup ccache
15-
uses: hendrikmuhs/ccache-action@v1.2.12
15+
uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23
1616
with:
1717
key: ccache-${{ runner.os }}-${{ runner.arch }}
1818
append-timestamp: false # avoid excess caching
@@ -35,7 +35,7 @@ runs:
3535
if: ${{ runner.os == 'Linux' && inputs.vcpkg == 'true' }}
3636

3737
- name: Setup vcpkg cache (Linux)
38-
uses: actions/cache@v4
38+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
3939
with:
4040
path: |
4141
/home/runner/vcpkg_cache
@@ -54,7 +54,7 @@ runs:
5454
if: ${{ runner.os == 'macOS' && inputs.vcpkg == 'true' }}
5555

5656
- name: Setup vcpkg cache (macOS)
57-
uses: actions/cache@v4
57+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
5858
with:
5959
path: |
6060
/Users/runner/vcpkg_cache
@@ -73,11 +73,11 @@ runs:
7373
if: ${{ runner.os == 'Windows' && inputs.vcpkg == 'true'}}
7474

7575
- name: Setup vcpkg cache (Windows)
76-
uses: actions/cache@v4
76+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7777
with:
7878
path: |
7979
C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_cache
8080
C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_download_cache
81-
key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json', 'vcpkg/versions/baseline.json') }}
82-
restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}-
81+
key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json', 'vcpkg/versions/baseline.json') }}-${{ github.run_id }}
82+
restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json', 'vcpkg/versions/baseline.json') }}-
8383
if: ${{ runner.os == 'Windows' && inputs.vcpkg == 'true'}}

‎.github/actions/setup-dependencies/action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ inputs:
1111
- 'cp311'
1212
- 'cp312'
1313
- 'cp313'
14+
- 'cp314'
1415
default: 'cp311'
1516

1617
runs:

‎.github/actions/setup-python/action.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ inputs:
1111
- '3.11'
1212
- '3.12'
1313
- '3.13'
14+
- '3.14'
1415
default: '3.11'
1516
cibuildwheel:
1617
type: boolean
@@ -21,15 +22,15 @@ runs:
2122
using: 'composite'
2223
steps:
2324
- name: Setup pip cache
24-
uses: actions/cache@v4
25+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
2526
with:
2627
path: ~/.cache/pip
2728
key: pip-${{ runner.os }}-${{ hashFiles('pyproject.toml') }}
2829
restore-keys: |
2930
pip-${{ runner.os }}
3031
3132
- name: Set up Python ${{ inputs.version }}
32-
uses: actions/setup-python@v5
33+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
3334
with:
3435
python-version: ${{ inputs.version }}
3536
# TODO consider re-adding this and/or removing the pip cache
@@ -38,5 +39,5 @@ runs:
3839

3940
- name: Install cibuildwheel and twine
4041
shell: bash
41-
run: pip install cibuildwheel==3.2 twine
42+
run: pip install cibuildwheel==3.2.1 twine
4243
if: ${{ inputs.cibuildwheel == 'true' }}

‎.github/workflows/build.yml‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
FULL_RUN: ${{ steps.setuppush.outputs.FULL_RUN || steps.setuppr.outputs.FULL_RUN || steps.setupmanual.outputs.FULL_RUN || steps.setupschedule.outputs.FULL_RUN }}
7373
steps:
7474
- name: Checkout
75-
uses: actions/checkout@v6
75+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7676
with:
7777
# for pull_request so we can do HEAD^2
7878
fetch-depth: 2
@@ -159,7 +159,7 @@ jobs:
159159

160160
steps:
161161
- name: Checkout
162-
uses: actions/checkout@v6
162+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
163163
with:
164164
submodules: recursive
165165

@@ -204,6 +204,7 @@ jobs:
204204
- "cp311"
205205
- "cp312"
206206
- "cp313"
207+
- "cp314"
207208
is-full-run:
208209
- ${{ needs.initialize.outputs.FULL_RUN == 'true' }}
209210
exclude:
@@ -239,7 +240,7 @@ jobs:
239240

240241
steps:
241242
- name: Checkout
242-
uses: actions/checkout@v6
243+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
243244
with:
244245
submodules: recursive
245246
fetch-depth: 0
@@ -295,33 +296,40 @@ jobs:
295296
run: make dist-check
296297

297298
- name: Upload Wheel
298-
uses: actions/upload-artifact@v7
299+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
299300
with:
300301
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.10
301302
path: dist/*.whl
302303
if: ${{ matrix.cibuildwheel == 'cp310' }}
303304

304305
- name: Upload Wheel
305-
uses: actions/upload-artifact@v7
306+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
306307
with:
307308
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.11
308309
path: dist/*.whl
309310
if: ${{ matrix.cibuildwheel == 'cp311' }}
310311

311312
- name: Upload Wheel
312-
uses: actions/upload-artifact@v7
313+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
313314
with:
314315
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.12
315316
path: dist/*.whl
316317
if: ${{ matrix.cibuildwheel == 'cp312' }}
317318

318319
- name: Upload Wheel
319-
uses: actions/upload-artifact@v7
320+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
320321
with:
321322
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.13
322323
path: dist/*.whl
323324
if: ${{ matrix.cibuildwheel == 'cp313' }}
324325

326+
- name: Upload Wheel
327+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
328+
with:
329+
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-3.14
330+
path: dist/*.whl
331+
if: ${{ matrix.cibuildwheel == 'cp314' }}
332+
325333
################################################################
326334
#..............................................................#
327335
#..|########\..|##|..|##|..|########|..|##|........|#######\...#
@@ -358,7 +366,7 @@ jobs:
358366

359367
steps:
360368
- name: Checkout
361-
uses: actions/checkout@v6
369+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
362370
with:
363371
submodules: recursive
364372

@@ -377,7 +385,7 @@ jobs:
377385
run: make dist-check
378386

379387
- name: Upload SDist
380-
uses: actions/upload-artifact@v7
388+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
381389
with:
382390
name: csp-sdist
383391
path: dist/*.tar.gz
@@ -411,13 +419,14 @@ jobs:
411419
- 3.11
412420
- 3.12
413421
- 3.13
422+
- 3.14
414423
is-full-run:
415424
- ${{ needs.initialize.outputs.FULL_RUN == 'true' }}
416425
exclude:
417426
##############################################
418427
# Things to exclude if not a full matrix run #
419428
##############################################
420-
429+
421430
# Avoid extra resources for windows build
422431
- is-full-run: false
423432
os: windows-2022
@@ -448,7 +457,7 @@ jobs:
448457

449458
steps:
450459
- name: Checkout
451-
uses: actions/checkout@v6
460+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
452461
with:
453462
submodules: recursive
454463

@@ -462,7 +471,7 @@ jobs:
462471
run: make requirements
463472

464473
- name: Download wheel
465-
uses: actions/download-artifact@v8
474+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
466475
with:
467476
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
468477

@@ -554,7 +563,7 @@ jobs:
554563

555564
steps:
556565
- name: Checkout
557-
uses: actions/checkout@v6
566+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
558567
with:
559568
submodules: recursive
560569

@@ -573,7 +582,7 @@ jobs:
573582
- name: Install requirements
574583
run: sudo make dependencies-debian
575584

576-
- uses: actions/download-artifact@v8
585+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
577586
with:
578587
name: csp-sdist
579588
path: dist/
@@ -638,7 +647,7 @@ jobs:
638647

639648
steps:
640649
- name: Checkout
641-
uses: actions/checkout@v6
650+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
642651
with:
643652
submodules: recursive
644653
fetch-depth: 0
@@ -657,7 +666,7 @@ jobs:
657666
run: sudo apt-get install graphviz
658667

659668
- name: Download wheel
660-
uses: actions/download-artifact@v8
669+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
661670
with:
662671
name: csp-dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
663672

@@ -737,7 +746,7 @@ jobs:
737746

738747
steps:
739748
- name: Download wheels and sdist
740-
uses: actions/download-artifact@v8
749+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
741750
with:
742751
name:
743752
merge-multiple: true
@@ -747,7 +756,7 @@ jobs:
747756
run: ls -R ./dist
748757

749758
- name: Publish to github releases
750-
uses: softprops/action-gh-release@v2
759+
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
751760
with:
752761
draft: true
753762
generate_release_notes: true

‎.github/workflows/conda.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ jobs:
7676
runs-on: ${{ matrix.os }}
7777
steps:
7878
- name: Checkout
79-
uses: actions/checkout@v6
79+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
8080

81-
- uses: mamba-org/setup-micromamba@v2
81+
- uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
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@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
9393
with:
9494
micromamba-version: '2.3.2-0'
9595
environment-file: conda/dev-environment-win.yml

‎.github/workflows/wiki-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v6
33+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3434
with:
3535
submodules: recursive
3636

‎.github/workflows/wiki-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2525

2626
- name: Upload Documentation to Wiki
27-
uses: Andrew-Chen-Wang/github-wiki-action@v5
27+
uses: Andrew-Chen-Wang/github-wiki-action@1bbb4280446f9630e8e21a18012cbacf3b0f992e # v5.0.6
2828
with:
2929
path: docs/wiki

‎CMakeLists.txt‎

Lines changed: 7 additions & 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.15.0")
5+
project(csp VERSION "0.18.0")
66
set(CMAKE_CXX_STANDARD 20)
77

88
###################################################################################################################################################
@@ -74,6 +74,12 @@ option(CSP_ENABLE_UBSAN "Build with undefined behavior sanitizer" OFF)
7474
option(CSP_BUILD_KAFKA_ADAPTER "Build kafka adapter" ON)
7575
option(CSP_BUILD_ARROW_ADAPTER "Build arrow adapter" ON)
7676
option(CSP_BUILD_PARQUET_ADAPTER "Build parquet adapter" ON)
77+
78+
# Parquet adapter depends on arrow adapter
79+
if(CSP_BUILD_PARQUET_ADAPTER AND NOT CSP_BUILD_ARROW_ADAPTER)
80+
message(STATUS "Enabling arrow adapter (required by parquet adapter)")
81+
set(CSP_BUILD_ARROW_ADAPTER ON CACHE BOOL "Build arrow adapter" FORCE)
82+
endif()
7783
option(CSP_BUILD_WS_CLIENT_ADAPTER "Build ws client adapter" ON)
7884

7985
# Normalize build type for downstream comparisons

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![PyPI](https://img.shields.io/pypi/v/csp.svg?style=flat)](https://pypi.python.org/pypi/csp)
1111
[![License](https://img.shields.io/badge/license-Apache--2.0-green)](https://github.com/Point72/csp/LICENSE)
1212
[![Build Status](https://github.com/Point72/csp/actions/workflows/build.yml/badge.svg)](https://github.com/Point72/csp/actions/workflows/build.yml)
13-
[![Python Versions](https://img.shields.io/badge/python-3.10_%7C_3.11_%7C_3.12_%7C_3.13-blue)](https://github.com/Point72/csp/blob/main/pyproject.toml)
13+
[![Python Versions](https://img.shields.io/badge/python-3.10_%7C_3.11_%7C_3.12_%7C_3.13_%7C_3.14-blue)](https://github.com/Point72/csp/blob/main/pyproject.toml)
1414

1515
<br/>
1616

0 commit comments

Comments
 (0)