diff --git a/.gitignore b/.gitignore index 568642b..be9e71f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Paste-1.7.4.tar.gz /Paste-1.7.5.tar.gz Paste-1.7.5.1.tar.gz +/paste-snap-testdata.tar.gz diff --git a/python-paste.spec b/python-paste.spec index e188514..16bcfc2 100644 --- a/python-paste.spec +++ b/python-paste.spec @@ -6,7 +6,7 @@ Name: python-paste Version: 1.7.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for using a Web Server Gateway Interface stack Group: System Environment/Libraries # Most of the code is MIT @@ -18,6 +18,11 @@ Group: System Environment/Libraries License: MIT and ZPLv2.0 and Python and Public Domain and (AFL or MIT) and (MIT or ASL 2.0) URL: http://pythonpaste.org Source0: http://pypi.python.org/pypi/packages/source/P/Paste/Paste-%{version}.tar.gz +# test data left out of the tarball. Captured from a checkout +# https://bitbucket.org/ianb/paste +# changeset: 1498:852439f67241 +# cd paste ; tar -czf paste-snap-testdata.tar.gz tests/cgiapp_data +Source1: paste-snap-testdata.tar.gz # In one remaining place, make sure we check for string in the stdlib before we use our copy Patch0: paste-unbundle-stdlib.patch # Use a system version of python-tempita before our bundled copy @@ -26,18 +31,20 @@ Patch2: paste-27-lambda.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel -%if 0%{?fedora} && 0%{?fedora} < 13 -BuildRequires: python-setuptools-devel -%else +BuildRequires: python2-devel BuildRequires: python-setuptools -%endif +BuildRequires: python-nose +BuildRequires: python-tempita +BuildRequires: pyOpenSSL Requires: python-tempita Requires: pyOpenSSL +Requires: python-setuptools %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-nose +BuildRequires: python3-tempita BuildRequires: /usr/bin/2to3 %endif # if with_python3 @@ -52,6 +59,7 @@ interfaces. Summary: Tools for using a Web Server Gateway Interface stack Group: System Environment/Libraries Requires: python3-tempita +Requires: python3-setuptools # TODO is there a pyOpenSSL for python3 %description -n python3-paste @@ -64,6 +72,7 @@ interfaces. %prep %setup -q -n Paste-%{version} +tar -xzf %{SOURCE1} %patch0 -p1 -b .stdlib rm paste/util/subprocess24.py %patch1 -p1 -b .tmpta @@ -102,6 +111,22 @@ pushd %{py3dir} popd %endif # with_python3 +%check +# At least we're running *some* of the unittests now. +# Tests here that fail with localhost probably shouldn't be failing, though +export PYTHONPATH=$(pwd) +nosetests -e '.*test_static_parser' \ + -e '.*test_deep' \ + -e '.*test_find_file' \ + -e '.*test_paste_website' \ + +%if 0%{?with_python3} +pushd %{py3dir} +export PYTHONPATH=$(pwd) +# Appears that the python3 version of this module is totally nonfunctional +#nosetests-%{python3_version} +popd +%endif # with_python3 %clean rm -rf %{buildroot} @@ -120,6 +145,11 @@ rm -rf %{buildroot} %changelog +* Tue Dec 20 2011 Toshio Kuratomi - 1.7.5.1-3 +- Ugh. Enable unittests and make a note that the python3 module is totally + non-functional. Open a bug for that for the actual package maintainers to + make a decision on. + * Tue Feb 08 2011 Fedora Release Engineering - 1.7.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 18e292d..b791a91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ea5fabed7dca48eb46dc613c4b6c4ed Paste-1.7.5.1.tar.gz +506c9963be1e165239aa6594a58b80d8 paste-snap-testdata.tar.gz