From aa8538c24b5bde92b00d7b99bf6f0bc68777fef5 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 28 Dec 2024 13:59:28 +0300 Subject: [PATCH] import libarrow-16.1.0-12.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, 74 insertions(+), 50 deletions(-) create mode 100644 SOURCES/0001-python-pyarrow-src-arrow-python-udf.cc.patch delete mode 100644 SOURCES/0001-python-pyarrow-tests-read_record_patch.py.patch delete mode 100644 SOURCES/0002-python-pyarrow-tests-test_ipc.py.patch diff --git a/.gitignore b/.gitignore index dcba313..76c8885 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/apache-arrow-17.0.0.tar.gz +SOURCES/apache-arrow-16.1.0.tar.gz diff --git a/.libarrow.metadata b/.libarrow.metadata index 4609d46..9216ab5 100644 --- a/.libarrow.metadata +++ b/.libarrow.metadata @@ -1 +1 @@ -555c112b7c8f65d822c61d6478819b4f21fe71c8 SOURCES/apache-arrow-17.0.0.tar.gz +651f394a070dd43a80b2a095ecf79167bf8696cf SOURCES/apache-arrow-16.1.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 new file mode 100644 index 0000000..0c8b480 --- /dev/null +++ b/SOURCES/0001-python-pyarrow-src-arrow-python-udf.cc.patch @@ -0,0 +1,47 @@ +--- 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 deleted file mode 100644 index a8653b5..0000000 --- a/SOURCES/0001-python-pyarrow-tests-read_record_patch.py.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index b65e60b..0000000 --- a/SOURCES/0002-python-pyarrow-tests-test_ipc.py.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 18e01a7..196f3e8 100644 --- a/SPECS/libarrow.spec +++ b/SPECS/libarrow.spec @@ -30,15 +30,14 @@ %bcond_without have_utf8proc Name: libarrow -Version: 17.0.0 -Release: 6%{?dist} +Version: 16.1.0 +Release: 12%{?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-tests-read_record_patch.py.patch -Patch0002: 0002-python-pyarrow-tests-test_ipc.py.patch +Patch0001: 0001-python-pyarrow-src-arrow-python-udf.cc.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 @@ -70,10 +69,6 @@ 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 @@ -114,11 +109,6 @@ 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/* - #-------------------------------------------------------------------- @@ -175,11 +165,14 @@ 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/ @@ -487,6 +480,7 @@ 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/* #-------------------------------------------------------------------- @@ -817,33 +811,36 @@ 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.tests.read_record_batch' -e 'pyarrow.tests.test_cuda' \ - -e 'pyarrow.tests.test_cuda_numba_interop' -e 'pyarrow.tests.test_jvm'} + -e 'pyarrow.libarrow_python_parquet_encryption'} #-------------------------------------------------------------------- %changelog -* Tue Dec 24 2024 Dmitriy Samoylik - 17.0.0-6 +* Sat Dec 28 2024 Arkady L. Shane - 16.1.0-12 - Rebuilt for MSVSphere 10 -* 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 +* 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 -* Fri Jul 18 2024 Kaleb S. KEITHLEY - 17.0.0-4 -- Arrow 17.0.0, rebuild with re2-20240702, side tag 98656 +* 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-3 -- Arrow 17.0.0, rebuild with re2-20240702 +* Sun Aug 25 2024 Benjamin A. Beasley - 16.1.0-8 +- Rebuilt for abseil-cpp-20240722.0 -* Thu Jul 17 2024 Kaleb S. KEITHLEY - 17.0.0-2 -- Arrow 17.0.0, rebuild with re2-20240702 +* Thu Aug 15 2024 Marek Kasik - 16.1.0-7 +- Rebuild for re2 20240702 -* Wed Jul 17 2024 Kaleb S. KEITHLEY - 17.0.0-1 -- Arrow 17.0.0 GA +* Thu Jul 18 2024 Fedora Release Engineering - 16.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild * Tue Jun 18 2024 Kaleb S. KEITHLEY - 16.1.0-5 - Arrow 16.1.0, rebuild with liborc-2.0.1 (after liborc1 -> liborc2)