From f9fddeaecf2f335a368ff92c3e1f62b57ebc3ed2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 16:27:07 +0000 Subject: [PATCH 1/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 37e1dd7dc14afcce7914cd296d0fed7fd2c558b3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 6 Jun 2025 15:37:51 +0200 Subject: [PATCH 2/7] Rebuilt for Python 3.14 From 7ff1f01f11f139d34f96c5bc37fdc36302839e06 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:00:15 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4a9be6de5b7dc3b18e9b489cb617148f599c6fa4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:12:32 +0200 Subject: [PATCH 4/7] Rebuilt for Python 3.14.0rc2 bytecode From 4560c41e9f9277dcf23eb40bf6073741c7f9306e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 27 Aug 2025 15:47:11 -0600 Subject: [PATCH 5/7] Add noarch to ExclusiveArch - Use the pyproject declarative buildsystem --- python-nbdime.spec | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/python-nbdime.spec b/python-nbdime.spec index 631d39c..27b2481 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -6,7 +6,6 @@ Release: %autorelease Summary: Diff and merge of Jupyter notebooks License: BSD-3-Clause -BuildArch: noarch URL: https://nbdime.readthedocs.io/ VCS: git:%{giturl}.git Source0: %{giturl}/archive/v%{version}/nbdime-%{version}.tar.gz @@ -22,7 +21,12 @@ Patch: %{name}-unbundle-fontawesome.patch # components for x86_64 and aarch64 only. Check later releases to see if # the nx version has rolled forward to a version that supports more # architectures -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: noarch x86_64 aarch64 + +BuildArch: noarch +BuildSystem: pyproject +BuildOption(generate_buildrequires): -x docs,test +BuildOption(install): -l nbdime BuildRequires: fdupes BuildRequires: fontawesome-fonts-web @@ -32,7 +36,6 @@ BuildRequires: help2man BuildRequires: make BuildRequires: nodejs-devel BuildRequires: nodejs-npm -BuildRequires: python3-devel BuildRequires: python3-docs BuildRequires: yarnpkg @@ -222,6 +225,7 @@ Documentation for %{name}. %autosetup -n nbdime-%{version} -a1 -p1 cp -p %{SOURCE2} . +%conf # Remove useless shebangs sed -i '\,#!/usr/bin/env,d' \ nbdime/diffing/directorydiff.py \ @@ -236,30 +240,24 @@ sed -i '\,#!/usr/bin/env,d' \ sed -e "s|\('https://docs\.python\.org/3\.5', \)None|\1'%{_docdir}/python3-docs/html/objects.inv'|" \ -i docs/source/conf.py +%generate_buildrequires -p # Do not depend on jupyter_server_mathjax; it doesn't work in jupyterlab 4.10+ # https://github.com/jupyter-server/jupyter_server_mathjax/issues/20 sed -i '/jupyter_server_mathjax/d' pyproject.toml -%generate_buildrequires -%pyproject_buildrequires -x docs,test - -%build +%build -p export YARN_CACHE_FOLDER="$PWD/.package-cache" export npm_config_nodedir=%{_includedir}/node export CFLAGS='%{build_cflags} -I%{_includedir}/node' export CXXFLAGS='%{build_cxxflags} -I%{_includedir}/node' yarn install --offline -%pyproject_wheel - +%build -a # Build the documentation PYTHONPATH=$PWD make -C docs html rm docs/build/html/.buildinfo -%install -%pyproject_install -%pyproject_save_files -l nbdime - +%install -a # Move the configuration files to the standard Jupyter directories mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot}%{_sysconfdir} From 5e0964fdbd29a3c6f131f55f92564f44b0609a27 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:49:00 +0200 Subject: [PATCH 6/7] Rebuilt for Python 3.14.0rc3 bytecode From 6ef74b9780cbc8f67cb5c50f99dbd8632bdf0718 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 3 Nov 2025 16:31:56 -0700 Subject: [PATCH 7/7] Do not run code coverage tools --- python-nbdime.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python-nbdime.spec b/python-nbdime.spec index 27b2481..6f4309a 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -21,7 +21,7 @@ Patch: %{name}-unbundle-fontawesome.patch # components for x86_64 and aarch64 only. Check later releases to see if # the nx version has rolled forward to a version that supports more # architectures -ExclusiveArch: noarch x86_64 aarch64 +ExclusiveArch: %{x86_64} %{arm64} noarch BuildArch: noarch BuildSystem: pyproject @@ -39,8 +39,7 @@ BuildRequires: nodejs-npm BuildRequires: python3-docs BuildRequires: yarnpkg -%global _desc %{expand: -Nbdime provides tools for diffing and merging of Jupyter notebooks. +%global _desc %{expand:Nbdime provides tools for diffing and merging of Jupyter notebooks. - nbdiff: compare notebooks in a terminal-friendly way - nbmerge: three-way merge of notebooks with automatic conflict resolution @@ -48,7 +47,8 @@ Nbdime provides tools for diffing and merging of Jupyter notebooks. - nbmerge-web: gives you a web-based three-way merge tool for notebooks - nbshow: present a single notebook in a terminal-friendly way} -%description %_desc +%description +%_desc %package -n python3-nbdime # The nbdime project is released under the BSD-3-Clause license. @@ -194,7 +194,8 @@ Provides: bundled(npm(w3c-keyname)) = 2.2.8 Provides: bundled(npm(y-protocols)) = 1.0.6 Provides: bundled(npm(yjs)) = 13.6.18 -%description -n python3-nbdime %_desc +%description -n python3-nbdime +%_desc %package doc # The content is BSD-3-Clause. Other licenses are due to Sphinx files. @@ -244,6 +245,8 @@ sed -e "s|\('https://docs\.python\.org/3\.5', \)None|\1'%{_docdir}/python3-docs/ # Do not depend on jupyter_server_mathjax; it doesn't work in jupyterlab 4.10+ # https://github.com/jupyter-server/jupyter_server_mathjax/issues/20 sed -i '/jupyter_server_mathjax/d' pyproject.toml +# Do not run code coverage tools +sed -i '/pytest-cov/d' pyproject.toml %build -p export YARN_CACHE_FOLDER="$PWD/.package-cache"