From 1ecb786cc5945d3ab951c7734f39636f429a310cb56b62f39b00bd1d36a7546c Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 17 Jan 2014 10:34:46 +0000 Subject: [PATCH 1/3] Accepting request 214157 from Cloud:OpenStack:Master - remove excessive buildrequires that are not used due to tests being commented out OBS-URL: https://build.opensuse.org/request/show/214157 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-wsgi_intercept?expand=0&rev=7 --- python-wsgi_intercept.changes | 6 ++++++ python-wsgi_intercept.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/python-wsgi_intercept.changes b/python-wsgi_intercept.changes index 744ef96..e4562bf 100644 --- a/python-wsgi_intercept.changes +++ b/python-wsgi_intercept.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 17 10:09:12 UTC 2014 - dmueller@suse.com + +- remove excessive buildrequires that are not used due to + tests being commented out + ------------------------------------------------------------------- Fri Nov 15 19:59:53 UTC 2013 - p.drouand@gmail.com diff --git a/python-wsgi_intercept.spec b/python-wsgi_intercept.spec index e5b45ed..89935f9 100644 --- a/python-wsgi_intercept.spec +++ b/python-wsgi_intercept.spec @@ -1,7 +1,7 @@ # # spec file for package python-wsgi_intercept # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,11 +30,11 @@ BuildRequires: python-setuptools BuildRequires: python-Paste BuildRequires: python-WebTest BuildRequires: python-httplib2 -BuildRequires: python-mechanize -BuildRequires: python-mechanoid +#BuildRequires: python-mechanize +#BuildRequires: python-mechanoid BuildRequires: python-nose -BuildRequires: python-webunit -BuildRequires: python-zope.testbrowser +#BuildRequires: python-webunit +#BuildRequires: python-zope.testbrowser BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} From f7cc06f990cc5c1b94dbaa63c5de6d783a59d36bdc90d4bc42313aa5c937257a Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 17 Jan 2014 15:49:16 +0000 Subject: [PATCH 2/3] - Don't install testsuite globally - Run testsuite - Fix requirement list - Recommend python-requests for the requests-based backend (don't recommend httplib2, it isn't any better than the stdlib module 'httplib' due to it's SSL insufficencies) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-wsgi_intercept?expand=0&rev=8 --- python-wsgi_intercept.changes | 10 ++++++++++ python-wsgi_intercept.spec | 18 ++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/python-wsgi_intercept.changes b/python-wsgi_intercept.changes index e4562bf..5927d9c 100644 --- a/python-wsgi_intercept.changes +++ b/python-wsgi_intercept.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 17 15:47:55 UTC 2014 - speilicke@suse.com + +- Don't install testsuite globally +- Run testsuite +- Fix requirement list +- Recommend python-requests for the requests-based backend + (don't recommend httplib2, it isn't any better than the stdlib + module 'httplib' due to it's SSL insufficencies) + ------------------------------------------------------------------- Fri Jan 17 10:09:12 UTC 2014 - dmueller@suse.com diff --git a/python-wsgi_intercept.spec b/python-wsgi_intercept.spec index 89935f9..bc30400 100644 --- a/python-wsgi_intercept.spec +++ b/python-wsgi_intercept.spec @@ -27,14 +27,11 @@ Source: http://pypi.python.org/packages/source/w/wsgi_intercept/wsgi_int BuildRequires: python-devel BuildRequires: python-setuptools # Test requirements: -BuildRequires: python-Paste -BuildRequires: python-WebTest BuildRequires: python-httplib2 -#BuildRequires: python-mechanize -#BuildRequires: python-mechanoid BuildRequires: python-nose -#BuildRequires: python-webunit -#BuildRequires: python-zope.testbrowser +BuildRequires: python-pytest >= 2.4 +BuildRequires: python-requests +Recommends: python-requests BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -57,13 +54,14 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +rm -rf %{buildroot}%{python_sitelib}/test -#NOTE(saschpe): Fix broken tests -#%%check -#python setup.py test +%check +nosetests %files %defattr(-,root,root,-) -%{python_sitelib}/* +%{python_sitelib}/wsgi_intercept-0.6.0-py2.7.egg-info +%{python_sitelib}/wsgi_intercept %changelog From ad017e31e677485fa33f308d295efe518c0de73c8320cd2d6a8fcf781d2e6f05 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 17 Jan 2014 15:51:41 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-wsgi_intercept?expand=0&rev=9 --- python-wsgi_intercept.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-wsgi_intercept.spec b/python-wsgi_intercept.spec index bc30400..3fb809d 100644 --- a/python-wsgi_intercept.spec +++ b/python-wsgi_intercept.spec @@ -61,7 +61,7 @@ nosetests %files %defattr(-,root,root,-) -%{python_sitelib}/wsgi_intercept-0.6.0-py2.7.egg-info +%{python_sitelib}/wsgi_intercept-%{version}-py%{py_ver}.egg-info %{python_sitelib}/wsgi_intercept %changelog