From 128c5e5bf4330543bb99554444d8083097665269 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 15 Jul 2025 08:35:38 -0600 Subject: [PATCH 1/5] Do not build on ppc64le due to lack of a binary builder --- python-jupytext.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-jupytext.spec b/python-jupytext.spec index 4d1f3e2..52b683b 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -18,7 +18,8 @@ Source3: prepare_vendor.sh # s390x builds fail due to a bug in jupyterlab # https://bugzilla.redhat.com/show_bug.cgi?id=2278011 -ExcludeArch: s390x +# ppc64le build fails due to lack of a binary builder +ExcludeArch: %{power64} s390x BuildRequires: gcc-c++ BuildRequires: help2man From c4985ac4a81a303fc7d6b96147baaa8f13bee2ab Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 27 Aug 2025 16:40:21 -0600 Subject: [PATCH 2/5] Change ExcludeArch to ExclusiveArch - Limits the build to arches with working binary builders - Allows installation on any arch --- python-jupytext.spec | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/python-jupytext.spec b/python-jupytext.spec index 52b683b..0c2a61c 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -7,7 +7,6 @@ Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts License: MIT -BuildArch: noarch URL: https://jupytext.readthedocs.io/ VCS: git:%{giturl}.git Source0: %{giturl}/archive/v%{version}/jupytext-%{version}%{?vsuffix}.tar.gz @@ -19,7 +18,12 @@ Source3: prepare_vendor.sh # s390x builds fail due to a bug in jupyterlab # https://bugzilla.redhat.com/show_bug.cgi?id=2278011 # ppc64le build fails due to lack of a binary builder -ExcludeArch: %{power64} s390x +ExclusiveArch: %{x86_64} %{arm64} noarch + +BuildArch: noarch +BuildSystem: pyproject +BuildOption(generate_buildrequires): -x docs,test,test-functional,test-integration +BuildOption(install): -l jupytext jupytext_config BuildRequires: gcc-c++ BuildRequires: help2man @@ -27,8 +31,6 @@ BuildRequires: make BuildRequires: nodejs-devel BuildRequires: nodejs-npm BuildRequires: pandoc -BuildRequires: python3-devel -BuildRequires: %{py3_dist setuptools} # Temporary workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2275382 BuildRequires: nodejs-full-i18n @@ -119,28 +121,25 @@ sed -i '/jupytext/d' docs/doc-requirements.txt # Take this package out of the test requirements sed -ri '/jupytext\[test(-functional)?\]/d' pyproject.toml -%generate_buildrequires +%generate_buildrequires -p export HATCH_BUILD_HOOKS_ENABLE=true -%pyproject_buildrequires -x docs,test,test-functional,test-integration -%build +%build -p export HATCH_BUILD_HOOKS_ENABLE=true export YARN_CACHE_FOLDER="$PWD/jupyterlab/.package-cache" export npm_config_nodedir=%{_includedir}/node export CFLAGS='%{build_cflags} -I%{_includedir}/node' export CXXFLAGS='%{build_cxxflags} -I%{_includedir}/node' -%pyproject_wheel - +%build -a # Build the documentation PYTHONPATH=$PWD %make_build -C docs html rm docs/_build/html/.buildinfo -%install +%install -p export HATCH_BUILD_HOOKS_ENABLE=true -%pyproject_install -%pyproject_save_files -l jupytext jupytext_config +%install -a # Cleanup backup files find %{buildroot}%{_prefix} -name \*.orig -delete From 6b11ad730ac3d1695c16c3232907f3f277aa3394 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 28 Aug 2025 14:51:34 -0600 Subject: [PATCH 3/5] Version 1.17.3 --- ...vendor-licenses.txt => jupytext-1.17.3-vendor-licenses.txt | 2 +- python-jupytext.spec | 4 ++-- sources | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename jupytext-1.17.2-vendor-licenses.txt => jupytext-1.17.3-vendor-licenses.txt (94%) diff --git a/jupytext-1.17.2-vendor-licenses.txt b/jupytext-1.17.3-vendor-licenses.txt similarity index 94% rename from jupytext-1.17.2-vendor-licenses.txt rename to jupytext-1.17.3-vendor-licenses.txt index 307ae0d..2d281d9 100644 --- a/jupytext-1.17.2-vendor-licenses.txt +++ b/jupytext-1.17.3-vendor-licenses.txt @@ -1,7 +1,7 @@ ├─ MIT: 766 ├─ ISC: 188 ├─ BSD-3-Clause: 99 -├─ Apache-2.0: 55 +├─ Apache-2.0: 56 ├─ BSD-2-Clause: 29 ├─ BlueOak-1.0.0: 7 ├─ (MIT OR CC0-1.0): 6 diff --git a/python-jupytext.spec b/python-jupytext.spec index 0c2a61c..120bc67 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -2,7 +2,7 @@ #global vsuffix d Name: python-jupytext -Version: 1.17.2 +Version: 1.17.3 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts @@ -17,7 +17,7 @@ Source3: prepare_vendor.sh # s390x builds fail due to a bug in jupyterlab # https://bugzilla.redhat.com/show_bug.cgi?id=2278011 -# ppc64le build fails due to lack of a binary builder +# ppc64le builds fail due to lack of a binary builder ExclusiveArch: %{x86_64} %{arm64} noarch BuildArch: noarch diff --git a/sources b/sources index 9113c9a..0f26449 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.17.2-vendor.tar.xz) = b997ef8bf9ca341d37b7992d5f093c8c9fea4322830e1818a8979bdd97b3cea64266db7ca8f5ac0fd8d3aca07160e7d9a540f3ba00b9f26e3bc8cc7c5d706323 -SHA512 (jupytext-1.17.2.tar.gz) = 5c284ab96dabaedf3d94fe0216d926b78238a03fb93a1af5f9ec8747e0aa17960b645004cf39ff674999051e9c415470cec1fd3fcb305250b31f846b88519dde +SHA512 (jupytext-1.17.3-vendor.tar.xz) = 3bcdf1a0b73315e5d832e80e42f538333264bf9dfe6a92a9ce670c895368baa4f123c9464f21347cb48c197769088696f8de9a6f1b3c073ea7075b7f2dd22127 +SHA512 (jupytext-1.17.3.tar.gz) = 768093d759ccc24b7c8b832267e18a3f2a98480bac890b867ad976d902ca44f684872330740f3a092e3b063e31cdaf11a19a31c8ec71c75456a891b35ab11467 From 821e4734123079a2feb59b9830556205aec48749 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 18 Oct 2025 13:06:34 -0600 Subject: [PATCH 4/5] Version 1.18.0 --- ...txt => jupytext-1.18.0-vendor-licenses.txt | 0 python-jupytext.spec | 25 ++++++++++++------- sources | 4 +-- 3 files changed, 18 insertions(+), 11 deletions(-) rename jupytext-1.17.3-vendor-licenses.txt => jupytext-1.18.0-vendor-licenses.txt (100%) diff --git a/jupytext-1.17.3-vendor-licenses.txt b/jupytext-1.18.0-vendor-licenses.txt similarity index 100% rename from jupytext-1.17.3-vendor-licenses.txt rename to jupytext-1.18.0-vendor-licenses.txt diff --git a/python-jupytext.spec b/python-jupytext.spec index 120bc67..58740d4 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -2,7 +2,7 @@ #global vsuffix d Name: python-jupytext -Version: 1.17.3 +Version: 1.18.0 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts @@ -35,11 +35,10 @@ BuildRequires: pandoc # Temporary workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2275382 BuildRequires: nodejs-full-i18n -%global _desc %{expand: -Have you always wished Jupyter notebooks were plain text documents? -Wished you could edit them in your favorite IDE? And get clear and -meaningful diffs when doing version control? Then... Jupytext may well -be the tool you're looking for! +%global _desc %{expand:Have you always wished Jupyter notebooks were plain text documents? Wished +you could edit them in your favorite IDE? And get clear and meaningful diffs +when doing version control? Then... Jupytext may well be the tool you're +looking for! Jupytext is a plugin for Jupyter that can save Jupyter notebooks as - Markdown files (or MyST Markdown files, or R Markdown or Quarto text @@ -51,14 +50,16 @@ Common use cases for Jupytext are: - Editing, merging or refactoring notebooks in your favorite text editor - Applying Q&A checks on notebooks.} -%description %_desc +%description +%_desc %package -n python3-jupytext Summary: %{summary} # Filesystem package for the standard Jupyter paths Requires: python-jupyter-filesystem -%description -n python3-jupytext %_desc +%description -n python3-jupytext +%_desc %package -n python3-jupyterlab-jupytext # The jupytext project is released under the MIT license. Bundled JavaScript: @@ -75,7 +76,8 @@ Provides: bundled(npm(buffer)) = 6.0.3 Provides: bundled(npm(ieee754)) = 1.2.1 Provides: bundled(npm(jupyterlab-rise)) = 0.43.1 -%description -n python3-jupyterlab-jupytext %_desc +%description -n python3-jupyterlab-jupytext +%_desc %package doc # The content is MIT. Other licenses are due to Sphinx files. @@ -121,6 +123,11 @@ sed -i '/jupytext/d' docs/doc-requirements.txt # Take this package out of the test requirements sed -ri '/jupytext\[test(-functional)?\]/d' pyproject.toml +# Skip a test that fails with version 1.18.0 +# https://github.com/mwouts/jupytext/issues/1460 +sed -i '/when_using_jupytext_sync/i@pytest.mark.skip' \ + tests/functional/cli/test_source_is_newer.py + %generate_buildrequires -p export HATCH_BUILD_HOOKS_ENABLE=true diff --git a/sources b/sources index 0f26449..c76c909 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.17.3-vendor.tar.xz) = 3bcdf1a0b73315e5d832e80e42f538333264bf9dfe6a92a9ce670c895368baa4f123c9464f21347cb48c197769088696f8de9a6f1b3c073ea7075b7f2dd22127 -SHA512 (jupytext-1.17.3.tar.gz) = 768093d759ccc24b7c8b832267e18a3f2a98480bac890b867ad976d902ca44f684872330740f3a092e3b063e31cdaf11a19a31c8ec71c75456a891b35ab11467 +SHA512 (jupytext-1.18.0-vendor.tar.xz) = b1dcbbd21877d82b3134f604a572eee23b9bf271b54d1cafefc2b88ca0ae1cc2b9b440cec45cbb0c6de122ee25697c103999a0f01f0767d2dd7c48532db56109 +SHA512 (jupytext-1.18.0.tar.gz) = 8966d205843333f30ee1ffe60acafa6cf3073c2e9f9e357519871c8862b3dd8a323fa93b143e3fafca7fa7da3b5b6e937d3b301a682b281429864baa501d513d From d137025966805035fa10844550943e468fb0bb30 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 20 Oct 2025 09:59:28 -0600 Subject: [PATCH 5/5] Version 1.18.1 --- ...dor-licenses.txt => jupytext-1.18.1-vendor-licenses.txt | 0 python-jupytext.spec | 7 +------ sources | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) rename jupytext-1.18.0-vendor-licenses.txt => jupytext-1.18.1-vendor-licenses.txt (100%) diff --git a/jupytext-1.18.0-vendor-licenses.txt b/jupytext-1.18.1-vendor-licenses.txt similarity index 100% rename from jupytext-1.18.0-vendor-licenses.txt rename to jupytext-1.18.1-vendor-licenses.txt diff --git a/python-jupytext.spec b/python-jupytext.spec index 58740d4..520ea17 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -2,7 +2,7 @@ #global vsuffix d Name: python-jupytext -Version: 1.18.0 +Version: 1.18.1 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts @@ -123,11 +123,6 @@ sed -i '/jupytext/d' docs/doc-requirements.txt # Take this package out of the test requirements sed -ri '/jupytext\[test(-functional)?\]/d' pyproject.toml -# Skip a test that fails with version 1.18.0 -# https://github.com/mwouts/jupytext/issues/1460 -sed -i '/when_using_jupytext_sync/i@pytest.mark.skip' \ - tests/functional/cli/test_source_is_newer.py - %generate_buildrequires -p export HATCH_BUILD_HOOKS_ENABLE=true diff --git a/sources b/sources index c76c909..e7659a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.18.0-vendor.tar.xz) = b1dcbbd21877d82b3134f604a572eee23b9bf271b54d1cafefc2b88ca0ae1cc2b9b440cec45cbb0c6de122ee25697c103999a0f01f0767d2dd7c48532db56109 -SHA512 (jupytext-1.18.0.tar.gz) = 8966d205843333f30ee1ffe60acafa6cf3073c2e9f9e357519871c8862b3dd8a323fa93b143e3fafca7fa7da3b5b6e937d3b301a682b281429864baa501d513d +SHA512 (jupytext-1.18.1-vendor.tar.xz) = b1dcbbd21877d82b3134f604a572eee23b9bf271b54d1cafefc2b88ca0ae1cc2b9b440cec45cbb0c6de122ee25697c103999a0f01f0767d2dd7c48532db56109 +SHA512 (jupytext-1.18.1.tar.gz) = 31593c01826319bb3517e546f0c04c99f786de33aa41082d2dfd411457fccd517f93fc9ea9f809fc75fbf0c9c78eedc0d5503e02486fe602876efbaf8a50c7f2