From 02f5b276d9678dd2a6770322e0c69f91c6cab728 Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 29 Dec 2024 14:17:39 +0300 Subject: [PATCH] import libarrow-17.0.0-6.el10 --- .gitignore | 2 +- .libarrow.metadata | 2 +- ...thon-pyarrow-src-arrow-python-udf.cc.patch | 47 ---------------- ...n-pyarrow-tests-read_record_patch.py.patch | 10 ++++ ...002-python-pyarrow-tests-test_ipc.py.patch | 10 ++++ SPECS/libarrow.spec | 53 ++++++++++--------- 6 files changed, 50 insertions(+), 74 deletions(-) delete mode 100644 SOURCES/0001-python-pyarrow-src-arrow-python-udf.cc.patch create mode 100644 SOURCES/0001-python-pyarrow-tests-read_record_patch.py.patch create mode 100644 SOURCES/0002-python-pyarrow-tests-test_ipc.py.patch diff --git a/.gitignore b/.gitignore index 76c8885..dcba313 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/apache-arrow-16.1.0.tar.gz +SOURCES/apache-arrow-17.0.0.tar.gz diff --git a/.libarrow.metadata b/.libarrow.metadata index 9216ab5..4609d46 100644 --- a/.libarrow.metadata +++ b/.libarrow.metadata @@ -1 +1 @@ -651f394a070dd43a80b2a095ecf79167bf8696cf SOURCES/apache-arrow-16.1.0.tar.gz +555c112b7c8f65d822c61d6478819b4f21fe71c8 SOURCES/apache-arrow-17.0.0.tar.gz diff --git a/SOURCES/0001-python-pyarrow-src-arrow-python-udf.cc.patch b/SOURCES/0001-python-pyarrow-src-arrow-python-udf.cc.patch deleted file mode 100644 index 0c8b480..0000000 --- a/SOURCES/0001-python-pyarrow-src-arrow-python-udf.cc.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- apache-arrow-16.1.0/python/pyarrow/src/arrow/python/udf.cc.orig 2024-06-10 11:44:14.380323276 -0400 -+++ apache-arrow-16.1.0/python/pyarrow/src/arrow/python/udf.cc 2024-06-10 11:44:38.686911541 -0400 -@@ -47,7 +47,7 @@ - // function needs to be destroyed at process exit - // and Python may no longer be initialized. - ~PythonUdfKernelState() { -- if (_Py_IsFinalizing()) { -+ if (Py_IsFinalizing()) { - function->detach(); - } - } -@@ -64,7 +64,7 @@ - // function needs to be destroyed at process exit - // and Python may no longer be initialized. - ~PythonUdfKernelInit() { -- if (_Py_IsFinalizing()) { -+ if (Py_IsFinalizing()) { - function->detach(); - } - } -@@ -132,7 +132,7 @@ - // function needs to be destroyed at process exit - // and Python may no longer be initialized. - ~PythonTableUdfKernelInit() { -- if (_Py_IsFinalizing()) { -+ if (Py_IsFinalizing()) { - function_maker->detach(); - } - } -@@ -173,7 +173,7 @@ - }; - - ~PythonUdfScalarAggregatorImpl() override { -- if (_Py_IsFinalizing()) { -+ if (Py_IsFinalizing()) { - function->detach(); - } - } -@@ -270,7 +270,7 @@ - }; - - ~PythonUdfHashAggregatorImpl() override { -- if (_Py_IsFinalizing()) { -+ if (Py_IsFinalizing()) { - function->detach(); - } - } diff --git a/SOURCES/0001-python-pyarrow-tests-read_record_patch.py.patch b/SOURCES/0001-python-pyarrow-tests-read_record_patch.py.patch new file mode 100644 index 0000000..a8653b5 --- /dev/null +++ b/SOURCES/0001-python-pyarrow-tests-read_record_patch.py.patch @@ -0,0 +1,10 @@ +--- apache-arrow-17.0.0/python/pyarrow/tests/read_record_batch.py.orig 2024-07-17 15:20:35.279004865 -0400 ++++ apache-arrow-17.0.0/python/pyarrow/tests/read_record_batch.py 2024-07-17 15:21:41.285943684 -0400 +@@ -21,5 +21,7 @@ + + import pyarrow as pa + ++print("argv[1]: ", sys.argv[1]) ++ + with open(sys.argv[1], 'rb') as f: + pa.ipc.open_file(f).read_all().to_pandas() diff --git a/SOURCES/0002-python-pyarrow-tests-test_ipc.py.patch b/SOURCES/0002-python-pyarrow-tests-test_ipc.py.patch new file mode 100644 index 0000000..b65e60b --- /dev/null +++ b/SOURCES/0002-python-pyarrow-tests-test_ipc.py.patch @@ -0,0 +1,10 @@ +--- apache-arrow-17.0.0/python/pyarrow/tests/test_ipc.py.orig 2024-07-22 10:22:12.901249012 -0400 ++++ apache-arrow-17.0.0/python/pyarrow/tests/test_ipc.py 2024-07-22 10:25:41.747809663 -0400 +@@ -258,6 +258,7 @@ + interval_array = pa.array([(1, 2, 3)], type=mdn_interval_type) + batch = pa.record_batch([interval_array], schema) + writer.write(batch) ++ print("invoking read_record_batch.py, path:", path) + invoke_script('read_record_batch.py', path) + + diff --git a/SPECS/libarrow.spec b/SPECS/libarrow.spec index 196f3e8..3ab7760 100644 --- a/SPECS/libarrow.spec +++ b/SPECS/libarrow.spec @@ -30,14 +30,15 @@ %bcond_without have_utf8proc Name: libarrow -Version: 16.1.0 -Release: 12%{?dist} +Version: 17.0.0 +Release: 6%{?dist} Summary: A toolbox for accelerated data interchange and in-memory processing License: Apache-2.0 URL: https://arrow.apache.org/ Requires: %{name}-doc = %{version}-%{release} Source0: https://dist.apache.org/repos/dist/release/arrow/arrow-%{version}/apache-arrow-%{version}.tar.gz -Patch0001: 0001-python-pyarrow-src-arrow-python-udf.cc.patch +Patch0001: 0001-python-pyarrow-tests-read_record_patch.py.patch +Patch0002: 0002-python-pyarrow-tests-test_ipc.py.patch # Apache ORC (liborc) has numerous compile errors and apparently assumes # a 64-bit build and runtime environment. This is only consumer of the liborc @@ -69,6 +70,10 @@ BuildRequires: pkgconfig BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-numpy BuildRequires: python%{python3_pkgversion}-Cython +BuildRequires: python%{python3_pkgversion}-pandas +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-hypothesis +BuildRequires: python%{python3_pkgversion}-pytzdata BuildRequires: xsimd-devel BuildRequires: abseil-cpp-devel BuildRequires: c-ares-devel @@ -109,6 +114,11 @@ fast data access without serialization overhead %files %{_libdir}/libarrow.so.* +%exclude %{python3_sitearch}/benchmarks/* +%exclude %{python3_sitearch}/cmake_modules/* +%exclude %{python3_sitearch}/examples/* +%exclude %{python3_sitearch}/scripts/* + #-------------------------------------------------------------------- @@ -165,14 +175,11 @@ Libraries and header files for Apache Arrow C++. %endif %exclude %{_libdir}/cmake/Arrow/FindBrotliAlt.cmake %exclude %{_libdir}/cmake/Arrow/Findlz4Alt.cmake -%exclude %{_libdir}/cmake/Arrow/FindORC.cmake %exclude %{_libdir}/cmake/Arrow/FindorcAlt.cmake %exclude %{_libdir}/cmake/Arrow/FindSnappyAlt.cmake -%exclude %{_libdir}/cmake/Arrow/FindgRPCAlt.cmake %exclude %{_libdir}/cmake/Arrow/Findre2Alt.cmake %exclude %{_libdir}/cmake/Arrow/Findutf8proc.cmake %exclude %{_libdir}/cmake/Arrow/FindzstdAlt.cmake -%exclude %{_libdir}/cmake/Arrow/FindThriftAlt.cmake %exclude %{_libdir}/cmake/Arrow/FindOpenSSLAlt.cmake %exclude %{_libdir}/cmake/Arrow/FindProtobufAlt.cmake %dir %{_libdir}/cmake/Arrow/ @@ -480,7 +487,6 @@ This package contains the libraries for Apache Arrow GLib. %{_libdir}/libarrow-glib.so.* %dir %{_libdir}/girepository-1.0/ %{_libdir}/girepository-1.0/Arrow-1.0.typelib -%exclude %{_datadir}/doc/arrow-glib/* #-------------------------------------------------------------------- @@ -811,36 +817,33 @@ export LD_LIBRARY_PATH='%{buildroot}%{_libdir}' -e 'pyarrow.cuda' \ -e 'pyarrow.libarrow_python' -e 'pyarrow._libarrow_python' \ -e 'pyarrow.libarrow_python_flight' -e 'pyarrow._libarrow_python_flight' \ - -e 'pyarrow.libarrow_python_parquet_encryption'} + -e 'pyarrow.libarrow_python_parquet_encryption' \ + -e 'pyarrow.tests.read_record_batch' -e 'pyarrow.tests.test_cuda' \ + -e 'pyarrow.tests.test_cuda_numba_interop' -e 'pyarrow.tests.test_jvm'} #-------------------------------------------------------------------- %changelog -* Sat Dec 28 2024 Arkady L. Shane - 16.1.0-12 +* Sat Dec 28 2024 Arkady L. Shane - 17.0.0-6 - Rebuilt for MSVSphere 10 -* Thu Nov 21 2024 Kaleb S. KEITHLEY - 16.1.0-12 -- Arrow 16.1.0, rebuild with liborc-2.0.3 - -* Sun Nov 17 2024 Benjamin A. Beasley - 16.1.0-11 -- Filter out bogus Provides/Requires from python3-pyarrow; fixes RHBZ#2326774 - -* Mon Oct 7 2024 Kaleb S. KEITHLEY - 16.1.0-10 -- Arrow 16.1.0, rebuild with utf8proc 2.9.0 +* Sun Nov 17 2024 Benjamin A. Beasley - 17.0.0-6 +- Filter out bogus Provides/Requires from python3-pyarrow +- rebuild with liborc-2.0.3 -* Wed Oct 3 2024 Kaleb S. KEITHLEY - 16.1.0-9 -- Arrow 16.1.0, rebuild with liborc-2.0.2 +* Fri Jul 18 2024 Kaleb S. KEITHLEY - 17.0.0-4 +- Arrow 17.0.0, rebuild with re2-20240702, side tag 98656 -* Sun Aug 25 2024 Benjamin A. Beasley - 16.1.0-8 -- Rebuilt for abseil-cpp-20240722.0 +* Fri Jul 18 2024 Kaleb S. KEITHLEY - 17.0.0-3 +- Arrow 17.0.0, rebuild with re2-20240702 -* Thu Aug 15 2024 Marek Kasik - 16.1.0-7 -- Rebuild for re2 20240702 +* Thu Jul 17 2024 Kaleb S. KEITHLEY - 17.0.0-2 +- Arrow 17.0.0, rebuild with re2-20240702 -* Thu Jul 18 2024 Fedora Release Engineering - 16.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild +* Wed Jul 17 2024 Kaleb S. KEITHLEY - 17.0.0-1 +- Arrow 17.0.0 GA * Tue Jun 18 2024 Kaleb S. KEITHLEY - 16.1.0-5 - Arrow 16.1.0, rebuild with liborc-2.0.1 (after liborc1 -> liborc2)