Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/deploy_development_cookbooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:
uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
with:
auto-update-conda: true
python-version: "3.10"
activate-environment: cookbook-cpp-dev
environment-file: cpp/dev.yml
auto-activate-base: false
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy_stable_cookbooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ jobs:
uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
with:
auto-update-conda: true
python-version: "3.10"
activate-environment: cookbook-cpp
environment-file: cpp/environment.yml
auto-activate-base: false
Expand Down
2 changes: 2 additions & 0 deletions cpp/code/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ if(DEFINED ENV{ARROW_NIGHTLY})
set(ARROW_FLIGHT ON)
set(ARROW_IPC ON)
set(ARROW_PARQUET ON)
# Turn ARROW_JSON ON to trigger simdjson to resolve. Cookbook don't use it.
set(ARROW_JSON ON)

find_package(OpenSSL REQUIRED)

Expand Down
215 changes: 111 additions & 104 deletions cpp/conda-linux-64.lock

Large diffs are not rendered by default.

219 changes: 114 additions & 105 deletions cpp/conda-linux-aarch64.lock

Large diffs are not rendered by default.

177 changes: 89 additions & 88 deletions cpp/conda-osx-arm64.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion cpp/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ name: cookbook-cpp-dev
channels:
- conda-forge
dependencies:
- python=3.10
- python=3.11
- pip
- pip:
- --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
Expand All @@ -33,4 +33,5 @@ dependencies:
- zlib
- openssl
- rapidjson
- simdjson
- snappy
8 changes: 4 additions & 4 deletions cpp/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ name: cookbook-cpp
channels:
- conda-forge
dependencies:
- python=3.10
- python=3.11
- compilers
- libarrow==24.0.0
- libarrow-flight==24.0.0
- libarrow==25.0.0
- libarrow-flight==25.0.0
- sphinx
- gtest
- gmock
- pyarrow==24.0.0
- pyarrow==25.0.0
- clang-tools
- zlib
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Sphinx>=4.0.2
pyarrow==24.0.0
pyarrow==25.0.0
pandas>=1.2.5
opentelemetry-api>=1.0.0
opentelemetry-sdk>=1.0.0
Loading