From e33d6c64200a43617ae9df01421fc93c8c4e8295a5175c7c0a188743ecefc308 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 24 Sep 2023 18:16:40 +0000 Subject: [PATCH] - Update to 7.0.4 * Update to JupyterLab 4.0.6 #7049 (@jtpio) * Fix app_version #7061 (@jtpio) * fix trusted status indication #7036 (@adigaboy) - Release 7.0.3 * Require importlib_resources for testing on Python < 3.10 #7016 (@bnavigator) * Fix Python 3.12 compatibility #6965 (@frenzymadness) - Drop notebook-issue7014-fixtests.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-notebook?expand=0&rev=69 --- notebook-7.0.2.tar.gz | 3 --- notebook-7.0.4.tar.gz | 3 +++ notebook-issue7014-fixtests.patch | 24 ------------------------ python-notebook.changes | 12 ++++++++++++ python-notebook.spec | 10 ++-------- 5 files changed, 17 insertions(+), 35 deletions(-) delete mode 100644 notebook-7.0.2.tar.gz create mode 100644 notebook-7.0.4.tar.gz delete mode 100644 notebook-issue7014-fixtests.patch diff --git a/notebook-7.0.2.tar.gz b/notebook-7.0.2.tar.gz deleted file mode 100644 index a2159e7..0000000 --- a/notebook-7.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d70d6a07418c829bd5f54337ce993b7105261d9026f9d3fe68e9b8aa1a20da9a -size 3927445 diff --git a/notebook-7.0.4.tar.gz b/notebook-7.0.4.tar.gz new file mode 100644 index 0000000..0da2fdd --- /dev/null +++ b/notebook-7.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c1b458f72ce8774445c8ef9ed2492bd0b9ce9605ac996e2b066114f69795e71 +size 3928907 diff --git a/notebook-issue7014-fixtests.patch b/notebook-issue7014-fixtests.patch deleted file mode 100644 index c648e81..0000000 --- a/notebook-issue7014-fixtests.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur notebook-7.0.2.orig/tests/conftest.py notebook-7.0.2/tests/conftest.py ---- notebook-7.0.2.orig/tests/conftest.py 2023-08-19 12:08:45.146379687 +0200 -+++ notebook-7.0.2/tests/conftest.py 2023-08-19 12:10:22.285942278 +0200 -@@ -5,10 +5,7 @@ - import pathlib - import shutil - --try: -- from importlib.resources import files --except ImportError: -- from importlib_resources import files # type:ignore -+from importlib_resources import files # type:ignore - - import pytest - -@@ -91,7 +88,7 @@ - ) - - # Copy the schema files. -- test_data = str(files("jupyterlab_server.test_data").joinpath("")) -+ test_data = str(files("jupyterlab_server.test_data")._paths[0]) - src = pathlib.PurePath(test_data, "schemas", "@jupyterlab") - dst = pathlib.PurePath(str(schemas_dir), "@jupyterlab") - if os.path.exists(dst): diff --git a/python-notebook.changes b/python-notebook.changes index 393038d..e328c20 100644 --- a/python-notebook.changes +++ b/python-notebook.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Sep 24 18:10:40 UTC 2023 - Ben Greiner + +- Update to 7.0.4 + * Update to JupyterLab 4.0.6 #7049 (@jtpio) + * Fix app_version #7061 (@jtpio) + * fix trusted status indication #7036 (@adigaboy) +- Release 7.0.3 + * Require importlib_resources for testing on Python < 3.10 #7016 (@bnavigator) + * Fix Python 3.12 compatibility #6965 (@frenzymadness) +- Drop notebook-issue7014-fixtests.patch + ------------------------------------------------------------------- Sat Aug 19 08:39:15 UTC 2023 - Ben Greiner diff --git a/python-notebook.spec b/python-notebook.spec index bcf5cc8..2a8a016 100644 --- a/python-notebook.spec +++ b/python-notebook.spec @@ -34,7 +34,7 @@ BuildArch: noarch %bcond_with libalternatives %endif Name: python-notebook%{psuffix} -Version: 7.0.2 +Version: 7.0.4 Release: 0 Summary: Jupyter Notebook interface License: BSD-3-Clause @@ -42,8 +42,6 @@ Group: Development/Languages/Python URL: https://github.com/jupyter/notebook Source0: https://files.pythonhosted.org/packages/source/n/notebook/notebook-%{version}.tar.gz Source100: python-notebook-rpmlintrc -# PATCH-FIX-UPSTREAM notebook-issue7014-fixtests.patch gh#jupyter/notebook#7014 -Patch0: notebook-issue7014-fixtests.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module hatch-jupyter-builder >= 0.2} BuildRequires: %{python_module hatchling >= 1.11} @@ -56,9 +54,6 @@ Requires: (python-jupyter-server >= 2.4 with python-jupyter-server < 3) Requires: (python-jupyterlab >= 4.0.2 with python-jupyterlab < 5) Requires: (python-jupyterlab-server >= 2.22.1 with python-jupyterlab-server < 3) Requires: (python-notebook-shim >= 0.2 with python-notebook-shim < 0.3) -%if 0%{?python_version_nodots} < 39 -Requires: python-importlib-resources >= 5 -%endif Provides: python-jupyter_notebook = %{version}-%{release} Obsoletes: python-jupyter_notebook < %{version}-%{release} %if !%{with test} @@ -75,9 +70,8 @@ Requires(postun):update-alternatives %endif %endif %if %{with test} +BuildRequires: %{python_module importlib_resources >= 5 if %python-base < 3.10} BuildRequires: %{python_module ipykernel} -# See Patch0 -BuildRequires: %{python_module importlib_resources >= 5} BuildRequires: %{python_module jupyter-server-test >= 2.4.0 with %python-jupyter-server-test < 3} BuildRequires: %{python_module jupyterlab-server-test >= 2.22.1 with %python-jupyterlab-server-test < 3} BuildRequires: %{python_module nbval}