Accepting request 869699 from devel:languages:python:jupyter

OBS-URL: https://build.opensuse.org/request/show/869699
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-nbdime?expand=0&rev=6
This commit is contained in:
Richard Brown 2021-03-30 18:59:30 +00:00 committed by Git OBS Bridge
commit 938b9c9b46
4 changed files with 33 additions and 16 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5be5159e4f58d1324279fa330baca72d22d618fc0383fdb7dd549857e0858341
size 4316133

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53c5219ab56b157acb81faa1e09e36e5ba589a9bece47c6c197348699484a643
size 5046479

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Feb 4 11:03:23 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Update to 2.1.0 / jupyterlab extension 2.0.1
* Dropped Python 3.5 support.
* Optimize comparison of large stream outputs.
* Fixed an error when merging a file that were concurrently added
in two branches with git.
* Fixed a config bug where ignore configs written in a file was
not taken into account.
* Fixed compatibility with JupyterLab 2.2
- Changes in 2.0.0
* Dropped Python 2 support, and Python 3.4 support.
* Made web apps (e.g. nbdiff-web) work properly offline.
* Fix for git driver with renamed files.
- Fix new wheel location for %pyproject_install
-------------------------------------------------------------------
Thu Apr 23 10:42:16 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package python-nbdime
#
# 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
@ -18,8 +18,8 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
%define mainver 1.1.0
%define labver 1.0.0
%define mainver 2.1.0
%define labver 2.0.1
Name: python-nbdime
Version: %{mainver}
Release: 0
@ -40,8 +40,9 @@ BuildRequires: fdupes
BuildRequires: jupyter-jupyterlab-filesystem
BuildRequires: python-rpm-macros
# SECTION test requirements
BuildRequires: %{python_module jsonschema > 3}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module jsonschema}
BuildRequires: %{python_module pytest-timeout}
BuildRequires: %{python_module pytest-tornado}
BuildRequires: %{python_module pytest}
# /SECTION
Requires: jupyter-nbdime = %{mainver}
@ -125,30 +126,29 @@ This package provides mercurial integration.
%setup -q -c -T
%build
# Not needed
%python_expand mkdir build; cp -a %{SOURCE0} build
%install
cp -a %{SOURCE0} .
%pyproject_install
%{jupyter_move_config}
%python_expand sed -i 's/^import mock/from unittest import mock/' %{buildroot}%{$python_sitelib}/nbdime/tests/test_*.py
%python_expand find %{buildroot}%{$python_sitelib} -type f -name "*.py" -exec sed -i 's/\r$//' {} +
%python_expand find %{buildroot}%{$python_sitelib} -type f -name "*.ipynb" -exec sed -i 's/\r$//' {} +
%python_expand find %{buildroot}%{$python_sitelib}/nbdime/ -type f -name "*.py" -exec sed -i -e '/^#!\//, 1d' {} +
cp %{buildroot}%{python3_sitelib}/nbdime-%{mainver}.dist-info/LICENSE.md .
%python_compileall
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%{fdupes %{buildroot}%{_jupyter_prefix} %{buildroot}%{python3_sitelib}}
%fdupes %{buildroot}%{_jupyter_prefix}
cp %{buildroot}%{python3_sitelib}/nbdime-%{mainver}.dist-info/LICENSE.md .
%check
export PATH=$PATH:%{buildroot}%{_bindir}
export PYTHONDONTWRITEBYTECODE=1
git config --global user.email "test@test.com"
git config --global user.name "tester"
%pytest %{buildroot}%{python3_sitelib}/nbdime/
%pytest --pyargs nbdime
%files %{python_files}
%license %{python_sitelib}/nbdime-%{mainver}.dist-info/LICENSE.md
%license LICENSE.md
%{python_sitelib}/nbdime/
%{python_sitelib}/nbdime-%{mainver}.dist-info/