From aa928e1097ed938bc29c8fb2802b248bd06a7a64 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 15 Jul 2024 16:36:43 -0600 Subject: [PATCH] Version 1.16.3 - Drop upstreamed maxsplit patch - Add workaround for bz 2275382 --- ...s.txt => jupytext-1.16.3-vendor-licenses.txt | 0 python-jupytext-maxsplit.patch | 16 ---------------- python-jupytext.spec | 17 ++++++++++------- sources | 4 ++-- 4 files changed, 12 insertions(+), 25 deletions(-) rename jupytext-1.16.2-vendor-licenses.txt => jupytext-1.16.3-vendor-licenses.txt (100%) delete mode 100644 python-jupytext-maxsplit.patch diff --git a/jupytext-1.16.2-vendor-licenses.txt b/jupytext-1.16.3-vendor-licenses.txt similarity index 100% rename from jupytext-1.16.2-vendor-licenses.txt rename to jupytext-1.16.3-vendor-licenses.txt diff --git a/python-jupytext-maxsplit.patch b/python-jupytext-maxsplit.patch deleted file mode 100644 index 250d8d3..0000000 --- a/python-jupytext-maxsplit.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fixes this warning: - - /builddir/build/BUILD/python-jupytext-1.16.2-build/BUILDROOT/usr/lib/python3.13/site-packages/jupytext/cell_metadata.py:260: DeprecationWarning: 'maxsplit' is passed as positional argument - options = re.split(r"\s|,", options, 1) - ---- jupytext-1.16.2/src/jupytext/cell_metadata.py.orig 2024-05-05 16:34:48.000000000 -0600 -+++ jupytext-1.16.2/src/jupytext/cell_metadata.py 2024-06-18 08:15:50.518408511 -0600 -@@ -257,7 +257,7 @@ def parse_rmd_options(line): - - def rmd_options_to_metadata(options, use_runtools=False): - """Parse rmd options and return a metadata dictionary""" -- options = re.split(r"\s|,", options, 1) -+ options = re.split(r"\s|,", options, maxsplit=1) - # Special case Wolfram Language, which sadly has a space in the language - # name. - if options[0:2] == ["wolfram", "language"]: diff --git a/python-jupytext.spec b/python-jupytext.spec index 16fc492..d8b0ef4 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -1,26 +1,26 @@ # 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.2 +Version: 1.16.3 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts License: MIT BuildArch: noarch URL: https://jupytext.readthedocs.io/ -VCS: https://github.com/mwouts/jupytext -Source0: %{vcs}/archive/v%{version}/jupytext-%{version}.tar.gz +VCS: git:%{giturl}.git +Source0: %{giturl}/archive/v%{version}/jupytext-%{version}%{?vsuffix}.tar.gz # Source1 and Source2 created with ./prepare_vendor.sh Source1: jupytext-%{version}-vendor.tar.xz Source2: jupytext-%{version}-vendor-licenses.txt Source3: prepare_vendor.sh # Adapt to python 3.13 change in PosixPath.cwd # See https://github.com/mwouts/jupytext/issues/1242 -Patch0: %{name}-chdir.patch -# Fix a DeprecationWarning with passing maxsplit as a positional argument -# See https://github.com/mwouts/jupytext/pull/1241 -Patch1: %{name}-maxsplit.patch +Patch: %{name}-chdir.patch # s390x builds fail due to a bug in jupyterlab # https://bugzilla.redhat.com/show_bug.cgi?id=2278011 @@ -35,6 +35,9 @@ 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 + %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 diff --git a/sources b/sources index 5a69aad..1609a4a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.16.2-vendor.tar.xz) = cc5b08ffb0ddc669f00c3b79eb0119b9bab5abeafea8e58033614a46d7d679b433df524f210872d52c8656e98e15d24575f20c8a2fbb5076927dcacf9bb5e0ff -SHA512 (jupytext-1.16.2.tar.gz) = ed7e3c52aa3e36fcf810962d41231672c596c72dda8a6cb0bf45a74e424b9aad48496466d97f47fa336c9abdf406a1bc510db689cdb73688933bcf86a58f6dfb +SHA512 (jupytext-1.16.3-vendor.tar.xz) = 9af9bbb0586313750d71b04f7ed795680e05849aca7e33683dafb486256dce5cb24ab2d4b39990f9b4ed0296d2085f105e9d696b4863de16de58c585a978862d +SHA512 (jupytext-1.16.3d.tar.gz) = 43593d2e00fa8f64ffef18ce08ab18093ff8724ee8c42db46c07618889c712d137f80b96db3d4ec720dce543af9cdf14ae6fc9ef04aa9e6e733f76a0e9333d82