From 16777fafc6d83a431ffa3099978acd8b60a181ff780aa6f3feb6e9eaabc43267 Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Sun, 11 Jun 2023 20:44:33 +0000
Subject: [PATCH] Accepting request 1092375 from
 home:bnavigator:branches:devel:languages:python:jupyter

- Update to 7.4.0
  * Add ExtractAttachmentsPreprocessor #1978 (@tuncbkose)
  * Moved ensure_dir_exists to FilesWriter #1987 (@tuncbkose)
  * Tweak exporter default_config merging behavior #1981
    (@tuncbkose)
  * Revert unintended effects of #1966 #1974 (@tuncbkose)

OBS-URL: https://build.opensuse.org/request/show/1092375
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbconvert?expand=0&rev=60
---
 nbconvert-7.3.1.tar.gz   |  3 ---
 nbconvert-7.4.0.tar.gz   |  3 +++
 python-nbconvert.changes | 10 ++++++++++
 python-nbconvert.spec    | 14 ++++++--------
 4 files changed, 19 insertions(+), 11 deletions(-)
 delete mode 100644 nbconvert-7.3.1.tar.gz
 create mode 100644 nbconvert-7.4.0.tar.gz

diff --git a/nbconvert-7.3.1.tar.gz b/nbconvert-7.3.1.tar.gz
deleted file mode 100644
index 9b5da0c..0000000
--- a/nbconvert-7.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78685362b11d2e8058e70196fe83b09abed8df22d3e599cf271f4d39fdc48b9e
-size 880064
diff --git a/nbconvert-7.4.0.tar.gz b/nbconvert-7.4.0.tar.gz
new file mode 100644
index 0000000..df27017
--- /dev/null
+++ b/nbconvert-7.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51b6c77b507b177b73f6729dba15676e42c4e92bcb00edc8cc982ee72e7d89d7
+size 882064
diff --git a/python-nbconvert.changes b/python-nbconvert.changes
index 7079043..80a3a85 100644
--- a/python-nbconvert.changes
+++ b/python-nbconvert.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jun 11 20:00:15 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Update to 7.4.0
+  * Add ExtractAttachmentsPreprocessor #1978 (@tuncbkose)
+  * Moved ensure_dir_exists to FilesWriter #1987 (@tuncbkose)
+  * Tweak exporter default_config merging behavior #1981
+    (@tuncbkose)
+  * Revert unintended effects of #1966 #1974 (@tuncbkose)
+
 -------------------------------------------------------------------
 Mon May  1 19:09:03 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-nbconvert.spec b/python-nbconvert.spec
index 20955ff..d12a6ca 100644
--- a/python-nbconvert.spec
+++ b/python-nbconvert.spec
@@ -29,8 +29,12 @@
 %else
 %bcond_with libalternatives
 %endif
+# avoid rewriting
+%define python3dist python3dist
+# 7.4.0 gets abbreviated by pythondistdeps
+%define shortversion 7.4
 Name:           python-nbconvert%{psuffix}
-Version:        7.3.1
+Version:        7.4.0
 Release:        0
 Summary:        Conversion of Jupyter Notebooks
 License:        BSD-3-Clause AND MIT
@@ -51,7 +55,6 @@ Requires:       python-bleach
 Requires:       python-defusedxml
 Requires:       python-jupyter-core >= 4.7
 Requires:       python-jupyterlab-pygments
-Requires:       python-lxml
 Requires:       python-nbclient >= 0.5
 Requires:       python-nbformat >= 5.1
 Requires:       python-packaging
@@ -94,7 +97,7 @@ This package provides the python interface.
 Summary:        Conversion of Jupyter Notebooks
 Requires:       jupyter-ipykernel
 Requires:       jupyter-jupyter-core
-Requires:       python3-nbconvert = %{version}
+Requires:       %python3dist(nbconvert) = %{shortversion}
 Conflicts:      python3-jupyter_nbconvert < 5.5.0
 
 %description -n jupyter-nbconvert
@@ -111,9 +114,6 @@ Requires:       texlive-makeindex
 Requires:       tex(adjustbox.sty)
 Requires:       tex(eurosym.sty)
 Requires:       tex(ulem.sty)
-Provides:       %{python_module jupyter_nbconvert-latex = %{version}}
-Provides:       %{python_module nbconvert-latex = %{version}}
-Obsoletes:      %{python_module jupyter_nbconvert-latex < %{version}}
 
 %description -n jupyter-nbconvert-latex
 The jupyter nbconvert package converts notebooks to various other formats
@@ -149,8 +149,6 @@ export LANG=en_US.UTF-8
 export PYTHONDONTWRITEBYTECODE=1
 # requires modules not installed: https://github.com/jupyter/nbconvert/issues/1846
 donttest="test_convert_full_qualified_name or test_post_processor"
-# https://github.com/jupyter/nbconvert/pull/1985
-donttest+=" or test_errors_print_traceback"
 %{python_expand # installed package in :test flavor
 $python -m ipykernel.kernelspec --user
 pytest-%{$python_bin_suffix} -v -m 'not network' -k "not ($donttest)" --pyargs nbconvert