From 74e115b36d05ac4c1f8169611e915d005eb67c459a80ee2f9a83a8b56b3d99e3 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 29 Mar 2024 18:57:37 +0000 Subject: [PATCH] - Update to 5.10.3 * Revert PR #378 (Simplify NotebookNotary._data_dir_default) #397 (@krassowski) - Release 5.10.2 * Restore usage of npm token #395 (@blink1073) - Release 5.10.0 * Maintenance and upkeep improvements OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbformat?expand=0&rev=58 --- nbformat-5.10.3.tar.gz | 3 +++ nbformat-5.9.2.tar.gz | 3 --- no-hatch-nodejs-version.patch | 8 +++++--- no-pep440.patch | 20 ++++++++++---------- python-nbformat.changes | 11 +++++++++++ python-nbformat.spec | 10 +++++----- 6 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 nbformat-5.10.3.tar.gz delete mode 100644 nbformat-5.9.2.tar.gz diff --git a/nbformat-5.10.3.tar.gz b/nbformat-5.10.3.tar.gz new file mode 100644 index 0000000..a720c0d --- /dev/null +++ b/nbformat-5.10.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60ed5e910ef7c6264b87d644f276b1b49e24011930deef54605188ddeb211685 +size 142678 diff --git a/nbformat-5.9.2.tar.gz b/nbformat-5.9.2.tar.gz deleted file mode 100644 index 42bddfd..0000000 --- a/nbformat-5.9.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f98b5ba1997dff175e77e0c17d5c10a96eaed2cbd1de3533d1fc35d5e111192 -size 141264 diff --git a/no-hatch-nodejs-version.patch b/no-hatch-nodejs-version.patch index 4550c47..ce24495 100644 --- a/no-hatch-nodejs-version.patch +++ b/no-hatch-nodejs-version.patch @@ -2,8 +2,10 @@ pyproject.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---- a/pyproject.toml -+++ b/pyproject.toml +Index: nbformat-5.10.3/pyproject.toml +=================================================================== +--- nbformat-5.10.3.orig/pyproject.toml ++++ nbformat-5.10.3/pyproject.toml @@ -1,10 +1,10 @@ [build-system] -requires = ["hatchling>=1.5", "hatch-nodejs-version"] @@ -17,7 +19,7 @@ description = "The Jupyter Notebook format" license = { file = "LICENSE" } keywords = ["Interactive", "Interpreter", "Shell", "Web"] -@@ -58,9 +58,6 @@ test = [ +@@ -62,9 +62,6 @@ test = [ [project.scripts] jupyter-trust = "nbformat.sign:TrustNotebookApp.launch_instance" diff --git a/no-pep440.patch b/no-pep440.patch index 321f096..8b879cd 100644 --- a/no-pep440.patch +++ b/no-pep440.patch @@ -3,11 +3,11 @@ tests/test_api.py | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) -Index: nbformat-5.9.2/pyproject.toml +Index: nbformat-5.10.3/pyproject.toml =================================================================== ---- nbformat-5.9.2.orig/pyproject.toml -+++ nbformat-5.9.2/pyproject.toml -@@ -52,7 +52,6 @@ test = [ +--- nbformat-5.10.3.orig/pyproject.toml ++++ nbformat-5.10.3/pyproject.toml +@@ -56,7 +56,6 @@ test = [ "testpath", "pytest", "pre-commit", @@ -15,19 +15,19 @@ Index: nbformat-5.9.2/pyproject.toml ] [project.scripts] -Index: nbformat-5.9.2/tests/test_api.py +Index: nbformat-5.10.3/tests/test_api.py =================================================================== ---- nbformat-5.9.2.orig/tests/test_api.py -+++ nbformat-5.9.2/tests/test_api.py -@@ -10,7 +10,6 @@ from tempfile import TemporaryDirectory - from typing import Any, Dict +--- nbformat-5.10.3.orig/tests/test_api.py ++++ nbformat-5.10.3/tests/test_api.py +@@ -11,7 +11,6 @@ from tempfile import TemporaryDirectory + from typing import Any from jsonschema import ValidationError -from pep440 import is_canonical from nbformat import __version__ as nbf_version from nbformat import current_nbformat, read, write, writes -@@ -20,10 +19,6 @@ from nbformat.validator import isvalid +@@ -21,10 +20,6 @@ from nbformat.validator import isvalid from .base import TestsBase diff --git a/python-nbformat.changes b/python-nbformat.changes index 1670499..39d3194 100644 --- a/python-nbformat.changes +++ b/python-nbformat.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Mar 29 18:51:43 UTC 2024 - Ben Greiner + +- Update to 5.10.3 + * Revert PR #378 (Simplify NotebookNotary._data_dir_default) #397 + (@krassowski) +- Release 5.10.2 + * Restore usage of npm token #395 (@blink1073) +- Release 5.10.0 + * Maintenance and upkeep improvements + ------------------------------------------------------------------- Thu Mar 28 12:37:01 UTC 2024 - ecsos diff --git a/python-nbformat.spec b/python-nbformat.spec index 5c51ff4..8f5987b 100644 --- a/python-nbformat.spec +++ b/python-nbformat.spec @@ -1,7 +1,7 @@ # # spec file for package python-nbformat # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_without libalternatives %{?sle15_python_module_pythons} Name: python-nbformat -Version: 5.9.2 +Version: 5.10.3 Release: 0 Summary: The Jupyter Notebook format License: BSD-3-Clause @@ -50,13 +50,13 @@ BuildRequires: alts Requires: alts %else Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives %endif # SECTION test requirements BuildRequires: %{python_module fastjsonschema} BuildRequires: %{python_module jsonschema > 2.6} BuildRequires: %{python_module jupyter_core} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module testpath} BuildRequires: %{python_module traitlets >= 5.1} BuildRequires: %{pythons} @@ -71,7 +71,7 @@ This package provides the python interface. %prep %autosetup -p1 -n nbformat-%{version} -sed -i -e 's/--color=yes//' -e 's/\@\@\@/%{version}/' pyproject.toml +sed -i -e 's/"--color=yes", //' -e 's/\@\@\@/%{version}/' pyproject.toml %build %pyproject_wheel