From 86e5476d637fcc68ba444f292d6fa7884e4f93f7f1cdd554d875f384463f8890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 5 Feb 2021 09:29:12 +0000 Subject: [PATCH] Accepting request 869210 from home:bnavigator:branches:devel:languages:python:jupyter - 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 OBS-URL: https://build.opensuse.org/request/show/869210 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=19 --- nbdime-1.1.0-py2.py3-none-any.whl | 3 --- nbdime-2.1.0-py2.py3-none-any.whl | 3 +++ python-nbdime.changes | 17 +++++++++++++++++ python-nbdime.spec | 26 +++++++++++++------------- 4 files changed, 33 insertions(+), 16 deletions(-) delete mode 100644 nbdime-1.1.0-py2.py3-none-any.whl create mode 100644 nbdime-2.1.0-py2.py3-none-any.whl diff --git a/nbdime-1.1.0-py2.py3-none-any.whl b/nbdime-1.1.0-py2.py3-none-any.whl deleted file mode 100644 index 030177c..0000000 --- a/nbdime-1.1.0-py2.py3-none-any.whl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5be5159e4f58d1324279fa330baca72d22d618fc0383fdb7dd549857e0858341 -size 4316133 diff --git a/nbdime-2.1.0-py2.py3-none-any.whl b/nbdime-2.1.0-py2.py3-none-any.whl new file mode 100644 index 0000000..af7e453 --- /dev/null +++ b/nbdime-2.1.0-py2.py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53c5219ab56b157acb81faa1e09e36e5ba589a9bece47c6c197348699484a643 +size 5046479 diff --git a/python-nbdime.changes b/python-nbdime.changes index 1006388..0a804e5 100644 --- a/python-nbdime.changes +++ b/python-nbdime.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Feb 4 11:03:23 UTC 2021 - Ben Greiner + +- 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 diff --git a/python-nbdime.spec b/python-nbdime.spec index 56343c3..0650c07 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -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/