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 2023-04-25 16:42:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-nbdime (Old)
and /work/SRC/openSUSE:Factory/.python-nbdime.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-nbdime"
Tue Apr 25 16:42:19 2023 rev:11 rq:1082590 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-nbdime/python-nbdime.changes
2023-02-03 22:16:23.691176575 +0100
+++ /work/SRC/openSUSE:Factory/.python-nbdime.new.1533/python-nbdime.changes
2023-04-25 16:42:20.618060719 +0200
@@ -1,0 +2,6 @@
+Sun Apr 23 20:15:14 UTC 2023 - Ben Greiner <c...@bnavigator.de>
+
+- Update to python v3.2.0 / jupyter 6.2.0 / jupyterlab 2.2.0
+ * no upstream release notes.
+
+-------------------------------------------------------------------
Old:
----
nbdime-3.1.1.dev0.tar.gz
New:
----
nbdime-3.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-nbdime.spec ++++++
--- /var/tmp/diff_new_pack.rytmoB/_old 2023-04-25 16:42:21.174063991 +0200
+++ /var/tmp/diff_new_pack.rytmoB/_new 2023-04-25 16:42:21.178064014 +0200
@@ -22,33 +22,21 @@
%bcond_with libalternatives
%endif
-%define gitcommits 27
-%define gitcommit 2da614b
-%define pyver 3.1.1
-%define labver 2.1.1
-%define jupver 6.1.2
-%{?gitcommits:%define mainsuffix .%{gitcommits}.g%{gitcommit}}
-%define mpyver %{pyver}%{?mainsuffix}
-%define mjupver %{jupver}%{?mainsuffix}
-%define mlabver %{labver}%{?mainsuffix}
+%define pyver 3.2.0
+%define labver 2.2.0
+%define jupver 6.2.0
%define anypythondist python3dist
+%define pyverdist 3.2
%define mainbins nbdime nbshow nbdiff nbdiff-web nbmerge nbmerge-web
%define gitbins git-nbdifftool git-nbmergetool git-nbdiffdriver
git-nbmergedriver
%define hgbins hg-nbdiff hg-nbdiffweb hg-nbmerge hg-nbmergeweb
Name: python-nbdime
-Version: %{mpyver}
+Version: %{pyver}
Release: 0
Summary: Tools for diffing and merging Jupyter Notebooks
License: BSD-3-Clause
URL: https://github.com/jupyter/nbdime
-# Source:
https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-%%{pyver}.tar.gz
-# Building from non-pypy published source repositories requires npm install to
fetch javascript sources online
-# Created on a network connected system with in a working directory without
':' in the the pathname.
-# git clone https://github.com/jupyter/nbdime.git
-# cd nbdime
-# python3 -m build --sdist .
-# git describe --tags --match '[0-9].*' | sed -e 's/^/mpyver /' -e 's/-/./g'
-Source: nbdime-%{pyver}.dev0.tar.gz
+Source:
https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-%{pyver}.tar.gz
BuildRequires: %{python_module GitPython >= 2.1.6}
BuildRequires: %{python_module Jinja2 >= 2.9}
BuildRequires: %{python_module Pygments}
@@ -74,7 +62,7 @@
BuildRequires: %{python_module pytest-timeout}
BuildRequires: %{python_module pytest-tornado}
# /SECTION
-Requires: jupyter-nbdime = %{mjupver}
+Requires: jupyter-nbdime = %{jupver}
Requires: python-GitPython >= 2.1.6
Requires: python-Jinja2 >= 2.9
Requires: python-Pygments
@@ -95,8 +83,8 @@
Conflicts: python-jupyter_nbdime-hg < 1.0.5
Recommends: python-tabulate
Suggests: python-notebook
-Provides: python-jupyter_nbdime = %{mpyver}-%{release}
-Obsoletes: python-jupyter_nbdime < %{mpyver}-%{release}
+Provides: python-jupyter_nbdime = %{pyver}-%{release}
+Obsoletes: python-jupyter_nbdime < %{pyver}-%{release}
BuildArch: noarch
%python_subpackages
@@ -107,9 +95,9 @@
This package provides the python interface.
%package -n jupyter-nbdime
-Version: %{mjupver}
+Version: %{jupver}
Summary: A JupyterLab extension for showing Notebook diffs
-Requires: %{anypythondist}(nbdime) = %{pyver}%{?gitcommits:.%gitcommits}
+Requires: %{anypythondist}(nbdime) = %{pyverdist}
Conflicts: python3-jupyter_nbdime < 1.0.5
%description -n jupyter-nbdime
@@ -119,11 +107,11 @@
This package provides the tools and jupyter notebook extension.
%package -n jupyter-nbdime-jupyterlab
-Version: %{mlabver}
+Version: %{labver}
Release: 0
Summary: A JupyterLab extension for showing Notebook diffs
Requires: jupyter-jupyterlab
-Requires: %{anypythondist}(nbdime) = %{pyver}%{?gitcommits:.%gitcommits}
+Requires: %{anypythondist}(nbdime) = %{pyverdist}
%description -n jupyter-nbdime-jupyterlab
The nbdime package provides tools for diffing and merging of
@@ -132,18 +120,18 @@
This package provides the JupyterLab extension.
%package git
-Version: %{mpyver}
+Version: %{pyver}
Summary: Git integration for python-nbdime
Requires: git-core
-Requires: python-nbdime = %{mpyver}
+Requires: python-nbdime = %{pyver}
# python3-jupyter_nbdime-git = JUPVER (!) was provided by a jupyter-nbdime-git
package until end of 2022
-Provides: python-jupyter_nbdime-git = %{mjupver}-%{release}
-Obsoletes: python-jupyter_nbdime-git < %{mjupver}-%{release}
+Provides: python-jupyter_nbdime-git = %{jupver}-%{release}
+Obsoletes: python-jupyter_nbdime-git < %{jupver}-%{release}
%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
-Provides: jupyter-nbdime-git = %{mjupver}-%{release}
-Obsoletes: jupyter-nbdime-git < %{mjupver}-%{release}
+Provides: jupyter-nbdime-git = %{jupver}-%{release}
+Obsoletes: jupyter-nbdime-git < %{jupver}-%{release}
%else
-Conflicts: jupyter-nbdime-git < %{mjupver}-%{release}
+Conflicts: jupyter-nbdime-git < %{jupver}-%{release}
%endif
%if %{with libalternatives}
Requires: alts
@@ -159,18 +147,18 @@
This package provides git integration.
%package hg
-Version: %{mpyver}
+Version: %{pyver}
Summary: Mercurial integration for python-nbdime
Requires: mercurial
-Requires: python-nbdime = %{mpyver}
+Requires: python-nbdime = %{pyver}
# python3-jupyter_nbdime-hg = JUPVER (!) was provided by a jupyter-nbdime-git
package until end of 2022
-Provides: python-jupyter_nbdime-hg = %{mjupver}-%{release}
-Obsoletes: python-jupyter_nbdime-hg < %{mjupver}-%{release}
+Provides: python-jupyter_nbdime-hg = %{jupver}-%{release}
+Obsoletes: python-jupyter_nbdime-hg < %{jupver}-%{release}
%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
-Provides: jupyter-nbdime-hg = %{mjupver}-%{release}
-Obsoletes: jupyter-nbdime-hg < %{mjupver}-%{release}
+Provides: jupyter-nbdime-hg = %{jupver}-%{release}
+Obsoletes: jupyter-nbdime-hg < %{jupver}-%{release}
%else
-Conflicts: jupyter-nbdime-hg < %{mjupver}-%{release}
+Conflicts: jupyter-nbdime-hg < %{jupver}-%{release}
%endif
%if %{with libalternatives}
Requires: alts
@@ -186,10 +174,7 @@
This package provides mercurial integration.
%prep
-%autosetup -p1 -n nbdime-%{pyver}.dev0
-%{?gitcommits:sed -i "s/'dev'/'%{gitcommits}'/" nbdime/_version.py}
-# gh#jupyter/nbdime#651
-sed -i 's/^import mock/from unittest import mock/' nbdime/tests/test_*.py
+%autosetup -p1 -n nbdime-%{pyver}
find . -type f -name "*.py" -exec sed -i 's/\r$//' {} +
find . -type f -name "*.ipynb" -exec sed -i 's/\r$//' {} +
find ./nbdime/ -type f -name "*.py" -exec sed -i -e '/^#!\//, 1d' {} +
@@ -269,7 +254,7 @@
%python_alternative %{_bindir}/nbmerge
%python_alternative %{_bindir}/nbmerge-web
%{python_sitelib}/nbdime/
-%{python_sitelib}/nbdime-%{pyver}%{?gitcommits:.%gitcommits}.dist-info/
+%{python_sitelib}/nbdime-%{pyver}.dist-info/
%files %{python_files git}
%license LICENSE.md
++++++ nbdime-3.1.1.dev0.tar.gz -> nbdime-3.2.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-nbdime/nbdime-3.1.1.dev0.tar.gz
/work/SRC/openSUSE:Factory/.python-nbdime.new.1533/nbdime-3.2.0.tar.gz differ:
char 5, line 1
