From b2feeffab3f271aecc3a6a2f3ee69d51a743299b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Mon, 22 Jan 2024 11:18:06 +0100 Subject: [PATCH 1/5] Update to v15.0.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e42bec99d..ef1a3ea92 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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" %} @@ -18,7 +18,7 @@ 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 @@ -28,7 +28,7 @@ source: folder: testing 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)] From 77604a1cfbbf747881d80e22bb5b1b53b9cf2e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Mon, 22 Jan 2024 11:43:43 +0100 Subject: [PATCH 2/5] Add 14.x to abi_migration_branches --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index ba8ba086f..497d8200c 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,6 +3,7 @@ azure: max_parallel: 20 bot: abi_migration_branches: + - 14.x - 13.x - 12.x - 11.0.x From 18825c9f98ed777b22a6b1612dc29e7359a66159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 23 Jan 2024 09:37:35 +0100 Subject: [PATCH 3/5] Update testing submodule to match 15.0.0 version and fix tests --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ef1a3ea92..dbd558ab2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,7 +24,7 @@ source: - 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 build: @@ -794,7 +794,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"%} # 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] From ba7979ebc53715abddd1c0891ee691924857b0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 30 Jan 2024 11:53:14 +0100 Subject: [PATCH 4/5] Add related issues on Arrow repo to Pandas pin and pytest pin --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dbd558ab2..0ecb9b0d8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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] @@ -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 From 69e1182576bb72202b69fb6c4cb65d40b89c6f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 30 Jan 2024 15:06:04 +0100 Subject: [PATCH 5/5] Skip single test for dlpack that requires cuda instead of all test_dlpack tests --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0ecb9b0d8..1d4b67248 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -797,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" + " or test_dlpack"%} + {% 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]