From 5973622b1ef59181670af2b8a85c4a0cc80e1f02af3578ad04c3e03cd0bdf11a Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 2 Feb 2023 19:20:46 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=29 --- python-nbdime.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-nbdime.spec b/python-nbdime.spec index 20fc893..7790446 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -42,7 +42,7 @@ 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 +# Building from non-PyPI 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 From d5bcdcbb1eb758f7e2f5c080efeeb5279c65566cd44795f2cd459162f5f0b504 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Mon, 24 Apr 2023 17:35:00 +0000 Subject: [PATCH 2/5] Accepting request 1082573 from home:bnavigator:branches:devel:languages:python:jupyter - Update to python v3.2.0 / jupyter 6.2.0 / jupyterlab 2.2.0 * no upstream release notes. OBS-URL: https://build.opensuse.org/request/show/1082573 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=31 --- nbdime-3.1.1.dev0.tar.gz | 3 -- nbdime-3.2.0.tar.gz | 3 ++ python-nbdime.changes | 6 ++++ python-nbdime.spec | 70 ++++++++++++++++------------------------ 4 files changed, 36 insertions(+), 46 deletions(-) delete mode 100644 nbdime-3.1.1.dev0.tar.gz create mode 100644 nbdime-3.2.0.tar.gz diff --git a/nbdime-3.1.1.dev0.tar.gz b/nbdime-3.1.1.dev0.tar.gz deleted file mode 100644 index f4895ad..0000000 --- a/nbdime-3.1.1.dev0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6e8eb35346438d467516a0655cb18faeddb03475f093ba258826912e0473d73 -size 7894057 diff --git a/nbdime-3.2.0.tar.gz b/nbdime-3.2.0.tar.gz new file mode 100644 index 0000000..61833b4 --- /dev/null +++ b/nbdime-3.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e50d1a0cf672e02356e10e6d3d0aea8e8612a534ae6e1b9bfd59ac3b60c405eb +size 7513703 diff --git a/python-nbdime.changes b/python-nbdime.changes index fafc0d9..0e909f2 100644 --- a/python-nbdime.changes +++ b/python-nbdime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Apr 23 20:15:14 UTC 2023 - Ben Greiner + +- Update to python v3.2.0 / jupyter 6.2.0 / jupyterlab 2.2.0 + * no upstream release notes. + ------------------------------------------------------------------- Thu Feb 2 14:47:20 UTC 2023 - Ben Greiner diff --git a/python-nbdime.spec b/python-nbdime.spec index 7790446..af8ee38 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -22,33 +22,20 @@ %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 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-PyPI 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 +61,7 @@ BuildRequires: %{python_module pytest-mock} 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 +82,8 @@ 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 = %{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 +94,9 @@ Jupyter Notebooks. 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) = %{pyver} Conflicts: python3-jupyter_nbdime < 1.0.5 %description -n jupyter-nbdime @@ -119,11 +106,11 @@ Jupyter Notebooks. 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) = %{pyver} %description -n jupyter-nbdime-jupyterlab The nbdime package provides tools for diffing and merging of @@ -132,18 +119,18 @@ Jupyter Notebooks. 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} # 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 +146,18 @@ Jupyter Notebooks. 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 +173,7 @@ Jupyter Notebooks. 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 +253,7 @@ done %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 From 04a95097fe94b91b73c0e6fdd016729c3f8398926289b072d4522c108ca38d12 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Mon, 24 Apr 2023 18:18:34 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=32 --- python-nbdime.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-nbdime.spec b/python-nbdime.spec index af8ee38..16d6fcc 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -26,6 +26,7 @@ %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 @@ -110,7 +111,7 @@ Version: %{labver} Release: 0 Summary: A JupyterLab extension for showing Notebook diffs Requires: jupyter-jupyterlab -Requires: %{anypythondist}(nbdime) = %{pyver} +Requires: %{anypythondist}(nbdime) = %{pyverdist} %description -n jupyter-nbdime-jupyterlab The nbdime package provides tools for diffing and merging of From 09fe19b9bea0d451dec7ac9fb32bb4d4c9a311ece66405207d6da0bd0813b42c Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Mon, 24 Apr 2023 18:37:18 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=33 --- python-nbdime.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-nbdime.spec b/python-nbdime.spec index 16d6fcc..f190b74 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -97,7 +97,7 @@ This package provides the python interface. %package -n jupyter-nbdime Version: %{jupver} Summary: A JupyterLab extension for showing Notebook diffs -Requires: %{anypythondist}(nbdime) = %{pyver} +Requires: %{anypythondist}(nbdime) = %{pyverdist} Conflicts: python3-jupyter_nbdime < 1.0.5 %description -n jupyter-nbdime From 8ec64de76f24e7ef9006d48ce843c7a69b2518c4a161a88c4e5061a3c826ff4f Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Mon, 24 Apr 2023 19:34:52 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=34 --- python-nbdime.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-nbdime.spec b/python-nbdime.spec index f190b74..748bf41 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -123,7 +123,7 @@ This package provides the JupyterLab extension. 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 = %{jupver}-%{release} Obsoletes: python-jupyter_nbdime-git < %{jupver}-%{release}