diff --git a/marshmallow-3.5.1.tar.gz b/marshmallow-3.5.1.tar.gz deleted file mode 100644 index 372c66a..0000000 Binary files a/marshmallow-3.5.1.tar.gz and /dev/null differ diff --git a/marshmallow-3.7.1.tar.gz b/marshmallow-3.7.1.tar.gz new file mode 100644 index 0000000..84bc7a0 Binary files /dev/null and b/marshmallow-3.7.1.tar.gz differ diff --git a/ordered_set.patch b/ordered_set.patch deleted file mode 100644 index aaf97fa..0000000 --- a/ordered_set.patch +++ /dev/null @@ -1,12 +0,0 @@ -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, types - 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 ( - POST_DUMP, - POST_LOAD, diff --git a/python-marshmallow.spec b/python-marshmallow.spec index 826e91f..6851005 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -1,64 +1,75 @@ -%global _docdir_fmt python-marshmallow -Name: python-marshmallow -Version: 3.5.1 -Release: 4 -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}/marshmallow-%{version}.tar.gz -Patch0000: ordered_set.patch -Patch0001: versionwarning-disable.patch -BuildArch: noarch +%global _empty_manifest_terminate_build 0 +Name: python-marshmallow +Version: 3.7.1 +Release: 1 +Summary: A lightweight library for converting complex datatypes to and from native Python datatypes. +License: MIT +URL: https://github.com/marshmallow-code/marshmallow +Source0: https://files.pythonhosted.org/packages/d5/d5/ac33622e14ce7eba02d21bc06bfea3e512ddb408517f3360f1f2692a3929/marshmallow-3.7.1.tar.gz +BuildArch: noarch + +Requires: python3-sphinx +Requires: python3-pytest +Requires: python3-pytz +Requires: python3-simplejson %description -arshmallow is a framework-agnostic library for converting complex datatypes, -such as objects, to and from primitive Python datatypes. - -%package help -Summary: Documentation for python-marshmallow -Provides: python3-marshmallow-doc = %{version} -Obsoletes: python3-marshmallow-doc < 2.8.0-1 -BuildRequires: python3-sphinx -%description help -Documentation for python-marshmallow. + $ pip install -U marshmallow %package -n python3-marshmallow -Summary: %{summary} -%{?python_provide:%python_provide python3-marshmallow} -BuildRequires: python3-devel python3-setuptools python3-pytest python3-pytz -BuildRequires: python3-ordered-set python3-dateutil python3-simplejson -Requires: python3-ordered-set -Recommends: python3-dateutil python3-simplejson +Summary: A lightweight library for converting complex datatypes to and from native Python datatypes. +Provides: python-marshmallow +BuildRequires: python3-devel +BuildRequires: python3-setuptools %description -n python3-marshmallow -Python 3 version. + $ pip install -U marshmallow + +%package help +Summary: Development documents and examples for marshmallow +Provides: python3-marshmallow-doc +%description help + $ pip install -U marshmallow %prep -%autosetup -n marshmallow-%{version} -p1 -rm -f ./marshmallow/orderedset.py -sed -i -e "/sphinx_issues/d" docs/conf.py -sed -i -e "/donate_url/d" docs/conf.py +%autosetup -n marshmallow-3.7.1 %build -%{?with_python3:%py3_build} -sphinx-build -b html docs html +%py3_build %install -%{?with_python3:%py3_install} -rm -rf html/{.buildinfo,.doctrees} +%py3_install +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . -%check -%{?with_pythoN3:py.test-%{python3_version} -v} +%files -n python3-marshmallow -f filelist.lst +%dir %{python3_sitelib}/* -%files help -%license LICENSE -%doc html examples - -%files -n python3-marshmallow -%license LICENSE -%doc CHANGELOG.rst README.rst -%{python3_sitelib}/marshmallow/ -%{python3_sitelib}/marshmallow-*.egg-info/ +%files help -f doclist.lst +%{_pkgdocdir} %changelog -* Mon Jun 22 2020 huanghaitao - 3.5.1-4 -- package init +* Thu Aug 13 2020 Python_Bot +- Package Spec generated diff --git a/versionwarning-disable.patch b/versionwarning-disable.patch deleted file mode 100644 index 2765150..0000000 --- a/versionwarning-disable.patch +++ /dev/null @@ -1,40 +0,0 @@ -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", - "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")