From cbeb48a403033e7c0dfbb06b134f4ddd82b7093a Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Mar 24 2020 11:47:12 +0000 Subject: Update python-marshmallow to 3.5.1-1 --- diff --git a/ordered_set.patch b/ordered_set.patch index d5ae7bf..aaf97fa 100644 --- a/ordered_set.patch +++ b/ordered_set.patch @@ -1,8 +1,8 @@ -diff -Naur marshmallow-3.1.1.orig/src/marshmallow/schema.py marshmallow-3.1.1/src/marshmallow/schema.py ---- marshmallow-3.1.1.orig/src/marshmallow/schema.py 2019-09-16 14:38:20.000000000 +0200 -+++ marshmallow-3.1.1/src/marshmallow/schema.py 2019-09-16 16:19:15.147762565 +0200 +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 @@ -14,7 +14,7 @@ - from marshmallow import base, fields as ma_fields, class_registry + from marshmallow import base, fields as ma_fields, class_registry, types from marshmallow.error_store import ErrorStore from marshmallow.exceptions import ValidationError, StringNotCollectionError -from marshmallow.orderedset import OrderedSet diff --git a/python-marshmallow.spec b/python-marshmallow.spec index d2c4ace..c802829 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -5,8 +5,8 @@ %global _docdir_fmt %{name} Name: python-%{modname} -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Summary: Python library for converting complex datatypes to and from primitive types License: MIT URL: http://marshmallow.readthedocs.org/ @@ -133,6 +133,9 @@ rm -rf html/{.buildinfo,.doctrees} %changelog +* Tue Mar 24 2020 Miroslav Suchý 3.5.1-1 +- rebase to 3.5.1 + * Thu Jan 30 2020 Fedora Release Engineering - 3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 49cc497..befc13b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (marshmallow-3.1.1.tar.gz) = 66c03bf60492e2806acc629d129cf0b3aa41357bba22c8f38aa9cfa6086e2edfcd2b6d2805576965cc93457f703118a98593bc69cd5d4e0b1cf1789fd3a1ff35 -SHA512 (ordered_set.patch) = 047fb0294abb5dab3ff326f539e6b2c27cd09095735523aae79952179210e9b09c0588f1dc944d167d19f908f55efcaf94af820e0fc7a8e5afe3cdfd82901029 -SHA512 (versionwarning-disable.patch) = a40ef7124cf2819743defdf4c3d771230a44c7caa2834f1011a4618c336a1dc3872760be5fe985af3479fc90a6c455610c42ac37085d091a58901bb63734d239 +SHA512 (marshmallow-3.5.1.tar.gz) = 6ef6f354ab9179dd8e72b066e8d27e045f322c8519f91f5b1d722656ba949409c91c775378283a7e2c1d27638973908d4ca97d314a1a3674d269185b8d8d6cfa +SHA512 (ordered_set.patch) = 7b718a3a4d130baf3ee275056542bd3ed43e3e0261c8a294826486994e4188a73a8e778309acfd03b98e20e35f43a7e9c0b7a1c5bedca6da0f1dbc9ad748a918 +SHA512 (versionwarning-disable.patch) = 82d2a7a8eaa7660c58f45f30e680245a507492d6bb2e3903b21720e5bd3345ea59a0affb67bd54424dd697898c21395f1dc5338b6958cfba3524babef6e3f4ad diff --git a/versionwarning-disable.patch b/versionwarning-disable.patch index 53aed49..2765150 100644 --- a/versionwarning-disable.patch +++ b/versionwarning-disable.patch @@ -1,6 +1,6 @@ -diff -Naur marshmallow-3.1.1.orig/docs/conf.py marshmallow-3.1.1/docs/conf.py ---- marshmallow-3.1.1.orig/docs/conf.py 2019-09-16 14:38:20.000000000 +0200 -+++ marshmallow-3.1.1/docs/conf.py 2019-09-16 16:24:02.651742606 +0200 +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 @@ -14,7 +14,6 @@ "sphinx.ext.viewcode", "alabaster",