From 48f4904a17ce20967ca668d2934b622a230a2fa825ac80ee92bb04c10cf03109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 12 Apr 2021 09:33:55 +0000 Subject: [PATCH] Accepting request 884347 from home:bnavigator:branches:devel:languages:python:jupyter - Update to 0.12.25 * no release notes - Add jupyterlab extension subpackage - Use upstreams jupyter-bqplot versioning in new subpackage names - Skip python36 build - Tests are not in the PyPI sdist, get them from GitHub. - No mock - Test notebooks with nbval OBS-URL: https://build.opensuse.org/request/show/884347 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-bqplot?expand=0&rev=21 --- bqplot-0.12.13.tar.gz | 3 -- bqplot-0.12.25-gh.tar.gz | 3 ++ bqplot-0.12.25.tar.gz | 3 ++ python-bqplot.changes | 12 ++++++ python-bqplot.spec | 83 +++++++++++++++++++++++++--------------- 5 files changed, 70 insertions(+), 34 deletions(-) delete mode 100644 bqplot-0.12.13.tar.gz create mode 100644 bqplot-0.12.25-gh.tar.gz create mode 100644 bqplot-0.12.25.tar.gz diff --git a/bqplot-0.12.13.tar.gz b/bqplot-0.12.13.tar.gz deleted file mode 100644 index db43169..0000000 --- a/bqplot-0.12.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d0a5abb57da35b76df8fd1360da047933e1f35d7f9a5151254706a5cf56750f -size 2567234 diff --git a/bqplot-0.12.25-gh.tar.gz b/bqplot-0.12.25-gh.tar.gz new file mode 100644 index 0000000..3078729 --- /dev/null +++ b/bqplot-0.12.25-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8877383bab7ada139db3887b992fc09159d15982e5bc2d742760017786a8a8c +size 3766659 diff --git a/bqplot-0.12.25.tar.gz b/bqplot-0.12.25.tar.gz new file mode 100644 index 0000000..2655a72 --- /dev/null +++ b/bqplot-0.12.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7855171d0b26b3aa9bb34575bb7ed068502d13b8aa9257a56bef163b18271d3b +size 1191407 diff --git a/python-bqplot.changes b/python-bqplot.changes index 87be7b3..be1d7c5 100644 --- a/python-bqplot.changes +++ b/python-bqplot.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Apr 10 12:00:14 UTC 2021 - Ben Greiner + +- Update to 0.12.25 + * no release notes +- Add jupyterlab extension subpackage +- Use upstreams jupyter-bqplot versioning in new subpackage names +- Skip python36 build +- Tests are not in the PyPI sdist, get them from GitHub. +- No mock +- Test notebooks with nbval + ------------------------------------------------------------------- Mon Jun 29 13:26:21 UTC 2020 - Marketa Calabkova diff --git a/python-bqplot.spec b/python-bqplot.spec index e8f2839..039d897 100644 --- a/python-bqplot.spec +++ b/python-bqplot.spec @@ -1,7 +1,7 @@ # # spec file for package python-bqplot # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,31 +16,39 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 +%define skip_python36 1 +%define pyver 0.12.25 +%define jupver 0.5.26 Name: python-bqplot -Version: 0.12.13 +Version: %{pyver} Release: 0 Summary: Interactive plotting package for the Jupyter notebook License: Apache-2.0 -URL: https://github.com/bloomberg/bqplot -Source: https://files.pythonhosted.org/packages/source/b/bqplot/bqplot-%{version}.tar.gz +URL: https://github.com/bqplot/bqplot +# bundled js stuff from PyPI sdist +Source0: https://files.pythonhosted.org/packages/source/b/bqplot/bqplot-%{pyver}.tar.gz +# tests from GitHub source +Source1: https://github.com/bqplot/bqplot/archive/refs/tags/%{pyver}.tar.gz#/bqplot-%{pyver}-gh.tar.gz +BuildRequires: %{python_module jupyter-packaging} BuildRequires: %{python_module notebook} BuildRequires: %{python_module setuptools} BuildRequires: fdupes +BuildRequires: jupyter-notebook-filesystem BuildRequires: python-rpm-macros -Requires: jupyter-bqplot = %{version} +Requires: jupyter-bqplot-notebook = %{jupver} Requires: python-ipywidgets >= 7.5.0 Requires: python-numpy >= 1.10.4 Requires: python-pandas Requires: python-traitlets >= 4.3.0 Requires: python-traittypes >= 0.0.6 -Provides: python-jupyter_bqplot = %{version} -Obsoletes: python-jupyter_bqplot < %{version} +Provides: python-jupyter_bqplot = %{pyver} +Obsoletes: python-jupyter_bqplot < %{pyver} BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module ipywidgets >= 7.5.0} -BuildRequires: %{python_module mock} +BuildRequires: %{python_module nbval} BuildRequires: %{python_module numpy >= 1.10.4} BuildRequires: %{python_module pandas} BuildRequires: %{python_module pytest} @@ -55,54 +63,67 @@ interactive Jupyter widgets. This package provides the python interface. -%package -n jupyter-bqplot -Summary: Interactive plotting package for the Jupyter notebook +%package -n jupyter-bqplot-notebook +Version: %{jupver} +Summary: Interactive plotting package for Jupyter Notebooke Requires: jupyter-notebook -Requires: python3-bqplot = %{version} +Requires: python3-bqplot = %{pyver} +Provides: jupyter-bqplot = %{pyver}-%{release} +# the jupyter-bqplot rpm package had the python package version until 0.12.13 +Obsoletes: jupyter-bqplot < %{pyver}-%{release} -%description -n jupyter-bqplot +%description -n jupyter-bqplot-notebook Plotting system for the Jupyter notebook based on the interactive Jupyter widgets. This package provides the jupyter notebook extension. +%package -n jupyter-bqplot-jupyterlab +Version: %{jupver} +Summary: Interactive plotting package for Jupyterlab +Requires: jupyter-bqplot-notebook +Requires: jupyter-jupyterlab + +%description -n jupyter-bqplot-jupyterlab +Plotting system for the Jupyter notebook based on the +interactive Jupyter widgets. + +This package provides the jupyterlab extension. + %prep -%setup -q -n bqplot-%{version} +%setup -q -n bqplot-%{pyver} +tar -x --strip-components=1 -f %{SOURCE1} bqplot-%{pyver}/{tests,ui-tests} +rm bqplot/install.py %build %python_build %install %python_install -%python_expand rm -r %{buildroot}%{$python_sitelib}/tests/ +cp -r etc/ %{buildroot}%{_sysconfdir} +cp -r share/ %{buildroot}%{_datadir} +%fdupes %{buildroot}%{_jupyter_prefix} %python_expand %fdupes %{buildroot}%{$python_sitelib} -%fdupes %{buildroot}%{_jupyter_nb_notebook_confdir} -%fdupes %{buildroot}%{_jupyter_nbextension_dir} - -%{python_expand sed -i -e "s|^#!%{_bindir}/env python|#!%{__$python}|" %{buildroot}%{$python_sitelib}/bqplot/install.py -chmod a+x %{buildroot}%{$python_sitelib}/bqplot/install.py -$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/bqplot/ -$python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/bqplot/ -%python_expand %fdupes %{buildroot}%{$python_sitelib} -} - -%jupyter_move_config %check -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} -$python -c "import bqplot" -} +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -c "import bqplot" %pytest tests/ +%pytest --nbval ui-tests/tests/notebooks %files %{python_files} %doc README.md %license LICENSE %{python_sitelib}/bqplot/ -%{python_sitelib}/bqplot-%{version}-py*.egg-info +%{python_sitelib}/bqplot-%{pyver}*-info -%files -n jupyter-bqplot +%files -n jupyter-bqplot-notebook %license LICENSE %config %{_jupyter_nb_notebook_confdir}/bqplot.json %{_jupyter_nbextension_dir}/bqplot/ +%files -n jupyter-bqplot-jupyterlab +%license LICENSE +%dir %{_jupyter_prefix}/labextensions +%{_jupyter_prefix}/labextensions/bqplot/ + %changelog