Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-nbdime for openSUSE:Factory checked in at 2021-04-19 21:06:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nbdime (Old) and /work/SRC/openSUSE:Factory/.python-nbdime.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-nbdime" Mon Apr 19 21:06:13 2021 rev:7 rq:886594 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/python-nbdime/python-nbdime.changes 2021-03-30 20:59:44.760674809 +0200 +++ /work/SRC/openSUSE:Factory/.python-nbdime.new.12324/python-nbdime.changes 2021-04-19 21:06:35.396082496 +0200 @@ -1,0 +2,11 @@ +Sat Apr 17 15:22:45 UTC 2021 - Ben Greiner <[email protected]> + +- Update to python 3.0.0 / jupyter 6.1.0 / jupyterlab 2.1.0 + * Added support for JupyterLab 3. This includes compatability + with jupyter_server (notebook is still supported as well). + * Basic functionality for working with cell ids introduced in + notebook format spec 4.5. Full utilization of this for diffing/ + merging functionality is planned for a later release. + * Fixed some issues with inline merging1 + +------------------------------------------------------------------- Old: ---- nbdime-2.1.0-py2.py3-none-any.whl New: ---- nbdime-3.0.0-py2.py3-none-any.whl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nbdime.spec ++++++ --- /var/tmp/diff_new_pack.wQHASA/_old 2021-04-19 21:06:35.908083264 +0200 +++ /var/tmp/diff_new_pack.wQHASA/_new 2021-04-19 21:06:35.912083269 +0200 @@ -18,8 +18,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 -%define mainver 2.1.0 -%define labver 2.0.1 +%define mainver 3.0.0 +%define jupver 6.1.0 +%define labver 2.1.0 Name: python-nbdime Version: %{mainver} Release: 0 @@ -29,9 +30,11 @@ Source: https://files.pythonhosted.org/packages/py2.py3/n/nbdime/nbdime-%{mainver}-py2.py3-none-any.whl BuildRequires: %{python_module GitPython >= 2.1.6} BuildRequires: %{python_module Jinja2 >= 2.9} +BuildRequires: %{python_module Pygments} BuildRequires: %{python_module colorama} +BuildRequires: %{python_module jupyter-server-mathjax >= 0.2.2} +BuildRequires: %{python_module jupyter-server} BuildRequires: %{python_module nbformat} -BuildRequires: %{python_module notebook} BuildRequires: %{python_module pip} BuildRequires: %{python_module requests} BuildRequires: %{python_module six} @@ -39,24 +42,32 @@ BuildRequires: fdupes BuildRequires: jupyter-jupyterlab-filesystem BuildRequires: python-rpm-macros -# SECTION test requirements +# SECTION test requirements (including jupyter_server[test]) +BuildRequires: %{python_module ipykernel} BuildRequires: %{python_module jsonschema} +BuildRequires: %{python_module notebook} +BuildRequires: %{python_module pytest-console-scripts} +BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest-tornado} +BuildRequires: %{python_module pytest-tornasync} BuildRequires: %{python_module pytest} # /SECTION -Requires: jupyter-nbdime = %{mainver} +Requires: jupyter-nbdime = %{jupver} Requires: python-GitPython >= 2.1.6 Requires: python-Jinja2 >= 2.9 +Requires: python-Pygments Requires: python-colorama +Requires: python-jupyter-server +Requires: python-jupyter-server-mathjax >= 0.2.2 Requires: python-nbformat -Requires: python-notebook Requires: python-requests Requires: python-six Requires: python-tornado -Conflicts: python-jupyter_nbdime-hg < 1.0.5 Conflicts: python-jupyter_nbdime-git < 1.0.5 +Conflicts: python-jupyter_nbdime-hg < 1.0.5 Recommends: python-tabulate +Suggests: python-notebook Provides: python-jupyter_nbdime = %{mainver} Obsoletes: python-jupyter_nbdime < %{mainver} BuildArch: noarch @@ -69,6 +80,7 @@ This package provides the python interface. %package -n jupyter-nbdime +Version: %{jupver} Summary: A JupyterLab extension for showing Notebook diffs Requires: jupyter-nbformat Requires: jupyter-notebook @@ -97,11 +109,12 @@ This package provides the JupyterLab extension. %package -n jupyter-nbdime-git +Version: %{jupver} Summary: Git integration for jupyter-nbdime Requires: git-core -Requires: jupyter-nbdime = %{mainver} -Provides: python3-jupyter_nbdime-git = %{mainver} -Obsoletes: python3-jupyter_nbdime-git < %{mainver} +Requires: jupyter-nbdime = %{jupver} +Provides: python3-jupyter_nbdime-git = %{jupver} +Obsoletes: python3-jupyter_nbdime-git < %{jupver} %description -n jupyter-nbdime-git The nbdime package provides tools for diffing and merging of @@ -110,11 +123,12 @@ This package provides git integration. %package -n jupyter-nbdime-hg +Version: %{jupver} Summary: Mercurial integration for jupyter-nbdime -Requires: jupyter-nbdime = %{mainver} +Requires: jupyter-nbdime = %{jupver} Requires: mercurial -Provides: python3-jupyter_nbdime-hg = %{mainver} -Obsoletes: python3-jupyter_nbdime-hg < %{mainver} +Provides: python3-jupyter_nbdime-hg = %{jupver} +Obsoletes: python3-jupyter_nbdime-hg < %{jupver} %description -n jupyter-nbdime-hg The nbdime package provides tools for diffing and merging of @@ -126,17 +140,19 @@ %setup -q -c -T %build -%python_expand mkdir build; cp -a %{SOURCE0} build +: %install -%pyproject_install +%pyproject_install %{SOURCE0} %{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' {} + +%python_expand rm %{buildroot}%{$python_sitelib}/nbdime/labextension/schemas/nbdime-jupyterlab/package.json.orig %python_compileall +rm %{buildroot}%{_jupyter_prefix}/labextensions/nbdime-jupyterlab/schemas/nbdime-jupyterlab/package.json.orig %python_expand %fdupes %{buildroot}%{$python_sitelib} %fdupes %{buildroot}%{_jupyter_prefix} cp %{buildroot}%{python3_sitelib}/nbdime-%{mainver}.dist-info/LICENSE.md . @@ -161,12 +177,15 @@ %{_bindir}/nbmerge %{_bindir}/nbmerge-web %{_jupyter_nbextension_dir}/nbdime/ +%config %{_jupyter_server_confdir}/nbdime.json %config %{_jupyter_servextension_confdir}/nbdime.json %config %{_jupyter_nb_notebook_confdir}/nbdime.json %files -n jupyter-nbdime-jupyterlab %license LICENSE.md -%{_jupyter_labextensions_dir}/nbdime-jupyterlab-%{labver}.tgz +%dir %{_jupyter_prefix}/labextensions +%{_jupyter_prefix}/labextensions/nbdime-jupyterlab +%{_jupyter_prefix}/lab/extensions/nbdime-jupyterlab-%{labver}.tgz %files -n jupyter-nbdime-git %license LICENSE.md
