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 2021-04-06 17:30:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-datashader (Old)
and /work/SRC/openSUSE:Factory/.python-datashader.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-datashader"
Tue Apr 6 17:30:13 2021 rev:17 rq:882787 version:0.12.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-datashader/python-datashader.changes
2021-02-15 23:19:22.095670741 +0100
+++
/work/SRC/openSUSE:Factory/.python-datashader.new.2401/python-datashader.changes
2021-04-06 17:31:38.747250273 +0200
@@ -1,0 +2,18 @@
+Thu Apr 1 12:57:54 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- Add datashader-pr996-numpy-ragged.patch in order to fix
+ failures with NumPy 1.20 -- gh#holoviz/datashader#995 and
+ gh#holoviz/datashader#996
+
+-------------------------------------------------------------------
+Thu Mar 18 20:53:08 UTC 2021 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Update to version 0.12.1:
+ * Fix for xarray 0.17 raster files, supporting various nodata
+ conventions (gh#holoviz/datashader#991)
+ * Fix RaggedArray groupby test
+ * Disable the interactivity warning on the homepage
+ (gh#holoviz/datashader#983)
+- Add BuildRequires: python-numpy now needed for building.
+
+-------------------------------------------------------------------
Old:
----
datashader-0.11.1.tar.gz
New:
----
datashader-0.12.1.tar.gz
datashader-pr996-numpy-ragged.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-datashader.spec ++++++
--- /var/tmp/diff_new_pack.dH2Uuf/_old 2021-04-06 17:31:39.579251214 +0200
+++ /var/tmp/diff_new_pack.dH2Uuf/_new 2021-04-06 17:31:39.583251218 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-datashader
+# spec file for package python-datashader-test
#
# Copyright (c) 2021 SUSE LLC
#
@@ -30,14 +30,17 @@
%define skip_python2 1
%define skip_python36 1
Name: python-datashader%{psuffix}
-Version: 0.11.1
+Version: 0.12.1
Release: 0
Summary: Data visualization toolchain based on aggregating into a grid
License: BSD-3-Clause
-URL: https://github.com/holoviz/datashader
+URL: https://datashader.org
Source0:
https://files.pythonhosted.org/packages/source/d/datashader/datashader-%{version}.tar.gz
Source100: python-datashader-rpmlintrc
+# PATCH-FIX-UPSTREAM datashader-pr996-numpy-ragged.patch --
gh#holoviz/datashader#996
+Patch0:
https://github.com/holoviz/datashader/pull/996.patch#/datashader-pr996-numpy-ragged.patch
BuildRequires: %{python_module devel}
+BuildRequires: %{python_module numpy}
BuildRequires: %{python_module param >= 1.6.0}
BuildRequires: %{python_module pyct}
BuildRequires: %{python_module setuptools}
@@ -61,7 +64,7 @@
Requires: python-toolz >= 0.7.4
Requires: python-xarray >= 0.9.6
Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
%if %{with test}
BuildRequires: %{python_module DataShape >= 0.5.1}
BuildRequires: %{python_module Pillow >= 3.1.1}
@@ -74,6 +77,7 @@
BuildRequires: %{python_module fastparquet >= 0.1.6}
BuildRequires: %{python_module holoviews >= 1.10.0}
BuildRequires: %{python_module nbsmoke >= 0.4.0}
+BuildRequires: %{python_module netCDF4}
BuildRequires: %{python_module numba >= 0.37.0}
BuildRequires: %{python_module numpy >= 1.7}
BuildRequires: %{python_module pandas >= 0.24.1}
@@ -109,7 +113,7 @@
saturation, overplotting, or underplotting issues.
%prep
-%setup -q -n datashader-%{version}
+%autosetup -p1 -n datashader-%{version}
sed -i -e '/^#!\//, 1d' examples/*.py
%build
++++++ datashader-0.11.1.tar.gz -> datashader-0.12.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-datashader/datashader-0.11.1.tar.gz
/work/SRC/openSUSE:Factory/.python-datashader.new.2401/datashader-0.12.1.tar.gz
differ: char 5, line 1
++++++ datashader-pr996-numpy-ragged.patch ++++++
>From bc203e0e9f5b447d184cc5facce3dacc29c2142d Mon Sep 17 00:00:00 2001
From: Ben Greiner <c...@bnavigator.de>
Date: Thu, 1 Apr 2021 14:53:50 +0200
Subject: [PATCH] only assign to _flat_array if something to assign
---
datashader/datatypes.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/datashader/datatypes.py b/datashader/datatypes.py
index ec412688..5b944133 100644
--- a/datashader/datatypes.py
+++ b/datashader/datatypes.py
@@ -303,17 +303,18 @@ def __init__(self, data, dtype=None, copy=False):
# Populate arrays
next_start_ind = 0
for i, array_el in enumerate(data):
- # Compute element length
- n = len(array_el) if not missing(array_el) else 0
-
# Update start indices
self._start_indices[i] = next_start_ind
- # Update flat array
- self._flat_array[next_start_ind:next_start_ind+n] = array_el
+ if not missing(array_el):
+ # Compute element length
+ n = len(array_el)
+
+ # Update flat array
+ self._flat_array[next_start_ind:next_start_ind+n] =
array_el
- # increment next start index
- next_start_ind += n
+ # increment next start index
+ next_start_ind += n
self._dtype = RaggedDtype(dtype=dtype)
