diff --git a/.gitignore b/.gitignore
index 1d5d866..b30ed5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/marshmallow-*.tar.gz
+/ordered_set.patch
+/versionwarning-disable.patch
diff --git a/ordered_set.patch b/ordered_set.patch
index 177e1ef..d5ae7bf 100644
--- a/ordered_set.patch
+++ b/ordered_set.patch
@@ -1,12 +1,12 @@
-diff -Naur marshmallow-2.11.1.orig/marshmallow/schema.py test/marshmallow/schema.py
---- marshmallow-2.11.1.orig/marshmallow/schema.py 2017-01-08 22:23:48.000000000 +0100
-+++ test/marshmallow/schema.py 2018-09-21 15:24:08.994234083 +0200
-@@ -17,7 +17,7 @@
- from marshmallow.compat import (with_metaclass, iteritems, text_type,
- binary_type, OrderedDict)
- from marshmallow.exceptions import ValidationError
+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
+@@ -14,7 +14,7 @@
+ from marshmallow import base, fields as ma_fields, class_registry
+ from marshmallow.error_store import ErrorStore
+ from marshmallow.exceptions import ValidationError, StringNotCollectionError
-from marshmallow.orderedset import OrderedSet
+from ordered_set import OrderedSet
- from marshmallow.decorators import (PRE_DUMP, POST_DUMP, PRE_LOAD, POST_LOAD,
- VALIDATES, VALIDATES_SCHEMA)
- from marshmallow.utils import missing
+ from marshmallow.decorators import (
+ POST_DUMP,
+ POST_LOAD,
diff --git a/python-marshmallow-2.19.0-ordered_set.patch b/python-marshmallow-2.19.0-ordered_set.patch
deleted file mode 100644
index da5212c..0000000
--- a/python-marshmallow-2.19.0-ordered_set.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/marshmallow/schema.py b/src/marshmallow/schema.py
-index acf728f..e0a7cae 100644
---- a/src/marshmallow/schema.py
-+++ b/src/marshmallow/schema.py
-@@ -16,7 +16,7 @@ from marshmallow import base, fields, utils, class_registry, marshalling
- from marshmallow.compat import (with_metaclass, iteritems, text_type,
- binary_type, Mapping, OrderedDict)
- from marshmallow.exceptions import ValidationError
--from marshmallow.orderedset import OrderedSet
-+from ordered_set import OrderedSet
- from marshmallow.decorators import (PRE_DUMP, POST_DUMP, PRE_LOAD, POST_LOAD,
- VALIDATES, VALIDATES_SCHEMA)
- from marshmallow.utils import missing
diff --git a/python-marshmallow-2.19.0-versionwarning-disable.patch b/python-marshmallow-2.19.0-versionwarning-disable.patch
deleted file mode 100644
index 8eecfeb..0000000
--- a/python-marshmallow-2.19.0-versionwarning-disable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 2cb5a10..520c101 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -35,7 +35,6 @@ extensions = [
- 'sphinx.ext.viewcode',
- 'alabaster',
- 'sphinx_issues',
-- 'versionwarning.extension',
- ]
-
- primary_domain = 'py'
-@@ -101,19 +100,3 @@ html_sidebars = {
- '**': ['about.html', 'donate.html', 'useful-links.html',
- 'localtoc.html', 'relations.html', 'searchbox.html']
- }
--
--# sphinx-version-warning config
--versionwarning_messages = {
-- 'latest': 'This document is for the development version. For the stable version documentation, see here.',
-- 'stable': 'This document is for the latest stable release. For the 3.0 pre-release documentation, see here.',
-- '3.0': 'This document is for the latest 3.0 pre-release. For the 2.x documentation, see here.',
-- '2.x-line': 'This document is for the 2.x release branch. For the 3.0 pre-release documentation, see here.',
--}
--# Show warning at top of page
--versionwarning_body_selector = 'div.document'
--# For debugging locally
--# versionwarning_project_version = '3.0'
--
--# https://docs.readthedocs.io/en/latest/guides/adding-custom-css.html
--def setup(app):
-- app.add_stylesheet('css/versionwarning.css')
diff --git a/python-marshmallow.spec b/python-marshmallow.spec
index 6f69627..d292ada 100644
--- a/python-marshmallow.spec
+++ b/python-marshmallow.spec
@@ -5,14 +5,14 @@
%global _docdir_fmt %{name}
Name: python-%{modname}
-Version: 2.20.0
-Release: 2%{?dist}
+Version: 3.1.1
+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: python-marshmallow-2.19.0-ordered_set.patch
-Patch1: python-marshmallow-2.19.0-versionwarning-disable.patch
+Patch0: ordered_set.patch
+Patch1: versionwarning-disable.patch
BuildArch: noarch
@@ -86,9 +86,7 @@ Python 3 version.
# remove bundled library
# instead of orderedsett we patch code to usu python-ordered-set
-# ordereddict.py is used only for compatibility with python2.6,
-# which we do not need
-rm -f ./marshmallow/ordereddict.py ./marshmallow/orderedset.py
+rm -f ./marshmallow/orderedset.py
# Drop support for sphinx-issues as it's not yet packaged
sed -i -e "/sphinx_issues/d" docs/conf.py
@@ -135,6 +133,9 @@ rm -rf html/{.buildinfo,.doctrees}
%changelog
+* Mon Sep 16 2019 Miroslav Suchý 3.1.1-1
+- rebase to python-marshmallow 3.1.1
+
* Wed Aug 21 2019 Miro Hrončok - 2.20.0-2
- Rebuilt for Python 3.8
diff --git a/sources b/sources
index 75af2b3..49cc497 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (marshmallow-2.20.0.tar.gz) = 75e84165a29fa9ea99e65f2f3a577b7f01ed8e3be2fd185b5535537a974751cb61bcb4e3e2ded929ce35ec47c5b284126f98696c9e39028a771a074dc3cde669
+SHA512 (marshmallow-3.1.1.tar.gz) = 66c03bf60492e2806acc629d129cf0b3aa41357bba22c8f38aa9cfa6086e2edfcd2b6d2805576965cc93457f703118a98593bc69cd5d4e0b1cf1789fd3a1ff35
+SHA512 (ordered_set.patch) = 047fb0294abb5dab3ff326f539e6b2c27cd09095735523aae79952179210e9b09c0588f1dc944d167d19f908f55efcaf94af820e0fc7a8e5afe3cdfd82901029
+SHA512 (versionwarning-disable.patch) = a40ef7124cf2819743defdf4c3d771230a44c7caa2834f1011a4618c336a1dc3872760be5fe985af3479fc90a6c455610c42ac37085d091a58901bb63734d239
diff --git a/versionwarning-disable.patch b/versionwarning-disable.patch
new file mode 100644
index 0000000..53aed49
--- /dev/null
+++ b/versionwarning-disable.patch
@@ -0,0 +1,40 @@
+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
+@@ -14,7 +14,6 @@
+ "sphinx.ext.viewcode",
+ "alabaster",
+ "sphinx_issues",
+- "versionwarning.extension",
+ ]
+
+ primary_domain = "py"
+@@ -87,28 +86,3 @@
+ "searchbox.html",
+ ],
+ }
+-
+-# sphinx-version-warning config
+-versionwarning_messages = {
+- "latest": (
+- "This document is for the development version. "
+- '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.'
+- ),
+- "2.x-line": (
+- "This document is for the 2.x release branch. "
+- 'For the 3.x documentation, see here.'
+- ),
+-}
+-# Show warning at top of page
+-versionwarning_body_selector = "div.document"
+-# For debugging locally
+-# versionwarning_project_version = 'latest'
+-
+-
+-def setup(app):
+- # https://docs.readthedocs.io/en/latest/guides/adding-custom-css.html
+- app.add_stylesheet("css/versionwarning.css")