pool/python-nbdime
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1082573 from home:bnavigator:branches:devel:languages:python:jupyter

Browse Source 
- 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
This commit is contained in:
Benjamin Greiner 2023-04-24 17:35:00 +00:00 committed by Git OBS Bridge
parent 5973622b1e
commit d5bcdcbb1e
4 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nbdime-3.1.1.dev0.tar.gz
View File

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

3
nbdime-3.2.0.tar.gz Normal file
View File

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

6
python-nbdime.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Apr 23 20:15:14 UTC 2023 - Ben Greiner <code@bnavigator.de>
- 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 <code@bnavigator.de> Thu Feb 2 14:47:20 UTC 2023 - Ben Greiner <code@bnavigator.de>

70
python-nbdime.spec
View File

@ -22,33 +22,20 @@
%bcond_with libalternatives %bcond_with libalternatives
%endif %endif
%define gitcommits 27 %define pyver 3.2.0
%define gitcommit 2da614b %define labver 2.2.0
%define pyver 3.1.1 %define jupver 6.2.0
%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 anypythondist python3dist %define anypythondist python3dist
%define mainbins nbdime nbshow nbdiff nbdiff-web nbmerge nbmerge-web %define mainbins nbdime nbshow nbdiff nbdiff-web nbmerge nbmerge-web
%define gitbins git-nbdifftool git-nbmergetool git-nbdiffdriver git-nbmergedriver %define gitbins git-nbdifftool git-nbmergetool git-nbdiffdriver git-nbmergedriver
%define hgbins hg-nbdiff hg-nbdiffweb hg-nbmerge hg-nbmergeweb %define hgbins hg-nbdiff hg-nbdiffweb hg-nbmerge hg-nbmergeweb
Name: python-nbdime Name: python-nbdime
Version: %{mpyver} Version: %{pyver}
Release: 0 Release: 0
Summary: Tools for diffing and merging Jupyter Notebooks Summary: Tools for diffing and merging Jupyter Notebooks
License: BSD-3-Clause License: BSD-3-Clause
URL: https://github.com/jupyter/nbdime URL: https://github.com/jupyter/nbdime
# Source: https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-%%{pyver}.tar.gz 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
BuildRequires: %{python_module GitPython >= 2.1.6} BuildRequires: %{python_module GitPython >= 2.1.6}
BuildRequires: %{python_module Jinja2 >= 2.9} BuildRequires: %{python_module Jinja2 >= 2.9}
BuildRequires: %{python_module Pygments} BuildRequires: %{python_module Pygments}
@ -74,7 +61,7 @@ BuildRequires: %{python_module pytest-mock}
BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest-timeout}
BuildRequires: %{python_module pytest-tornado} BuildRequires: %{python_module pytest-tornado}
# /SECTION # /SECTION
Requires: jupyter-nbdime = %{mjupver} Requires: jupyter-nbdime = %{jupver}
Requires: python-GitPython >= 2.1.6 Requires: python-GitPython >= 2.1.6
Requires: python-Jinja2 >= 2.9 Requires: python-Jinja2 >= 2.9
Requires: python-Pygments Requires: python-Pygments
@ -95,8 +82,8 @@ Conflicts: python-jupyter_nbdime-git < 1.0.5
Conflicts: python-jupyter_nbdime-hg < 1.0.5 Conflicts: python-jupyter_nbdime-hg < 1.0.5
Recommends: python-tabulate Recommends: python-tabulate
Suggests: python-notebook Suggests: python-notebook
Provides: python-jupyter_nbdime = %{mpyver}-%{release} Provides: python-jupyter_nbdime = %{pyver}-%{release}
Obsoletes: python-jupyter_nbdime < %{mpyver}-%{release} Obsoletes: python-jupyter_nbdime < %{pyver}-%{release}
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages
@ -107,9 +94,9 @@ Jupyter Notebooks.
This package provides the python interface. This package provides the python interface.
%package -n jupyter-nbdime %package -n jupyter-nbdime
Version: %{mjupver} Version: %{jupver}
Summary: A JupyterLab extension for showing Notebook diffs 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 Conflicts: python3-jupyter_nbdime < 1.0.5
%description -n jupyter-nbdime %description -n jupyter-nbdime
@ -119,11 +106,11 @@ Jupyter Notebooks.
This package provides the tools and jupyter notebook extension. This package provides the tools and jupyter notebook extension.
%package -n jupyter-nbdime-jupyterlab %package -n jupyter-nbdime-jupyterlab
Version: %{mlabver} Version: %{labver}
Release: 0 Release: 0
Summary: A JupyterLab extension for showing Notebook diffs Summary: A JupyterLab extension for showing Notebook diffs
Requires: jupyter-jupyterlab Requires: jupyter-jupyterlab
Requires: %{anypythondist}(nbdime) = %{pyver}%{?gitcommits:.%gitcommits} Requires: %{anypythondist}(nbdime) = %{pyver}
%description -n jupyter-nbdime-jupyterlab %description -n jupyter-nbdime-jupyterlab
The nbdime package provides tools for diffing and merging of The nbdime package provides tools for diffing and merging of
@ -132,18 +119,18 @@ Jupyter Notebooks.
This package provides the JupyterLab extension. This package provides the JupyterLab extension.
%package git %package git
Version: %{mpyver} Version: %{pyver}
Summary: Git integration for python-nbdime Summary: Git integration for python-nbdime
Requires: git-core Requires: git-core
Requires: python-nbdime = %{mpyver} Requires: python-nbdime = %{mpyver}
# python3-jupyter_nbdime-git = JUPVER (!) was provided by a jupyter-nbdime-git package until end of 2022 # python3-jupyter_nbdime-git = JUPVER (!) was provided by a jupyter-nbdime-git package until end of 2022
Provides: python-jupyter_nbdime-git = %{mjupver}-%{release} Provides: python-jupyter_nbdime-git = %{jupver}-%{release}
Obsoletes: python-jupyter_nbdime-git < %{mjupver}-%{release} Obsoletes: python-jupyter_nbdime-git < %{jupver}-%{release}
%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
Provides: jupyter-nbdime-git = %{mjupver}-%{release} Provides: jupyter-nbdime-git = %{jupver}-%{release}
Obsoletes: jupyter-nbdime-git < %{mjupver}-%{release} Obsoletes: jupyter-nbdime-git < %{jupver}-%{release}
%else %else
Conflicts: jupyter-nbdime-git < %{mjupver}-%{release} Conflicts: jupyter-nbdime-git < %{jupver}-%{release}
%endif %endif
%if %{with libalternatives} %if %{with libalternatives}
Requires: alts Requires: alts
@ -159,18 +146,18 @@ Jupyter Notebooks.
This package provides git integration. This package provides git integration.
%package hg %package hg
Version: %{mpyver} Version: %{pyver}
Summary: Mercurial integration for python-nbdime Summary: Mercurial integration for python-nbdime
Requires: mercurial 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 # python3-jupyter_nbdime-hg = JUPVER (!) was provided by a jupyter-nbdime-git package until end of 2022
Provides: python-jupyter_nbdime-hg = %{mjupver}-%{release} Provides: python-jupyter_nbdime-hg = %{jupver}-%{release}
Obsoletes: python-jupyter_nbdime-hg < %{mjupver}-%{release} Obsoletes: python-jupyter_nbdime-hg < %{jupver}-%{release}
%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
Provides: jupyter-nbdime-hg = %{mjupver}-%{release} Provides: jupyter-nbdime-hg = %{jupver}-%{release}
Obsoletes: jupyter-nbdime-hg < %{mjupver}-%{release} Obsoletes: jupyter-nbdime-hg < %{jupver}-%{release}
%else %else
Conflicts: jupyter-nbdime-hg < %{mjupver}-%{release} Conflicts: jupyter-nbdime-hg < %{jupver}-%{release}
%endif %endif
%if %{with libalternatives} %if %{with libalternatives}
Requires: alts Requires: alts
@ -186,10 +173,7 @@ Jupyter Notebooks.
This package provides mercurial integration. This package provides mercurial integration.
%prep %prep
%autosetup -p1 -n nbdime-%{pyver}.dev0 %autosetup -p1 -n nbdime-%{pyver}
%{?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
find . -type f -name "*.py" -exec sed -i 's/\r$//' {} + find . -type f -name "*.py" -exec sed -i 's/\r$//' {} +
find . -type f -name "*.ipynb" -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' {} + find ./nbdime/ -type f -name "*.py" -exec sed -i -e '/^#!\//, 1d' {} +
@ -269,7 +253,7 @@ done
%python_alternative %{_bindir}/nbmerge %python_alternative %{_bindir}/nbmerge
%python_alternative %{_bindir}/nbmerge-web %python_alternative %{_bindir}/nbmerge-web
%{python_sitelib}/nbdime/ %{python_sitelib}/nbdime/
%{python_sitelib}/nbdime-%{pyver}%{?gitcommits:.%gitcommits}.dist-info/ %{python_sitelib}/nbdime-%{pyver}.dist-info/
%files %{python_files git} %files %{python_files git}
%license LICENSE.md %license LICENSE.md