diff --git a/_service b/_service index 55028e4..eb4a19b 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/pandas-dev/pandas.git git - v2.1.0 + v2.1.1 @PARENT_TAG@ v(.*) pandas diff --git a/pandas-2.1.0.tar.gz b/pandas-2.1.0.tar.gz deleted file mode 100644 index 40bfb2c..0000000 --- a/pandas-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a455bda2cbdd94067a7b085ea70418c6ab017bbc517e8d8408415065831a28c3 -size 46646448 diff --git a/pandas-2.1.1.tar.gz b/pandas-2.1.1.tar.gz new file mode 100644 index 0000000..25842bd --- /dev/null +++ b/pandas-2.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fc9b67330b96dcb365a7b85feef701ab151928e0a3ed1a9bca1a086e878a04b +size 47820702 diff --git a/pandas-pr55073-pyarrow13.patch b/pandas-pr55073-pyarrow13.patch deleted file mode 100644 index c5cc59b..0000000 --- a/pandas-pr55073-pyarrow13.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 613e9aa49936cd941e631f8d6ec3ea557f94cc30 Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Fri, 8 Sep 2023 22:33:47 +0200 -Subject: [PATCH] Backport PR #55048: COMPAT: bump pyarrow min version for div - on duration - ---- - pandas/compat/__init__.py | 2 ++ - pandas/compat/pyarrow.py | 2 ++ - pandas/tests/extension/test_arrow.py | 3 ++- - 3 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py -index be0a762642e46..684e9dccdc0f9 100644 ---- a/pandas/compat/__init__.py -+++ b/pandas/compat/__init__.py -@@ -30,6 +30,7 @@ - pa_version_under9p0, - pa_version_under11p0, - pa_version_under13p0, -+ pa_version_under14p0, - ) - - if TYPE_CHECKING: -@@ -186,6 +187,7 @@ def get_bz2_file() -> type[pandas.compat.compressors.BZ2File]: - "pa_version_under9p0", - "pa_version_under11p0", - "pa_version_under13p0", -+ "pa_version_under14p0", - "IS64", - "ISMUSL", - "PY310", -diff --git a/pandas/compat/pyarrow.py b/pandas/compat/pyarrow.py -index 049ce50920e28..12f58be109d98 100644 ---- a/pandas/compat/pyarrow.py -+++ b/pandas/compat/pyarrow.py -@@ -15,6 +15,7 @@ - pa_version_under11p0 = _palv < Version("11.0.0") - pa_version_under12p0 = _palv < Version("12.0.0") - pa_version_under13p0 = _palv < Version("13.0.0") -+ pa_version_under14p0 = _palv < Version("14.0.0") - except ImportError: - pa_version_under7p0 = True - pa_version_under8p0 = True -@@ -23,3 +24,4 @@ - pa_version_under11p0 = True - pa_version_under12p0 = True - pa_version_under13p0 = True -+ pa_version_under14p0 = True -diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py -index ec2ca494b2aa1..d6e75a57f71e7 100644 ---- a/pandas/tests/extension/test_arrow.py -+++ b/pandas/tests/extension/test_arrow.py -@@ -40,6 +40,7 @@ - pa_version_under9p0, - pa_version_under11p0, - pa_version_under13p0, -+ pa_version_under14p0, - ) - - from pandas.core.dtypes.dtypes import ( -@@ -951,7 +952,7 @@ def _is_temporal_supported(self, opname, pa_dtype): - or ( - opname - in ("__truediv__", "__rtruediv__", "__floordiv__", "__rfloordiv__") -- and not pa_version_under13p0 -+ and not pa_version_under14p0 - ) - ) - and pa.types.is_duration(pa_dtype) diff --git a/python-pandas.changes b/python-pandas.changes index 9b27eb1..05a0dcf 100644 --- a/python-pandas.changes +++ b/python-pandas.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Sat Oct 7 20:22:18 UTC 2023 - Ben Greiner + +- Update to 2.1.1 + ## Fixed regressions + * Fixed regression in concat() when DataFrame ‘s have two + different extension dtypes (GH 54848) + * Fixed regression in merge() when merging over a PyArrow string + index (GH 54894) + * Fixed regression in read_csv() when usecols is given and dtypes + is a dict for engine="python" (GH 54868) + * Fixed regression in read_csv() when delim_whitespace is True + (GH 54918, GH 54931) + * Fixed regression in GroupBy.get_group() raising for axis=1 (GH + 54858) + * Fixed regression in DataFrame.__setitem__() raising + AssertionError when setting a Series with a partial MultiIndex + (GH 54875) + * Fixed regression in DataFrame.filter() not respecting the order + of elements for filter (GH 54980) + * Fixed regression in DataFrame.to_sql() not roundtripping + datetime columns correctly for sqlite (GH 54877) + * Fixed regression in DataFrameGroupBy.agg() when aggregating a + DataFrame with duplicate column names using a dictionary (GH + 55006) + * Fixed regression in MultiIndex.append() raising when appending + overlapping IntervalIndex levels (GH 54934) + * Fixed regression in Series.drop_duplicates() for PyArrow + strings (GH 54904) + * Fixed regression in Series.interpolate() raising when + fill_value was given (GH 54920) + * Fixed regression in Series.value_counts() raising for numeric + data if bins was specified (GH 54857) + * Fixed regression in comparison operations for PyArrow backed + columns not propagating exceptions correctly (GH 54944) + * Fixed regression when comparing a Series with datetime64 dtype + with None (GH 54870) + ## Bug fixes + * Fixed bug for ArrowDtype raising NotImplementedError for + fixed-size list (GH 55000) + * Fixed bug in DataFrame.stack() with future_stack=True and + columns a non-MultiIndex consisting of tuples (GH 54948) + * Fixed bug in Series.dt.tz() with ArrowDtype where a string was + returned instead of a tzinfo object (GH 55003) + * Fixed bug in Series.pct_change() and DataFrame.pct_change() + showing unnecessary FutureWarning (GH 54981) + ## Other + * Reverted the deprecation that disallowed Series.apply() + returning a DataFrame when the passed-in callable returns a + Series object (GH 52116) +- Drop pandas-pr55073-pyarrow13.patch merged upstream + ------------------------------------------------------------------- Sun Sep 10 13:10:06 UTC 2023 - Ben Greiner diff --git a/python-pandas.spec b/python-pandas.spec index 6098b22..182a677 100644 --- a/python-pandas.spec +++ b/python-pandas.spec @@ -53,7 +53,7 @@ %{?sle15_python_module_pythons} Name: python-pandas%{psuffix} # Set version through _service -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: Python data structures for data analysis, time series, and statistics License: BSD-3-Clause @@ -62,26 +62,28 @@ URL: https://pandas.pydata.org/ # SourceRepository: https://github.com/pandas-dev/pandas # Must be created by cloning through `osc service runall`: gh#pandas-dev/pandas#54903, gh#pandas-dev/pandas#54907 Source0: pandas-%{version}.tar.gz -# PATCH-FIX-UPSTREAM pandas-pr55073-pyarrow13.patch gh#pandas-dev/pandas#55073 gh#pandas-dev/pandas#55048 -Patch0: https://github.com/pandas-dev/pandas/pull/55073.patch#/pandas-pr55073-pyarrow13.patch BuildRequires: %{python_module Cython >= 0.29.33 with %python-Cython < 3} BuildRequires: %{python_module devel >= 3.9} BuildRequires: %{python_module meson-python >= 0.13.1} -BuildRequires: %{python_module numpy-devel >= 1.22.4} +BuildRequires: %{python_module numpy-devel >= 1.23.2 if %python-base < 3.12 else %python-numpy-devel >= 1.26} BuildRequires: %{python_module pip} BuildRequires: %{python_module versioneer-toml} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: git-core -BuildRequires: meson >= 1.0.1 +BuildRequires: meson >= 1.2.1 BuildRequires: python-rpm-macros Requires: python-python-dateutil >= 2.8.2 Requires: python-pytz >= 2020.1 Requires: timezone >= 2022a Obsoletes: python-pandas-doc < %{version} Provides: python-pandas-doc = %{version} -Requires: python-numpy >= 1.22.4 +%if 0%{python_version_nodots} < 312 +Requires: python-numpy >= 1.23.2 +%else +Requires: python-numpy >= 1.26 +%endif # SECTION extras Recommends: python-pandas-performance Suggests: python-pandas-all @@ -423,7 +425,6 @@ sed -i "s|'python', 'generate_version.py',|'${firstpython3}', 'generate_version. # don't require the PyPI data only tzdata package, we use the timezone RPM package sed -i '/dependencies = \[/,/\]/ {/tzdata.*>=/d}' pyproject.toml %endif -%patch0 -p1 %build %if !%{with test}