diff --git a/disable-autodocsumm.patch b/disable-autodocsumm.patch index 73139cd..5f1ea58 100644 --- a/disable-autodocsumm.patch +++ b/disable-autodocsumm.patch @@ -1,22 +1,22 @@ -diff -Naur marshmallow-3.19.0/docs/conf.py marshmallow-3.19.0.orig/docs/conf.py ---- marshmallow-3.19.0/docs/conf.py 2022-11-30 14:46:21.904301634 +0100 -+++ marshmallow-3.19.0.orig/docs/conf.py 2022-11-30 14:47:07.568642134 +0100 -@@ -14,7 +14,6 @@ - "sphinx.ext.viewcode", +diff -Naur marshmallow-3.21.0.orig/docs/conf.py marshmallow-3.21.0/docs/conf.py +--- marshmallow-3.21.0.orig/docs/conf.py 2024-02-26 20:43:44.000000000 +0100 ++++ marshmallow-3.21.0/docs/conf.py 2024-02-27 22:04:26.379014742 +0100 +@@ -9,7 +9,6 @@ "alabaster", "sphinx_issues", + "versionwarning.extension", - "autodocsumm", ] primary_domain = "py" -diff -Naur marshmallow-3.19.0/setup.py marshmallow-3.19.0.orig/setup.py ---- marshmallow-3.19.0/setup.py 2022-11-30 14:46:21.904301634 +0100 -+++ marshmallow-3.19.0.orig/setup.py 2022-11-30 14:46:37.181415549 +0100 -@@ -14,7 +14,6 @@ - "sphinx-issues==3.0.1", - "alabaster==0.7.12", - "sphinx-version-warning==1.1.2", -- "autodocsumm==0.2.9", - ], - } - EXTRAS_REQUIRE["dev"] = EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["lint"] + ["tox"] +diff -Naur marshmallow-3.21.0.orig/pyproject.toml marshmallow-3.21.0/pyproject.toml +--- marshmallow-3.21.0.orig/pyproject.toml 2024-02-26 20:43:44.000000000 +0100 ++++ marshmallow-3.21.0/pyproject.toml 2024-02-27 22:05:53.435787582 +0100 +@@ -37,7 +37,6 @@ + "sphinx-issues==4.0.0", + "alabaster==0.7.16", + "sphinx-version-warning==1.1.2", +- "autodocsumm==0.2.12", + ] + tests = ["pytest", "pytz", "simplejson"] + dev = ["marshmallow[tests]", "tox", "pre-commit~=3.5"] diff --git a/ordered_set.patch b/ordered_set.patch index 377bb93..7e3c091 100644 --- a/ordered_set.patch +++ b/ordered_set.patch @@ -1,12 +1,12 @@ -diff -Naur marshmallow-3.8.0.orig/src/marshmallow/schema.py marshmallow-3.8.0/src/marshmallow/schema.py ---- marshmallow-3.8.0.orig/src/marshmallow/schema.py 2020-09-16 11:21:17.000000000 +0200 -+++ marshmallow-3.8.0/src/marshmallow/schema.py 2020-09-16 12:40:53.208395252 +0200 -@@ -14,7 +14,7 @@ - from marshmallow import base, fields as ma_fields, class_registry, types +diff -Naur marshmallow-3.21.0.orig/src/marshmallow/schema.py marshmallow-3.21.0/src/marshmallow/schema.py +--- marshmallow-3.21.0.orig/src/marshmallow/schema.py 2024-02-26 20:43:44.000000000 +0100 ++++ marshmallow-3.21.0/src/marshmallow/schema.py 2024-02-27 21:54:51.917914969 +0100 +@@ -26,7 +26,7 @@ + ) from marshmallow.error_store import ErrorStore - from marshmallow.exceptions import ValidationError, StringNotCollectionError + from marshmallow.exceptions import StringNotCollectionError, ValidationError -from marshmallow.orderedset import OrderedSet +from ordered_set import OrderedSet - from marshmallow.decorators import ( - POST_DUMP, - POST_LOAD, + from marshmallow.utils import ( + EXCLUDE, + INCLUDE, diff --git a/python-marshmallow.spec b/python-marshmallow.spec index 4a6432e..e0f55ca 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -5,8 +5,8 @@ %global _docdir_fmt %{name} Name: python-%{modname} -Version: 3.19.0 -Release: 6%{?dist} +Version: 3.21.0 +Release: 1%{?dist} Summary: Python library for converting complex datatypes to and from primitive types License: MIT URL: http://marshmallow.readthedocs.org/ @@ -134,6 +134,9 @@ rm -rf html/{.buildinfo,.doctrees} %changelog +* Tue Feb 27 2024 Miroslav Suchý +- rebase to 3.21.0 + * Fri Jan 26 2024 Fedora Release Engineering - 3.19.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index bc1bbf4..a126b87 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (marshmallow-3.19.0.tar.gz) = e908ab33703fed5a9290189aa151dfdb425668bebe89063084f10435d2030927ce001c0d34d504d19998863431ded52a7a551085b11212489495d34aadb3b9e1 -SHA512 (ordered_set.patch) = c4a2e832fc0e8a34d8fce84b6d4afffb9273b12a175a78b49d3228ebafc7117e10d883691f81add8950166ae360615167b2bf575dd887152cf0e1c181ce89c07 -SHA512 (versionwarning-disable.patch) = d41a3c696f61f4d8ef1786c358558f47bb23115744e5c2b78d36c52cc29fb7bcdfa85504d7ce8e914b60478c13d83700a1aa447063d48fa92f132874f5a9825e -SHA512 (disable-autodocsumm.patch) = 1b34c3a4afdbb2012f3a1dfb79e5db6111833709fc0a0a06f873aa7f132183298eadc35fe02225180d3060ca683b436be6b05dc76413309b44224c55129823bd +SHA512 (marshmallow-3.21.0.tar.gz) = d08e4eedafc1d6f2bfab463357febc75013e8a548195ab85aac55fa225f2180a4f1646d68f8586d369dd108a793086c5bb8522c7543a51540ec4ee6de5305ad3