From 0a8455b6c0b15d6e8c8498a48f14a46ecbbfa510 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Feb 2025 20:54:20 -0700 Subject: [PATCH 1/7] Version 1.16.7 --- ...icenses.txt => jupytext-1.16.7-vendor-licenses.txt | 11 ++++++----- python-jupytext.spec | 2 +- sources | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) rename jupytext-1.16.6-vendor-licenses.txt => jupytext-1.16.7-vendor-licenses.txt (72%) diff --git a/jupytext-1.16.6-vendor-licenses.txt b/jupytext-1.16.7-vendor-licenses.txt similarity index 72% rename from jupytext-1.16.6-vendor-licenses.txt rename to jupytext-1.16.7-vendor-licenses.txt index da105a4..0485d4b 100644 --- a/jupytext-1.16.6-vendor-licenses.txt +++ b/jupytext-1.16.7-vendor-licenses.txt @@ -1,11 +1,11 @@ -├─ MIT: 744 -├─ ISC: 218 -├─ BSD-3-Clause: 97 -├─ Apache-2.0: 56 +├─ MIT: 776 +├─ ISC: 228 +├─ BSD-3-Clause: 98 +├─ Apache-2.0: 57 ├─ BSD-2-Clause: 29 ├─ (MIT OR CC0-1.0): 7 +├─ BlueOak-1.0.0: 5 ├─ CC0-1.0: 2 -├─ BlueOak-1.0.0: 2 ├─ UNLICENSED: 2 ├─ 0BSD: 2 ├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 @@ -15,6 +15,7 @@ ├─ CC-BY-4.0: 1 ├─ BSD*: 1 ├─ Unlicense: 1 +├─ LGPL-3.0: 1 ├─ CC-BY-3.0: 1 └─ (MIT AND CC-BY-3.0): 1 diff --git a/python-jupytext.spec b/python-jupytext.spec index 927efa8..c1f2632 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -5,7 +5,7 @@ #global vsuffix d Name: python-jupytext -Version: 1.16.6 +Version: 1.16.7 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts diff --git a/sources b/sources index ec4c1b2..cb64d9d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.16.6-vendor.tar.xz) = d5a6a2294caace6fcadacd2c9126d078420336a145996fbbebbf7d2eed3c8103698abccee595a469e419787a53072839c3da785a61b1c00eb5c442608948b03c -SHA512 (jupytext-1.16.6.tar.gz) = 8580678ef70b7d9fd2056b533697e807252fd7a9fe45ebdae48ee536a157a5e1a6b33cfaa7266710e5e5fb15bb1098419ed6fbadce0b5dee4ca9f2eb0040bcfd +SHA512 (jupytext-1.16.7-vendor.tar.xz) = 27785c165f2582fae1a0e1c6bdf9eb68a89a2c24c64e7dc247d39f2f02c884df37a176e7b1f4807d2d45167784bf804f07ac1b2503aca31965e675d26069fb10 +SHA512 (jupytext-1.16.7.tar.gz) = f0935fba168e52b84babea865aa6117cba31e4cae615ef1d32608a918c4650da06992fd5d9b1de01e18edc3b44ab83c1bc5c721ca89a57b4f45fdead38bc5bb5 From 1b074b6578aad90832ae69b37ecf528c6737781c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 5 Apr 2025 14:05:26 -0600 Subject: [PATCH 2/7] Version 1.17.0 --- ...s.txt => jupytext-1.17.0-vendor-licenses.txt | 17 ++++++++--------- python-jupytext.spec | 7 ++----- sources | 4 ++-- 3 files changed, 12 insertions(+), 16 deletions(-) rename jupytext-1.16.7-vendor-licenses.txt => jupytext-1.17.0-vendor-licenses.txt (62%) diff --git a/jupytext-1.16.7-vendor-licenses.txt b/jupytext-1.17.0-vendor-licenses.txt similarity index 62% rename from jupytext-1.16.7-vendor-licenses.txt rename to jupytext-1.17.0-vendor-licenses.txt index 0485d4b..307ae0d 100644 --- a/jupytext-1.16.7-vendor-licenses.txt +++ b/jupytext-1.17.0-vendor-licenses.txt @@ -1,21 +1,20 @@ -├─ MIT: 776 -├─ ISC: 228 -├─ BSD-3-Clause: 98 -├─ Apache-2.0: 57 +├─ MIT: 766 +├─ ISC: 188 +├─ BSD-3-Clause: 99 +├─ Apache-2.0: 55 ├─ BSD-2-Clause: 29 -├─ (MIT OR CC0-1.0): 7 -├─ BlueOak-1.0.0: 5 -├─ CC0-1.0: 2 +├─ BlueOak-1.0.0: 7 +├─ (MIT OR CC0-1.0): 6 ├─ UNLICENSED: 2 +├─ CC0-1.0: 2 ├─ 0BSD: 2 +├─ MIT-0: 1 ├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 -├─ MIT*: 1 ├─ (MIT OR Apache-2.0): 1 ├─ Python-2.0: 1 ├─ CC-BY-4.0: 1 ├─ BSD*: 1 ├─ Unlicense: 1 -├─ LGPL-3.0: 1 ├─ CC-BY-3.0: 1 └─ (MIT AND CC-BY-3.0): 1 diff --git a/python-jupytext.spec b/python-jupytext.spec index c1f2632..961b708 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -1,11 +1,8 @@ -# NOTE: sphinx-gallery support requires a version <= 0.8. Upstream will -# accept patches to make it work with later versions. - %global giturl https://github.com/mwouts/jupytext #global vsuffix d Name: python-jupytext -Version: 1.16.7 +Version: 1.17.0 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts @@ -73,7 +70,7 @@ Requires: jupyterlab >= 4.0 Provides: bundled(npm(base64-js)) = 1.5.1 Provides: bundled(npm(buffer)) = 6.0.3 Provides: bundled(npm(ieee754)) = 1.2.1 -Provides: bundled(npm(jupyterlab-rise)) = 0.41.0 +Provides: bundled(npm(jupyterlab-rise)) = 0.43.1 %description -n python3-jupyterlab-jupytext %_desc diff --git a/sources b/sources index cb64d9d..0c54b1b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.16.7-vendor.tar.xz) = 27785c165f2582fae1a0e1c6bdf9eb68a89a2c24c64e7dc247d39f2f02c884df37a176e7b1f4807d2d45167784bf804f07ac1b2503aca31965e675d26069fb10 -SHA512 (jupytext-1.16.7.tar.gz) = f0935fba168e52b84babea865aa6117cba31e4cae615ef1d32608a918c4650da06992fd5d9b1de01e18edc3b44ab83c1bc5c721ca89a57b4f45fdead38bc5bb5 +SHA512 (jupytext-1.17.0-vendor.tar.xz) = f08fafb43334de7de138f73403f89f8b73ebe6ecc594549f66d5862a5c1969b7242cc71e604342b3468faee0837a80e61fe1f7d9a32e1fd2bde514c072c5d581 +SHA512 (jupytext-1.17.0.tar.gz) = ef4c0433beb498ecce38d0fa5f31fc45db1e9caab606789881ec41938c1bb7dd8e4e5a24cb3de3dbd8e6a1fe2ebde410efe825f138f7ce66ca19e52e8890bf7e From 92fbc5d3dd4e1a9156e0cd9f320ef45d7f9fc706 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 26 Apr 2025 20:22:22 -0600 Subject: [PATCH 3/7] Version 1.17.1 --- ...vendor-licenses.txt => jupytext-1.17.1-vendor-licenses.txt | 0 python-jupytext.spec | 2 +- sources | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename jupytext-1.17.0-vendor-licenses.txt => jupytext-1.17.1-vendor-licenses.txt (100%) diff --git a/jupytext-1.17.0-vendor-licenses.txt b/jupytext-1.17.1-vendor-licenses.txt similarity index 100% rename from jupytext-1.17.0-vendor-licenses.txt rename to jupytext-1.17.1-vendor-licenses.txt diff --git a/python-jupytext.spec b/python-jupytext.spec index 961b708..231d94e 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -2,7 +2,7 @@ #global vsuffix d Name: python-jupytext -Version: 1.17.0 +Version: 1.17.1 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts diff --git a/sources b/sources index 0c54b1b..4ee55b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.17.0-vendor.tar.xz) = f08fafb43334de7de138f73403f89f8b73ebe6ecc594549f66d5862a5c1969b7242cc71e604342b3468faee0837a80e61fe1f7d9a32e1fd2bde514c072c5d581 -SHA512 (jupytext-1.17.0.tar.gz) = ef4c0433beb498ecce38d0fa5f31fc45db1e9caab606789881ec41938c1bb7dd8e4e5a24cb3de3dbd8e6a1fe2ebde410efe825f138f7ce66ca19e52e8890bf7e +SHA512 (jupytext-1.17.1-vendor.tar.xz) = c59d683577a7c756db039e240477884ef6f09790bddf0e91938791ab678be4dd6323cec10f1ddebc3d71bd8a4ea1fef13679fe4626d2f2aa147d49f26ec033b3 +SHA512 (jupytext-1.17.1.tar.gz) = 3c5f5203bb862305c9f49db68836bad5ec9b39f88aed649c8bba9b9335d0d280022cf7d4268b2ca726dbbdabac3666f83de2e7fba79c2c1062760fa0fd0e5c44 From 5101e06dd020dbc54852ef5c9f4a0a994c6c2e39 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 1 Jun 2025 18:06:48 -0600 Subject: [PATCH 4/7] Version 1.17.2 --- ...vendor-licenses.txt => jupytext-1.17.2-vendor-licenses.txt | 0 prepare_vendor.sh | 3 ++- python-jupytext.spec | 2 +- sources | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) rename jupytext-1.17.1-vendor-licenses.txt => jupytext-1.17.2-vendor-licenses.txt (100%) diff --git a/jupytext-1.17.1-vendor-licenses.txt b/jupytext-1.17.2-vendor-licenses.txt similarity index 100% rename from jupytext-1.17.1-vendor-licenses.txt rename to jupytext-1.17.2-vendor-licenses.txt diff --git a/prepare_vendor.sh b/prepare_vendor.sh index d6f81c1..bb5eebc 100755 --- a/prepare_vendor.sh +++ b/prepare_vendor.sh @@ -64,6 +64,7 @@ jlpm license-checker --summary | sed "s#$PKG_PATH#/tmp/#g" > $PKG_DIR/${PKG_NAME cd - rm -rf .package-cache node_modules -cleanup_and_exit 0 echo ">>>>>> Remember to run this script on both x86_64 AND aarch64 and merge" + +cleanup_and_exit 0 diff --git a/python-jupytext.spec b/python-jupytext.spec index 231d94e..4d1f3e2 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -2,7 +2,7 @@ #global vsuffix d Name: python-jupytext -Version: 1.17.1 +Version: 1.17.2 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts diff --git a/sources b/sources index 4ee55b3..9113c9a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.17.1-vendor.tar.xz) = c59d683577a7c756db039e240477884ef6f09790bddf0e91938791ab678be4dd6323cec10f1ddebc3d71bd8a4ea1fef13679fe4626d2f2aa147d49f26ec033b3 -SHA512 (jupytext-1.17.1.tar.gz) = 3c5f5203bb862305c9f49db68836bad5ec9b39f88aed649c8bba9b9335d0d280022cf7d4268b2ca726dbbdabac3666f83de2e7fba79c2c1062760fa0fd0e5c44 +SHA512 (jupytext-1.17.2-vendor.tar.xz) = b997ef8bf9ca341d37b7992d5f093c8c9fea4322830e1818a8979bdd97b3cea64266db7ca8f5ac0fd8d3aca07160e7d9a540f3ba00b9f26e3bc8cc7c5d706323 +SHA512 (jupytext-1.17.2.tar.gz) = 5c284ab96dabaedf3d94fe0216d926b78238a03fb93a1af5f9ec8747e0aa17960b645004cf39ff674999051e9c415470cec1fd3fcb305250b31f846b88519dde From 177d41000e5625fb12c2735a0f0cdbcf0f6611f2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 15 Jul 2025 08:35:38 -0600 Subject: [PATCH 5/7] 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 4f2e685f7f4520a2db19b09bbb770791a5fd7423 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 27 Aug 2025 16:40:21 -0600 Subject: [PATCH 6/7] 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 fcedef3cadc43c1a1e2ed95b88f077315bd62bb8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 28 Aug 2025 14:51:34 -0600 Subject: [PATCH 7/7] 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