diff --git a/jupytext-1.16.4-vendor-licenses.txt b/jupytext-1.16.6-vendor-licenses.txt similarity index 96% rename from jupytext-1.16.4-vendor-licenses.txt rename to jupytext-1.16.6-vendor-licenses.txt index baf7005..da105a4 100644 --- a/jupytext-1.16.4-vendor-licenses.txt +++ b/jupytext-1.16.6-vendor-licenses.txt @@ -1,4 +1,4 @@ -├─ MIT: 746 +├─ MIT: 744 ├─ ISC: 218 ├─ BSD-3-Clause: 97 ├─ Apache-2.0: 56 diff --git a/prepare_vendor.sh b/prepare_vendor.sh index b266ecc..d6f81c1 100755 --- a/prepare_vendor.sh +++ b/prepare_vendor.sh @@ -51,7 +51,7 @@ fi echo ">>>>>> Package vendor files" rm -f $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz -XZ_OPT="-9e -T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache +XZ_OPT="-9e -T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache yarn.lock if [ $? -ne 0 ]; then echo "ERROR: vendor tarball creation failed" cleanup_and_exit 1 diff --git a/python-jupytext-chdir.patch b/python-jupytext-chdir.patch deleted file mode 100644 index 1281b64..0000000 --- a/python-jupytext-chdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fixes this error: - -_____________ ERROR at setup of test_cm_config_log_only_if_changed _____________ - -tmp_path = PosixPath('/tmp/pytest-of-mockbuild/pytest-0/test_cm_config_log_only_if_cha0') - - @pytest.fixture() - def cwd_tmp_path(tmp_path): - # Run the whole test from inside tmp_path -> with tmp_path.cwd(): -E TypeError: 'PosixPath' object does not support the context manager protocol - -/builddir/build/BUILD/python-jupytext-1.16.2-build/jupytext-1.16.2/tests/conftest.py:50: TypeError - ---- jupytext-1.16.2/tests/conftest.py.orig 2024-05-05 16:34:48.000000000 -0600 -+++ jupytext-1.16.2/tests/conftest.py 2024-06-18 08:13:53.192133400 -0600 -@@ -1,3 +1,4 @@ -+import contextlib - import itertools - import os.path - import re -@@ -47,7 +48,7 @@ def cwd_tmpdir(tmpdir): - @pytest.fixture() - def cwd_tmp_path(tmp_path): - # Run the whole test from inside tmp_path -- with tmp_path.cwd(): -+ with contextlib.chdir(tmp_path): - yield tmp_path - - diff --git a/python-jupytext.spec b/python-jupytext.spec index 586ec40..927efa8 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -5,7 +5,7 @@ #global vsuffix d Name: python-jupytext -Version: 1.16.4 +Version: 1.16.6 Release: %autorelease Summary: Save Jupyter notebooks as text documents or scripts @@ -18,9 +18,6 @@ Source0: %{giturl}/archive/v%{version}/jupytext-%{version}%{?vsuffix}.tar 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 -Patch: %{name}-chdir.patch # s390x builds fail due to a bug in jupyterlab # https://bugzilla.redhat.com/show_bug.cgi?id=2278011 @@ -129,7 +126,6 @@ export HATCH_BUILD_HOOKS_ENABLE=true %pyproject_buildrequires -x docs,test,test-functional,test-integration %build -export LC_ALL=C.UTF-8 export HATCH_BUILD_HOOKS_ENABLE=true export YARN_CACHE_FOLDER="$PWD/jupyterlab/.package-cache" export npm_config_nodedir=%{_includedir}/node diff --git a/sources b/sources index fb5cfd4..29d8e05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jupytext-1.16.4-vendor.tar.xz) = 9af9bbb0586313750d71b04f7ed795680e05849aca7e33683dafb486256dce5cb24ab2d4b39990f9b4ed0296d2085f105e9d696b4863de16de58c585a978862d -SHA512 (jupytext-1.16.4.tar.gz) = fe55a97fbb6ef7c0b1919ab05e3459900fdec530d497aa15d4decdd509edec5f2844c83051a0dcb1e87e5b0349a0c3e0302832e0471dc435beb0ddf10f5e48ba +SHA512 (jupytext-1.16.6-vendor.tar.xz) = 8bc7e82624b6bf82beb6da29722f70e20f7fe1a22e15a8f65e3af8aacfc4f92e5f8c67a76e87880a25ffa75c92924670e8a075278ec7a661f966fdcda81aa3b3 +SHA512 (jupytext-1.16.6.tar.gz) = 8580678ef70b7d9fd2056b533697e807252fd7a9fe45ebdae48ee536a157a5e1a6b33cfaa7266710e5e5fb15bb1098419ed6fbadce0b5dee4ca9f2eb0040bcfd