diff --git a/pecan-1.2.1.tar.gz b/pecan-1.2.1.tar.gz deleted file mode 100644 index 785a0e6..0000000 --- a/pecan-1.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d95457b9cedcfda9b467f5cc7dde8cdf72ddba6b402d6a5902843d1b2186c46 -size 120364 diff --git a/pecan-1.3.2.tar.gz b/pecan-1.3.2.tar.gz new file mode 100644 index 0000000..4ea0b1e --- /dev/null +++ b/pecan-1.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24f06cf88a488b75f433e62b33c1c97e4575d0cd91eec9eec841a81cecfd6de3 +size 119868 diff --git a/pecan-no-kajiki.patch b/pecan-no-kajiki.patch new file mode 100644 index 0000000..56a8259 --- /dev/null +++ b/pecan-no-kajiki.patch @@ -0,0 +1,23 @@ +Index: pecan-1.3.2/setup.py +=================================================================== +--- pecan-1.3.2.orig/setup.py ++++ pecan-1.3.2/setup.py +@@ -35,16 +35,8 @@ tests_require = requirements + [ + 'mock', + 'sqlalchemy' + ] +- +-if sys.version_info < (3, 0): +- # These don't support Python3 yet - don't run their tests +- if platform.python_implementation() != 'PyPy': +- # Kajiki is not pypy-compatible +- tests_require += ['Kajiki'] +- tests_require += ['Genshi'] +-else: +- # Genshi added Python3 support in 0.7 +- tests_require += ['Genshi>=0.7'] ++# Genshi added Python3 support in 0.7 ++tests_require += ['Genshi>=0.7'] + + # + # call setup diff --git a/pull-request-91.patch b/pull-request-91.patch deleted file mode 100644 index 8711330..0000000 --- a/pull-request-91.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b45975931bba9808fe88f6931fcdeeb3d201cda8 Mon Sep 17 00:00:00 2001 -From: Ryan Petrello -Date: Mon, 7 Aug 2017 22:19:49 -0400 -Subject: [PATCH] fix broken py36 tests - ---- - .travis.yml | 6 ++++-- - pecan/tests/test_conf.py | 2 +- - 2 files changed, 5 insertions(+), 3 deletions(-) - -Index: pecan-1.2.1/pecan/tests/test_conf.py -=================================================================== ---- pecan-1.2.1.orig/pecan/tests/test_conf.py -+++ pecan-1.2.1/pecan/tests/test_conf.py -@@ -157,7 +157,7 @@ class TestConf(PecanTestCase): - - try: - configuration.conf_from_file(f.name) -- except (ValueError, SystemError) as e: -+ except (ValueError, SystemError, ImportError) as e: - assert 'relative import' in str(e) - else: - raise AssertionError( diff --git a/python-pecan.changes b/python-pecan.changes index b902536..a35491a 100644 --- a/python-pecan.changes +++ b/python-pecan.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Aug 22 14:50:34 UTC 2018 - comurphy@suse.com + +- Add python-pysqlite dependency + * Needed for the unit tests + +------------------------------------------------------------------- +Thu Aug 16 09:31:01 UTC 2018 - jengelh@inai.de + +- Ensure neutrality of description. + +------------------------------------------------------------------- +Thu Aug 9 09:54:40 UTC 2018 - tchvatal@suse.com + +- Do not depend on Kajiki as it is Genshi clone: + * pecan-no-kajiki.patch + +------------------------------------------------------------------- +Thu Aug 9 09:44:14 UTC 2018 - tchvatal@suse.com + +- Version update to 1.3.2: + * Fixes for newer webob and other dependencies +- Drop merged patch pull-request-91.patch + ------------------------------------------------------------------- Thu Aug 24 15:31:13 UTC 2017 - tbechtold@suse.com diff --git a/python-pecan.spec b/python-pecan.spec index ea1e450..6c85f7d 100644 --- a/python-pecan.spec +++ b/python-pecan.spec @@ -1,7 +1,7 @@ # # spec file for package python-pecan # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,74 +18,66 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pecan -Version: 1.2.1 +Version: 1.3.2 Release: 0 -Summary: A WSGI object-dispatching web framework, designed to be lean and fast +Summary: A WSGI object-dispatching web framework License: BSD-3-Clause Group: Development/Languages/Python -Url: http://github.com/dreamhost/pecan +URL: https://github.com/pecan/pecan Source: https://files.pythonhosted.org/packages/source/p/pecan/pecan-%{version}.tar.gz -# # PATCH-FIX-UPSTREAM pull-request-91.patch -- https://github.com/pecan/pecan/pull/91 -Patch1: pull-request-91.patch -BuildRequires: %{python_module devel} -BuildRequires: %{python_module setuptools} -BuildRequires: python-rpm-macros -# Test requirements: -%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 -BuildRequires: %{python_module Genshi} +Patch0: pecan-no-kajiki.patch +BuildRequires: %{python_module Genshi >= 0.7} BuildRequires: %{python_module Jinja2} -BuildRequires: %{python_module Kajiki} BuildRequires: %{python_module Mako >= 0.4.0} BuildRequires: %{python_module SQLAlchemy} +BuildRequires: %{python_module WebOb >= 1.2} BuildRequires: %{python_module WebTest >= 1.3.1} BuildRequires: %{python_module gunicorn} BuildRequires: %{python_module logutils} BuildRequires: %{python_module mock} -BuildRequires: %{python_module virtualenv} -BuildRequires: python2-singledispatch -%endif +BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} +BuildRequires: %{python_module virtualenv} +BuildRequires: fdupes +BuildRequires: python-pysqlite +BuildRequires: python-rpm-macros +BuildRequires: python2-singledispatch Requires: python-Mako >= 0.4.0 -Requires: python-WebOb >= 1.2dev +Requires: python-WebOb >= 1.2 Requires: python-WebTest >= 1.3.1 Requires: python-logutils >= 0.3 -%ifpython2 -Requires: python-singledispatch -%endif Requires: python-six -%if 0%{?suse_version} -Suggests: python-Jinja2 -Suggests: python-Genshi -Suggests: python-gunicorn -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch - +%ifpython2 +Requires: python-singledispatch +%endif +%if 0%{?suse_version} +Suggests: python-Genshi +Suggests: python-Jinja2 +Suggests: python-gunicorn +%endif %python_subpackages %description -A WSGI object-dispatching web framework, designed to be lean and fast with few dependencies. +A WSGI object-dispatching web framework. %prep %setup -q -n pecan-%{version} -# Let's not depend on Kajiki, a Genshi clone. Genshi should be enough: -sed -i "/'Kajiki',/d" setup.py -%patch1 -p1 +%patch0 -p1 %build %python_build %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/pecan %python_clone -a %{buildroot}%{_bindir}/gunicorn_pecan -%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 %check %python_exec setup.py test -%endif %post %python_install_alternative pecan @@ -96,8 +88,8 @@ sed -i "/'Kajiki',/d" setup.py %python_uninstall_alternative gunicorn_pecan %files %{python_files} -%defattr(-,root,root,-) -%doc LICENSE README.rst +%license LICENSE +%doc README.rst %python_alternative %{_bindir}/pecan %python_alternative %{_bindir}/gunicorn_pecan %{python_sitelib}/*