From da0f816b6e3825582bdfd21443985acf1592d7c2 Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Sep 16 2020 12:52:31 +0000 Subject: Update python-marshmallow to 3.8.0-1 --- diff --git a/.gitignore b/.gitignore index b30ed5d..eba48ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /marshmallow-*.tar.gz /ordered_set.patch /versionwarning-disable.patch +/disable-autodocsumm.patch diff --git a/disable-autodocsumm.patch b/disable-autodocsumm.patch new file mode 100644 index 0000000..ca48128 --- /dev/null +++ b/disable-autodocsumm.patch @@ -0,0 +1,33 @@ +diff -Naur marshmallow-3.8.0.orig/docs/conf.py marshmallow-3.8.0/docs/conf.py +--- marshmallow-3.8.0.orig/docs/conf.py 2020-09-16 14:39:21.046758182 +0200 ++++ marshmallow-3.8.0/docs/conf.py 2020-09-16 14:40:23.317387570 +0200 +@@ -14,7 +14,6 @@ + "sphinx.ext.viewcode", + "alabaster", + "sphinx_issues", +- "autodocsumm", + ] + + primary_domain = "py" +diff -Naur marshmallow-3.8.0.orig/setup.py marshmallow-3.8.0/setup.py +--- marshmallow-3.8.0.orig/setup.py 2020-09-16 11:21:17.000000000 +0200 ++++ marshmallow-3.8.0/setup.py 2020-09-16 14:40:01.087876853 +0200 +@@ -14,7 +14,6 @@ + "sphinx-issues==1.2.0", + "alabaster==0.7.12", + "sphinx-version-warning==1.1.2", +- "autodocsumm==0.2.0", + ], + } + EXTRAS_REQUIRE["dev"] = EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["lint"] + ["tox"] +diff -Naur marshmallow-3.8.0.orig/src/marshmallow.egg-info/requires.txt marshmallow-3.8.0/src/marshmallow.egg-info/requires.txt +--- marshmallow-3.8.0.orig/src/marshmallow.egg-info/requires.txt 2020-09-16 11:21:27.000000000 +0200 ++++ marshmallow-3.8.0/src/marshmallow.egg-info/requires.txt 2020-09-16 14:40:36.315101481 +0200 +@@ -14,7 +14,6 @@ + sphinx-issues==1.2.0 + alabaster==0.7.12 + sphinx-version-warning==1.1.2 +-autodocsumm==0.2.0 + + [lint] + mypy==0.782 diff --git a/ordered_set.patch b/ordered_set.patch index aaf97fa..377bb93 100644 --- a/ordered_set.patch +++ b/ordered_set.patch @@ -1,6 +1,6 @@ -diff -Naur marshmallow-3.5.1.orig/src/marshmallow/schema.py marshmallow-3.5.1/src/marshmallow/schema.py ---- marshmallow-3.5.1.orig/src/marshmallow/schema.py 2020-03-05 14:01:01.000000000 +0100 -+++ marshmallow-3.5.1/src/marshmallow/schema.py 2020-03-24 12:40:24.617005030 +0100 +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 from marshmallow.error_store import ErrorStore diff --git a/python-marshmallow.spec b/python-marshmallow.spec index 03910cc..5747e8c 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -5,14 +5,17 @@ %global _docdir_fmt %{name} Name: python-%{modname} -Version: 3.5.1 -Release: 3%{?dist} +Version: 3.8.0 +Release: 1%{?dist} Summary: Python library for converting complex datatypes to and from primitive types License: MIT URL: http://marshmallow.readthedocs.org/ Source0: https://github.com/marshmallow-code/marshmallow/archive/%{version}/%{modname}-%{version}.tar.gz Patch0: ordered_set.patch Patch1: versionwarning-disable.patch +# python3-autodocsumm is not in Fedora +# This is needed only for doc subpackage. +Patch2: disable-autodocsumm.patch BuildArch: noarch @@ -133,11 +136,9 @@ rm -rf html/{.buildinfo,.doctrees} %changelog -* Wed Jul 29 2020 Fedora Release Engineering - 3.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 3.5.1-2 -- Rebuilt for Python 3.9 +* Wed Sep 16 2020 Miroslav Suchý 3.8.0-1 +- disable autodocsumm in doc +- rebase to 3.8.0 * Tue Mar 24 2020 Miroslav Suchý 3.5.1-1 - rebase to 3.5.1 diff --git a/sources b/sources index befc13b..87adc1d 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -SHA512 (marshmallow-3.5.1.tar.gz) = 6ef6f354ab9179dd8e72b066e8d27e045f322c8519f91f5b1d722656ba949409c91c775378283a7e2c1d27638973908d4ca97d314a1a3674d269185b8d8d6cfa -SHA512 (ordered_set.patch) = 7b718a3a4d130baf3ee275056542bd3ed43e3e0261c8a294826486994e4188a73a8e778309acfd03b98e20e35f43a7e9c0b7a1c5bedca6da0f1dbc9ad748a918 -SHA512 (versionwarning-disable.patch) = 82d2a7a8eaa7660c58f45f30e680245a507492d6bb2e3903b21720e5bd3345ea59a0affb67bd54424dd697898c21395f1dc5338b6958cfba3524babef6e3f4ad +SHA512 (marshmallow-3.8.0.tar.gz) = 266333b5805b2fff5ab102461d9750a8092a0d1587465ef8f709ef9986ddf7f4e84dc1cc7ce6eced23f1f21f1ababfb1df4e0f8a43f0585f122c4e65169b380f +SHA512 (ordered_set.patch) = c4a2e832fc0e8a34d8fce84b6d4afffb9273b12a175a78b49d3228ebafc7117e10d883691f81add8950166ae360615167b2bf575dd887152cf0e1c181ce89c07 +SHA512 (versionwarning-disable.patch) = 77a4313e3ed557a3bc21da0917ef8662dd8f27e45d196502f98ad04455517c79d0be294a95dc9f3b6261349a2c778284981b53a0cacbfcefa42d27b108f6758b +SHA512 (disable-autodocsumm.patch) = 8b37dfeb2ba9620cc2f7ade04c099d5add5267376fa7cbdedf0d3a67391570c7199073049bbf7f554b1cf6337ba936d789e49bca6e08b43d9db209b40ad88e81 diff --git a/versionwarning-disable.patch b/versionwarning-disable.patch index 2765150..f180a00 100644 --- a/versionwarning-disable.patch +++ b/versionwarning-disable.patch @@ -1,15 +1,15 @@ -diff -Naur marshmallow-3.5.1.orig/docs/conf.py marshmallow-3.5.1/docs/conf.py ---- marshmallow-3.5.1.orig/docs/conf.py 2020-03-05 14:01:01.000000000 +0100 -+++ marshmallow-3.5.1/docs/conf.py 2020-03-24 12:42:34.539237871 +0100 +diff -Naur marshmallow-3.8.0.orig/docs/conf.py marshmallow-3.8.0/docs/conf.py +--- marshmallow-3.8.0.orig/docs/conf.py 2020-09-16 11:21:17.000000000 +0200 ++++ marshmallow-3.8.0/docs/conf.py 2020-09-16 14:32:51.570352158 +0200 @@ -14,7 +14,6 @@ "sphinx.ext.viewcode", "alabaster", "sphinx_issues", - "versionwarning.extension", + "autodocsumm", ] - primary_domain = "py" -@@ -87,28 +86,3 @@ +@@ -90,31 +89,3 @@ "searchbox.html", ], } @@ -21,18 +21,21 @@ diff -Naur marshmallow-3.5.1.orig/docs/conf.py marshmallow-3.5.1/docs/conf.py - 'For the stable version documentation, see here.' - ), - "stable": ( -- "This document is for the latest 3.x stable release. " -- 'For the 2.x documentation, see here.' +- "Black Lives Matter. " +- 'Support the Equal Justice Initiative and ' +- 'Color of Change.' - ), - "2.x-line": ( -- "This document is for the 2.x release branch. " -- 'For the 3.x documentation, see here.' +- "marshmallow 2 is no longer supported as of 2020-08-18. " +- '' +- "Update your code to use marshmallow 3." - ), -} -# Show warning at top of page -versionwarning_body_selector = "div.document" +-versionwarning_banner_title = "" -# For debugging locally --# versionwarning_project_version = 'latest' +-# versionwarning_project_version = "stable" - - -def setup(app):