Hello community,
here is the log from the commit of package python-holoviews for
openSUSE:Factory checked in at 2020-09-21 17:23:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-holoviews (Old)
and /work/SRC/openSUSE:Factory/.python-holoviews.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-holoviews"
Mon Sep 21 17:23:56 2020 rev:24 rq:835303 version:1.13.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-holoviews/python-holoviews.changes
2020-06-24 15:49:51.724650467 +0200
+++
/work/SRC/openSUSE:Factory/.python-holoviews.new.4249/python-holoviews.changes
2020-09-21 17:25:39.936041738 +0200
@@ -1,0 +2,10 @@
+Thu Sep 17 16:29:18 UTC 2020 - Matej Cepl <[email protected]>
+
+- Add remove-cyordereddict.patch to remove use of cyordereddict,
+ which has been declared obsolete even by its upstream
+ (gh#holoviz/holoviews#4620).
+- Add remove_nose.patch to remove last residues of using nose
+ (gh#holoviz/holoviews#4621).
+- Tests are enabled again.
+
+-------------------------------------------------------------------
New:
----
remove-cyordereddict.patch
remove_nose.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-holoviews.spec ++++++
--- /var/tmp/diff_new_pack.KfWBnt/_old 2020-09-21 17:25:51.736053042 +0200
+++ /var/tmp/diff_new_pack.KfWBnt/_new 2020-09-21 17:25:51.736053042 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
-%bcond_with test
+%bcond_without test
Name: python-holoviews
Version: 1.13.3
Release: 0
@@ -27,7 +27,14 @@
Group: Development/Languages/Python
URL: https://github.com/ioam/holoviews
Source0:
https://files.pythonhosted.org/packages/source/h/holoviews/holoviews-%{version}.tar.gz
+# PATCH-FEATURE-UPSTREAM remove-cyordereddict.patch gh#holoviz/holoviews#4620
[email protected]
+# Package cyordereddict has been declared obsolete even by its own upstream
+Patch0: remove-cyordereddict.patch
+# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#holoviz/holoviews#4621
[email protected]
+# Remove last residues of using nose
+Patch1: remove_nose.patch
BuildRequires: %{python_module numpy >= 1.0}
+BuildRequires: %{python_module panel}
BuildRequires: %{python_module param < 2.0}
BuildRequires: %{python_module param >= 1.8.0}
BuildRequires: %{python_module pip}
@@ -47,7 +54,6 @@
Recommends: python-Pygments
Recommends: python-bokeh >= 0.12.14
Recommends: python-colorcet
-Recommends: python-cyordereddict
Recommends: python-dask
Recommends: python-dask-array
Recommends: python-dask-dataframe
@@ -65,6 +71,7 @@
Recommends: python-netCDF4
Recommends: python-networkx
Recommends: python-pandas
+Recommends: python-panel
Recommends: python-plotly
Recommends: python-pyparsing
Recommends: python-pyzmq
@@ -79,9 +86,9 @@
%if %{with test}
BuildRequires: %{python_module Jinja2}
BuildRequires: %{python_module Pygments}
+BuildRequires: %{python_module Shapely}
BuildRequires: %{python_module bokeh >= 0.12.14}
BuildRequires: %{python_module colorcet}
-BuildRequires: %{python_module cyordereddict}
BuildRequires: %{python_module dask-array}
BuildRequires: %{python_module dask-dataframe}
BuildRequires: %{python_module dask}
@@ -98,10 +105,10 @@
BuildRequires: %{python_module matplotlib}
BuildRequires: %{python_module netCDF4}
BuildRequires: %{python_module networkx}
-BuildRequires: %{python_module nose}
BuildRequires: %{python_module pandas}
BuildRequires: %{python_module plotly}
BuildRequires: %{python_module pyparsing}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module pyzmq}
BuildRequires: %{python_module scipy}
BuildRequires: %{python_module seaborn}
@@ -126,12 +133,14 @@
%prep
%setup -q -n holoviews-%{version}
+%autopatch -p1
+
# remove tests that install additional files using npm/etc
# "conda install -c bokeh flexx" or "pip install flexx"
rm -f holoviews/tests/plotting/testplotutils.py
rm -rf holoviews/tests/ipython
# "conda install phantomjs"
-rm -rf holoviews/tests/plotting/bokeh
+rm -rf holoviews/tests/plotting/bokeh holoviews/tests/test_annotators.py
%build
%python_build
@@ -158,7 +167,7 @@
%check
export HOLOVIEWSRC=`pwd`'/holoviews.rc'
echo 'import holoviews as
hv;hv.config(style_17=True);hv.config.warn_options_call=True' > holoviews.rc
-%python_expand nosetests-%{$python_bin_suffix} -v
+%pytest
%endif
%files %{python_files}
++++++ remove-cyordereddict.patch ++++++
---
setup.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,6 @@ if sys.version_info.major > 2:
# Extra third-party libraries
extras_require['extras'] = extras_require['examples']+[
- 'cyordereddict',
'pscript ==0.7.1'
]
@@ -67,7 +66,7 @@ extras_require['tests'] = [
'mock',
'flake8 ==3.6.0',
'coveralls',
- 'path.py',
+ 'path.py',
'matplotlib >=2.2,<3.1',
'nbsmoke >=0.2.0',
'pytest-cov ==2.5.1'
@@ -87,7 +86,6 @@ extras_require['nbtests'] = extras_requi
'deepdiff',
'nbconvert ==5.3.1',
'jsonschema ==2.6.0',
- 'cyordereddict',
'ipython ==5.4.1'
]
@@ -108,7 +106,7 @@ extras_require['build'] = [
'python <3.8'
]
-# Everything including cyordereddict (optimization) and nosetests
+# Everything including nosetests
extras_require['all'] = list(set(extras_require['unit_tests']) |
set(extras_require['nbtests']))
--- a/holoviews/core/tree.py
+++ b/holoviews/core/tree.py
@@ -1,7 +1,4 @@
-try:
- from cyordereddict import OrderedDict
-except:
- from collections import OrderedDict
+from collections import OrderedDict
from . import util
from .pprint import PrettyPrinter
--- a/holoviews/core/util.py
+++ b/holoviews/core/util.py
@@ -19,10 +19,7 @@ from types import FunctionType
import numpy as np
import param
-try:
- from cyordereddict import OrderedDict
-except:
- from collections import OrderedDict
+from collections import OrderedDict
# Python3 compatibility
if sys.version_info.major >= 3:
++++++ remove_nose.patch ++++++
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,6 @@ extras_require['extras'] = extras_requir
# Test requirements
extras_require['tests'] = [
- 'nose',
'mock',
'flake8 ==3.6.0',
'coveralls',
@@ -81,7 +80,6 @@ extras_require['basic_tests'] = extras_r
] + extras_require['notebook']
extras_require['nbtests'] = extras_require['recommended'] + [
- 'nose',
'awscli',
'deepdiff',
'nbconvert ==5.3.1',
@@ -106,7 +104,7 @@ extras_require['build'] = [
'python <3.8'
]
-# Everything including nosetests
+# Everything including tests
extras_require['all'] = list(set(extras_require['unit_tests']) |
set(extras_require['nbtests']))
