From 1c982ea5d3436e1cf23158f8f247539eb0d4ec5a2a707f88d4b49e50421407b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 21 Feb 2019 22:46:07 +0000 Subject: [PATCH 1/2] Accepting request 678054 from home:jayvdb:moban - Update to v1.1.0 - Drop support for Python 2.6 and 3.3. - Build wheels for Linux, Mac, and Windows, allowing systems without a compiler to take advantage of the C extension speedups - Use newer CPython API on Python 3, resulting in a 1.5x speedup - ``escape`` wraps ``__html__`` result in ``Markup``, consistent with documented behavior - Switch to using pytest in %check as setup.py test no longer works - Use more precise URL https://github.com/pallets/markupsafe - Add docs/ to %doc, including the changelog - Remove AUTHORS from %doc, removed upstream in 6247e015 OBS-URL: https://build.opensuse.org/request/show/678054 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-MarkupSafe?expand=0&rev=27 --- MarkupSafe-1.0.tar.gz | 3 --- MarkupSafe-1.1.0.tar.gz | 3 +++ python-MarkupSafe.changes | 15 +++++++++++++++ python-MarkupSafe.spec | 16 ++++++++-------- 4 files changed, 26 insertions(+), 11 deletions(-) delete mode 100644 MarkupSafe-1.0.tar.gz create mode 100644 MarkupSafe-1.1.0.tar.gz diff --git a/MarkupSafe-1.0.tar.gz b/MarkupSafe-1.0.tar.gz deleted file mode 100644 index bfc3362..0000000 --- a/MarkupSafe-1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665 -size 14356 diff --git a/MarkupSafe-1.1.0.tar.gz b/MarkupSafe-1.1.0.tar.gz new file mode 100644 index 0000000..0cc0896 --- /dev/null +++ b/MarkupSafe-1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3 +size 18938 diff --git a/python-MarkupSafe.changes b/python-MarkupSafe.changes index 345d01c..436e4ff 100644 --- a/python-MarkupSafe.changes +++ b/python-MarkupSafe.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Feb 21 16:13:28 UTC 2019 - John Vandenberg + +- Update to v1.1.0 + - Drop support for Python 2.6 and 3.3. + - Build wheels for Linux, Mac, and Windows, allowing systems without + a compiler to take advantage of the C extension speedups + - Use newer CPython API on Python 3, resulting in a 1.5x speedup + - ``escape`` wraps ``__html__`` result in ``Markup``, consistent with + documented behavior +- Switch to using pytest in %check as setup.py test no longer works +- Use more precise URL https://github.com/pallets/markupsafe +- Add docs/ to %doc, including the changelog +- Remove AUTHORS from %doc, removed upstream in 6247e015 + ------------------------------------------------------------------- Mon Jan 14 16:01:46 CET 2019 - kukuk@suse.de diff --git a/python-MarkupSafe.spec b/python-MarkupSafe.spec index 8ac0c92..e076d82 100644 --- a/python-MarkupSafe.spec +++ b/python-MarkupSafe.spec @@ -19,15 +19,15 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-MarkupSafe -Version: 1.0 +Version: 1.1.0 Release: 0 -Url: http://dev.pocoo.org/ +URL: https://github.com/pallets/markupsafe Summary: Implements a XML/HTML/XHTML Markup safe string for Python License: BSD-3-Clause Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros %ifpython2 @@ -43,6 +43,7 @@ safely encode strings for dynamically generated web pages. %prep %setup -q -n MarkupSafe-%{version} +rm docs/make.bat docs/Makefile docs/conf.py docs/requirements.txt %build export CFLAGS="%{optflags}" @@ -53,12 +54,11 @@ export CFLAGS="%{optflags}" %python_expand rm %{buildroot}%{$python_sitearch}/markupsafe/_speedups.c %check -%python_exec setup.py test +%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pytest -%files %python_files -%defattr(-,root,root,-) -%license LICENSE -%doc AUTHORS README.rst +%files %{python_files} +%license LICENSE.rst +%doc README.rst docs/ %{python_sitearch}/markupsafe/ %{python_sitearch}/MarkupSafe-%{version}-py*.egg-info From b07e8d02bde9e613e307cd8f4917e28e42717a6a4127fc5d481057cba44fa5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 5 Mar 2019 16:47:33 +0000 Subject: [PATCH 2/2] - Update to 1.1.1: * Fix segfault when __html__ method raises an exception when using the C speedups. The exception is now propagated correctly. (#109) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-MarkupSafe?expand=0&rev=28 --- MarkupSafe-1.1.0.tar.gz | 3 --- MarkupSafe-1.1.1.tar.gz | 3 +++ python-MarkupSafe.changes | 6 ++++++ python-MarkupSafe.spec | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 MarkupSafe-1.1.0.tar.gz create mode 100644 MarkupSafe-1.1.1.tar.gz diff --git a/MarkupSafe-1.1.0.tar.gz b/MarkupSafe-1.1.0.tar.gz deleted file mode 100644 index 0cc0896..0000000 --- a/MarkupSafe-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3 -size 18938 diff --git a/MarkupSafe-1.1.1.tar.gz b/MarkupSafe-1.1.1.tar.gz new file mode 100644 index 0000000..7f91ce7 --- /dev/null +++ b/MarkupSafe-1.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b +size 19151 diff --git a/python-MarkupSafe.changes b/python-MarkupSafe.changes index 436e4ff..b2afa42 100644 --- a/python-MarkupSafe.changes +++ b/python-MarkupSafe.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 5 16:46:50 UTC 2019 - Tomáš Chvátal + +- Update to 1.1.1: + * Fix segfault when __html__ method raises an exception when using the C speedups. The exception is now propagated correctly. (#109) + ------------------------------------------------------------------- Thu Feb 21 16:13:28 UTC 2019 - John Vandenberg diff --git a/python-MarkupSafe.spec b/python-MarkupSafe.spec index e076d82..3f1806e 100644 --- a/python-MarkupSafe.spec +++ b/python-MarkupSafe.spec @@ -19,7 +19,7 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-MarkupSafe -Version: 1.1.0 +Version: 1.1.1 Release: 0 URL: https://github.com/pallets/markupsafe Summary: Implements a XML/HTML/XHTML Markup safe string for Python @@ -29,6 +29,7 @@ Source: https://files.pythonhosted.org/packages/source/M/MarkupSafe/Mark BuildRequires: %{python_module devel} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros %ifpython2 Provides: %{oldpython}-markupsafe = %{version} @@ -51,6 +52,7 @@ export CFLAGS="%{optflags}" %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} %python_expand rm %{buildroot}%{$python_sitearch}/markupsafe/_speedups.c %check