This commit is contained in:
hht8 2020-08-13 16:56:32 +08:00
parent 474325aeeb
commit cf82d7bda4
5 changed files with 60 additions and 101 deletions

Binary file not shown.

BIN
marshmallow-3.7.1.tar.gz Normal file

Binary file not shown.

View File

@ -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,

View File

@ -1,64 +1,75 @@
%global _docdir_fmt python-marshmallow %global _empty_manifest_terminate_build 0
Name: python-marshmallow Name: python-marshmallow
Version: 3.5.1 Version: 3.7.1
Release: 4 Release: 1
Summary: Python library for converting complex datatypes to and from primitive types Summary: A lightweight library for converting complex datatypes to and from native Python datatypes.
License: MIT License: MIT
URL: http://marshmallow.readthedocs.org/ URL: https://github.com/marshmallow-code/marshmallow
Source0: https://github.com/marshmallow-code/marshmallow/archive/%{version}/marshmallow-%{version}.tar.gz Source0: https://files.pythonhosted.org/packages/d5/d5/ac33622e14ce7eba02d21bc06bfea3e512ddb408517f3360f1f2692a3929/marshmallow-3.7.1.tar.gz
Patch0000: ordered_set.patch
Patch0001: versionwarning-disable.patch
BuildArch: noarch BuildArch: noarch
%description Requires: python3-sphinx
arshmallow is a framework-agnostic library for converting complex datatypes, Requires: python3-pytest
such as objects, to and from primitive Python datatypes. Requires: python3-pytz
Requires: python3-simplejson
%package help %description
Summary: Documentation for python-marshmallow $ pip install -U marshmallow
Provides: python3-marshmallow-doc = %{version}
Obsoletes: python3-marshmallow-doc < 2.8.0-1
BuildRequires: python3-sphinx
%description help
Documentation for python-marshmallow.
%package -n python3-marshmallow %package -n python3-marshmallow
Summary: %{summary} Summary: A lightweight library for converting complex datatypes to and from native Python datatypes.
%{?python_provide:%python_provide python3-marshmallow} Provides: python-marshmallow
BuildRequires: python3-devel python3-setuptools python3-pytest python3-pytz BuildRequires: python3-devel
BuildRequires: python3-ordered-set python3-dateutil python3-simplejson BuildRequires: python3-setuptools
Requires: python3-ordered-set
Recommends: python3-dateutil python3-simplejson
%description -n python3-marshmallow %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 %prep
%autosetup -n marshmallow-%{version} -p1 %autosetup -n marshmallow-3.7.1
rm -f ./marshmallow/orderedset.py
sed -i -e "/sphinx_issues/d" docs/conf.py
sed -i -e "/donate_url/d" docs/conf.py
%build %build
%{?with_python3:%py3_build} %py3_build
sphinx-build -b html docs html
%install %install
%{?with_python3:%py3_install} %py3_install
rm -rf html/{.buildinfo,.doctrees} 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 %files -n python3-marshmallow -f filelist.lst
%{?with_pythoN3:py.test-%{python3_version} -v} %dir %{python3_sitelib}/*
%files help %files help -f doclist.lst
%license LICENSE %{_pkgdocdir}
%doc html examples
%files -n python3-marshmallow
%license LICENSE
%doc CHANGELOG.rst README.rst
%{python3_sitelib}/marshmallow/
%{python3_sitelib}/marshmallow-*.egg-info/
%changelog %changelog
* Mon Jun 22 2020 huanghaitao <huanghaitao8@huawei.com> - 3.5.1-4 * Thu Aug 13 2020 Python_Bot <Python_Bot@openeuler.org>
- package init - Package Spec generated

View File

@ -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 <a href="/en/stable/">here</a>.'
- ),
- "stable": (
- "This document is for the latest 3.x stable release. "
- 'For the 2.x documentation, see <a href="/en/2.x-line/">here</a>.'
- ),
- "2.x-line": (
- "This document is for the 2.x release branch. "
- 'For the 3.x documentation, see <a href="/en/stable/">here</a>.'
- ),
-}
-# 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")