Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-datashader for
openSUSE:Factory checked in at 2023-09-26 22:01:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-datashader (Old)
and /work/SRC/openSUSE:Factory/.python-datashader.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-datashader"
Tue Sep 26 22:01:33 2023 rev:25 rq:1113486 version:0.15.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-datashader/python-datashader.changes
2023-08-14 22:35:28.548307818 +0200
+++
/work/SRC/openSUSE:Factory/.python-datashader.new.1770/python-datashader.changes
2023-09-26 22:09:05.568486310 +0200
@@ -1,0 +2,15 @@
+Wed Sep 20 14:38:25 UTC 2023 - Markéta Machová <[email protected]>
+
+- Add pd21.patch to support Pandas 2.1
+
+-------------------------------------------------------------------
+Mon Sep 18 10:05:30 UTC 2023 - Dirk Müller <[email protected]>
+
+- update to 0.15.2:
+ * This release adds antialiased line support for inspection
+ reductions such as max_n and where, including within
+ categorical by reductions. It also improves support
+ for summary reductions and adds CUDA implementations
+ of std and var reductions
+
+-------------------------------------------------------------------
Old:
----
datashader-0.15.1.tar.gz
New:
----
datashader-0.15.2.tar.gz
pd21.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-datashader.spec ++++++
--- /var/tmp/diff_new_pack.J4KcHJ/_old 2023-09-26 22:09:07.292548567 +0200
+++ /var/tmp/diff_new_pack.J4KcHJ/_new 2023-09-26 22:09:07.296548712 +0200
@@ -28,7 +28,7 @@
%endif
Name: python-datashader%{psuffix}
-Version: 0.15.1
+Version: 0.15.2
Release: 0
Summary: Data visualization toolchain based on aggregating into a grid
License: BSD-3-Clause
@@ -36,6 +36,8 @@
# SourceRepository: https://github.com/holoviz/datashader
Source0:
https://files.pythonhosted.org/packages/source/d/datashader/datashader-%{version}.tar.gz
Source100: python-datashader-rpmlintrc
+# PATCH-FIX-UPSTREAM https://github.com/holoviz/datashader/pull/1276 Support
pandas 2.1
+Patch: pd21.patch
BuildRequires: %{python_module devel >= 3.8}
BuildRequires: %{python_module numpy}
BuildRequires: %{python_module param}
@@ -59,10 +61,10 @@
Requires(post): update-alternatives
Requires(postun):update-alternatives
%if %{with test}
-BuildRequires: %{python_module bokeh}
+BuildRequires: %{python_module bokeh >= 3.1}
BuildRequires: %{python_module datashader = %{version}}
BuildRequires: %{python_module fastparquet}
-BuildRequires: %{python_module matplotlib}
+BuildRequires: %{python_module matplotlib >= 3.3}
BuildRequires: %{python_module nbconvert}
BuildRequires: %{python_module nbformat}
BuildRequires: %{python_module nbsmoke >= 0.5.0}
++++++ datashader-0.15.1.tar.gz -> datashader-0.15.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-datashader/datashader-0.15.1.tar.gz
/work/SRC/openSUSE:Factory/.python-datashader.new.1770/datashader-0.15.2.tar.gz
differ: char 5, line 1
++++++ pd21.patch ++++++
>From 0f9bc326a2aff14c05cd32fdc060e05f01af3b7f Mon Sep 17 00:00:00 2001
From: Ian Thomas <[email protected]>
Date: Mon, 11 Sep 2023 10:51:29 +0100
Subject: [PATCH] Support pandas 2.1 (#1276)
* Remove pandas 2.1 pin
* Be more careful reading rows from dataframe when bundling
* Use pandas.testing.assert_series_equal
---
.github/workflows/test.yaml | 3 +++
datashader/bundling.py | 15 +++++++++++----
datashader/tests/test_datatypes.py | 6 +++---
setup.py | 3 ++-
4 files changed, 19 insertions(+), 8 deletions(-)
Index: datashader-0.15.2/datashader/bundling.py
===================================================================
--- datashader-0.15.2.orig/datashader/bundling.py
+++ datashader-0.15.2/datashader/bundling.py
@@ -307,12 +307,13 @@ def _convert_graph_to_edge_segments(node
df = df.sort_index()
df = df.reset_index()
- if params.include_edge_id:
+ include_edge_id = params.include_edge_id
+ if include_edge_id:
df = df.rename(columns={'id': 'edge_id'})
include_weight = params.weight and params.weight in edges
- if params.include_edge_id:
+ if include_edge_id:
if include_weight:
segment_class = WeightedSegment
else:
@@ -326,8 +327,14 @@ def _convert_graph_to_edge_segments(node
df = df.filter(items=segment_class.get_merged_columns(params))
edge_segments = []
- for edge in df.values:
+ for tup in df.itertuples():
+ edge = (tup.src_x, tup.src_y, tup.dst_x, tup.dst_y)
+ if include_edge_id:
+ edge = (tup.edge_id,) + edge
+ if include_weight:
+ edge += (getattr(tup, params.weight),)
edge_segments.append(segment_class.create_segment(edge))
+
return edge_segments, segment_class
@@ -394,7 +401,7 @@ class connect_edges(param.ParameterizedF
edges, segment_class = _convert_graph_to_edge_segments(nodes, edges, p)
return _convert_edge_segments_to_dataframe(edges, segment_class, p)
-directly_connect_edges = connect_edges # For bockwards compatibility;
deprecated
+directly_connect_edges = connect_edges # For backwards compatibility;
deprecated
def minmax_normalize(X, lower, upper):
Index: datashader-0.15.2/datashader/tests/test_datatypes.py
===================================================================
--- datashader-0.15.2.orig/datashader/tests/test_datatypes.py
+++ datashader-0.15.2/datashader/tests/test_datatypes.py
@@ -648,11 +648,11 @@ class TestRaggedGetitem(eb.BaseGetitemTe
result = s.get([4, 6])
expected = s.iloc[[2, 3]]
- self.assert_series_equal(result, expected)
+ pd.testing.assert_series_equal(result, expected)
result = s.get(slice(2))
expected = s.iloc[[0, 1]]
- self.assert_series_equal(result, expected)
+ pd.testing.assert_series_equal(result, expected)
assert s.get(-1) is None
assert s.get(s.index.max() + 1) is None
@@ -662,7 +662,7 @@ class TestRaggedGetitem(eb.BaseGetitemTe
result = s.get(slice('b', 'd'))
expected = s.iloc[[1, 2, 3]]
- self.assert_series_equal(result, expected)
+ pd.testing.assert_series_equal(result, expected)
result = s.get('Z')
assert result is None
Index: datashader-0.15.2/setup.py
===================================================================
--- datashader-0.15.2.orig/setup.py
+++ datashader-0.15.2/setup.py
@@ -49,6 +49,7 @@ extras_require = {
'pytest-cov',
'rasterio',
'rioxarray',
+ 'scikit-image',
'spatialpandas',
],
'examples': examples,
