diff --git a/disable-autodocsumm.patch b/disable-autodocsumm.patch index 7d90cc9..cb9add5 100644 --- a/disable-autodocsumm.patch +++ b/disable-autodocsumm.patch @@ -1,6 +1,17 @@ -diff -Naur marshmallow-3.11.1.orig/docs/conf.py marshmallow-3.11.1/docs/conf.py ---- marshmallow-3.11.1.orig/docs/conf.py 2021-03-30 19:51:32.829382094 +0200 -+++ marshmallow-3.11.1/docs/conf.py 2021-03-30 19:52:00.738398342 +0200 +diff -Naur marshmallow-3.17.0.orig/setup.py marshmallow-3.17.0/setup.py +--- marshmallow-3.17.0.orig/setup.py 2022-06-26 23:46:49.000000000 +0200 ++++ marshmallow-3.17.0/setup.py 2022-06-27 19:07:26.976431607 +0200 +@@ -14,7 +14,6 @@ + "sphinx-issues==3.0.1", + "alabaster==0.7.12", + "sphinx-version-warning==1.1.2", +- "autodocsumm==0.2.8", + ], + } + EXTRAS_REQUIRE["dev"] = EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["lint"] + ["tox"] +diff -Naur marshmallow-3.17.0.orig/docs/conf.py marshmallow-3.17.0/docs/conf.py +--- marshmallow-3.17.0.orig/docs/conf.py 2022-06-26 23:46:49.000000000 +0200 ++++ marshmallow-3.17.0/docs/conf.py 2022-06-27 19:07:26.976431607 +0200 @@ -14,7 +14,6 @@ "sphinx.ext.viewcode", "alabaster", @@ -9,14 +20,3 @@ diff -Naur marshmallow-3.11.1.orig/docs/conf.py marshmallow-3.11.1/docs/conf.py ] primary_domain = "py" -diff -Naur marshmallow-3.11.1.orig/setup.py marshmallow-3.11.1/setup.py ---- marshmallow-3.11.1.orig/setup.py 2021-03-30 02:11:23.000000000 +0200 -+++ marshmallow-3.11.1/setup.py 2021-03-30 19:52:09.434403403 +0200 -@@ -14,7 +14,6 @@ - "sphinx-issues==1.2.0", - "alabaster==0.7.12", - "sphinx-version-warning==1.1.2", -- "autodocsumm==0.2.6", - ], - } - EXTRAS_REQUIRE["dev"] = EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["lint"] + ["tox"] diff --git a/python-marshmallow.spec b/python-marshmallow.spec index 8873583..1338679 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -5,8 +5,8 @@ %global _docdir_fmt %{name} Name: python-%{modname} -Version: 3.13.0 -Release: 3%{?dist} +Version: 3.17.0 +Release: 1%{?dist} Summary: Python library for converting complex datatypes to and from primitive types License: MIT URL: http://marshmallow.readthedocs.org/ @@ -75,6 +75,7 @@ BuildRequires: python3-pytz BuildRequires: python3-ordered-set BuildRequires: python3-dateutil BuildRequires: python3-simplejson +BuildRequires: python3-sphinx-issues Requires: python3-ordered-set Recommends: python3-dateutil Recommends: python3-simplejson @@ -91,9 +92,6 @@ Python 3 version. # instead of orderedsett we patch code to usu python-ordered-set 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 - # unsupported theme option 'donate_url' given sed -i -e "/donate_url/d" docs/conf.py @@ -136,6 +134,10 @@ rm -rf html/{.buildinfo,.doctrees} %changelog +* Mon Jun 27 2022 Miroslav Suchý 3.17.0-1 +- allow to use sphinx-issues +- rebase to 3.17.0 + * Mon Jun 13 2022 Python Maint - 3.13.0-3 - Rebuilt for Python 3.11 diff --git a/sources b/sources index 5fdbd55..5c440d7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (marshmallow-3.13.0.tar.gz) = 85dcfc8b9d1b4ef4c67644160d4f835fceb3ba246505e5df956675c19884b10a59e79bd215eea48c9c96afad86444bfadd322b9f9153c10b07c99ed51ec05b96 +SHA512 (marshmallow-3.17.0.tar.gz) = 8be65bbc816d69975b17b6c8f831951ac3298499e8d7bdf70619cafda1b78242365dd92add1c2f538b1083e26c2407021e757cba14087af00653c727231848a8 SHA512 (ordered_set.patch) = c4a2e832fc0e8a34d8fce84b6d4afffb9273b12a175a78b49d3228ebafc7117e10d883691f81add8950166ae360615167b2bf575dd887152cf0e1c181ce89c07 SHA512 (versionwarning-disable.patch) = d41a3c696f61f4d8ef1786c358558f47bb23115744e5c2b78d36c52cc29fb7bcdfa85504d7ce8e914b60478c13d83700a1aa447063d48fa92f132874f5a9825e -SHA512 (disable-autodocsumm.patch) = c518398bf4efc511a0c3aa14a7f8b0161d7c5c8f62c4193b48bd29741369e20900a14424694ce2b253ba8d7b257856eb6a3fc631cbc12fa9db3cf49772d47359 +SHA512 (disable-autodocsumm.patch) = 8663dc5d4a44a3640d7053234b0d5be9e82b96cddf08a551f9da4f81cea2d44926caaaac5d4baa0a89a7a724bf35c1a385430c815a04098ebfd16e9ce00670d2