diff --git a/jupytext-1.16.6-vendor-licenses.txt b/jupytext-1.18.1-vendor-licenses.txt similarity index 70% rename from jupytext-1.16.6-vendor-licenses.txt rename to jupytext-1.18.1-vendor-licenses.txt index da105a4..2d281d9 100644 --- a/jupytext-1.16.6-vendor-licenses.txt +++ b/jupytext-1.18.1-vendor-licenses.txt @@ -1,15 +1,15 @@ -├─ MIT: 744 -├─ ISC: 218 -├─ BSD-3-Clause: 97 +├─ MIT: 766 +├─ ISC: 188 +├─ BSD-3-Clause: 99 ├─ Apache-2.0: 56 ├─ BSD-2-Clause: 29 -├─ (MIT OR CC0-1.0): 7 -├─ CC0-1.0: 2 -├─ BlueOak-1.0.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 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 927efa8..520ea17 100644 --- a/python-jupytext.spec +++ b/python-jupytext.spec @@ -1,16 +1,12 @@ -# 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.6 +Version: 1.18.1 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 @@ -21,7 +17,13 @@ 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 builds fail due to lack of a binary builder +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 @@ -29,17 +31,14 @@ 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 -%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: @@ -73,9 +74,10 @@ 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 +%description -n python3-jupyterlab-jupytext +%_desc %package doc # The content is MIT. Other licenses are due to Sphinx files. @@ -121,28 +123,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 diff --git a/sources b/sources index ec4c1b2..e7659a8 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.18.1-vendor.tar.xz) = b1dcbbd21877d82b3134f604a572eee23b9bf271b54d1cafefc2b88ca0ae1cc2b9b440cec45cbb0c6de122ee25697c103999a0f01f0767d2dd7c48532db56109 +SHA512 (jupytext-1.18.1.tar.gz) = 31593c01826319bb3517e546f0c04c99f786de33aa41082d2dfd411457fccd517f93fc9ea9f809fc75fbf0c9c78eedc0d5503e02486fe602876efbaf8a50c7f2