Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to v15.0.0 #1290

Merged
merged 5 commits into from
Jan 30, 2024
Merged

Update to v15.0.0 #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2feeff
Update to v15.0.0
raulcd Jan 22, 2024
77604a1
Add 14.x to abi_migration_branches
raulcd Jan 22, 2024
18825c9
Update testing submodule to match 15.0.0 version and fix tests
raulcd Jan 23, 2024
ba7979e
Add related issues on Arrow repo to Pandas pin and pytest pin
raulcd Jan 30, 2024
69e1182
Skip single test for dlpack that requires cuda instead of all test_dl…
raulcd Jan 30, 2024
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: 1 addition & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ azure:
max_parallel: 20
bot:
abi_migration_branches:
- 14.x
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JFYI, we'll still need to create that branch; I can do this once we merge.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already did this as I expect we will merge this PR quite soon(ish).

Copy link
Member

@h-vetinari h-vetinari Jan 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already did this as I expect we will merge this PR quite soon(ish).

FWIW, let's please only create branches once the PR for the next version gets merged. I've now backported #1292 from main to 14.x, but it's easy to forget these sort of details.

- 13.x
- 12.x
- 11.0.x
Expand Down
13 changes: 8 additions & 5 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "14.0.2" %}
{% set version = "15.0.0" %}
{% set cuda_enabled = cuda_compiler_version != "None" %}
{% set build_ext_version = "5.0.0" %}
{% set build_ext = "cuda" if cuda_enabled else "cpu" %}
Expand All @@ -18,17 +18,17 @@ source:
# - url: https://github.com/apache/arrow/archive/refs/tags/apache-arrow-{{ version }}.tar.gz
- url: https://www.apache.org/dyn/closer.lua/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz?action=download
fn: apache-arrow-{{ version }}.tar.gz
sha256: 1304dedb41896008b89fe0738c71a95d9b81752efc77fa70f264cb1da15d9bc2
sha256: 01dd3f70e85d9b5b933ec92c0db8a4ef504a5105f78d2d8622e84279fb45c25d
patches:
# workaround for https://github.com/apache/arrow/issues/37692
- patches/0001-fixture-teardown-should-not-fail-test.patch
# testing-submodule not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
git_rev: 47f7b56b25683202c1fd957668e13f2abafc0f12
git_rev: ad82a736c170e97b7c8c035ebd8a801c17eec170
folder: testing
raulcd marked this conversation as resolved.
Show resolved Hide resolved

build:
number: 3
number: 0
# for cuda support, building with one version is enough to be compatible with
# all later versions, since arrow is only using libcuda, and not libcudart.
skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]
Expand Down Expand Up @@ -760,6 +760,8 @@ outputs:
requires:
# test_cpp_extension_in_python requires a compiler
- {{ compiler("cxx") }} # [linux]
# pytest-lazy-fixture fails with pytest 8
# See issue on Arrow repo: https://github.com/apache/arrow/issues/39849
- pytest <8
- pytest-lazy-fixture
- backports.zoneinfo # [py<39]
Expand All @@ -771,6 +773,7 @@ outputs:
- fsspec
- hypothesis
- minio-server
# Pandas pin required due to: https://github.com/apache/arrow/issues/39732
- pandas <2.2
- s3fs >=2023
- scipy
Expand All @@ -794,7 +797,7 @@ outputs:

{% set tests_to_skip = "_not_a_real_test" %}
# we do not have GPUs in CI --> cannot test cuda
{% set tests_to_skip = tests_to_skip + " or test_cuda" %}
{% set tests_to_skip = tests_to_skip + " or test_cuda" + " or test_dlpack_cuda_not_supported"%}
# skip tests that raise SIGINT and crash the test suite
{% set tests_to_skip = tests_to_skip + " or (test_csv and test_cancellation)" %} # [linux]
{% set tests_to_skip = tests_to_skip + " or (test_flight and test_interrupt)" %} # [linux]
Expand Down