From 580359ae27a325655491be24ddd1cebc3b14001cf3245eaadb4690cc3204ca1c Mon Sep 17 00:00:00 2001 From: Todd R Date: Tue, 1 Aug 2017 16:02:07 +0000 Subject: [PATCH] Accepting request 512685 from home:sebix:branches:devel:languages:python - convert to singlespec - run tests during build * add fix-file-location-test.patch to fix a hardcoded path in the tests * add fix-error-plugin-test.patch to fix test on 3.6 - add documentation in subpackage python-Yapsy-doc OBS-URL: https://build.opensuse.org/request/show/512685 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Yapsy?expand=0&rev=4 --- fix-error-plugin-test.patch | 11 +++++++ fix-file-location-test.patch | 11 +++++++ python-Yapsy.changes | 9 ++++++ python-Yapsy.spec | 57 ++++++++++++++++++++++++++++-------- 4 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 fix-error-plugin-test.patch create mode 100644 fix-file-location-test.patch diff --git a/fix-error-plugin-test.patch b/fix-error-plugin-test.patch new file mode 100644 index 0000000..4c7b45e --- /dev/null +++ b/fix-error-plugin-test.patch @@ -0,0 +1,11 @@ +--- test/test_ErrorInPlugin.py 2015-03-28 22:00:14.000000000 +0100 ++++ test/test_ErrorInPlugin.py 2017-07-22 21:35:03.391697688 +0200 +@@ -50,7 +50,7 @@ + self.assertEqual(len(callback_infos),1) + self.assertTrue(isinstance(callback_infos[0].error,tuple)) + self.assertEqual(loadedPlugins[0],callback_infos[0]) +- self.assertEqual(callback_infos[0].error[0],ImportError) ++ self.assertTrue(issubclass(callback_infos[0].error[0],ImportError)) + # check that the getCategories works + self.assertEqual(len(spm.getCategories()),1) + sole_category = spm.getCategories()[0] diff --git a/fix-file-location-test.patch b/fix-file-location-test.patch new file mode 100644 index 0000000..58a94c1 --- /dev/null +++ b/fix-file-location-test.patch @@ -0,0 +1,11 @@ +--- test/test_PluginFileLocator.py 2015-04-18 22:48:35.000000000 +0200 ++++ test/test_PluginFileLocator1.py 2017-07-22 20:50:21.661546448 +0200 +@@ -192,7 +192,7 @@ + def test_default_plugins_place_is_parent_dir(self): + """Test a non-trivial default behaviour introduced some time ago :S""" + pl = PluginFileLocator() +- self.assertTrue("package/yapsy" in pl.plugins_places[0]) ++ self.assertTrue("yapsy" in pl.plugins_places[0]) + + def test_locatePlugins(self): + pl = PluginFileLocator() diff --git a/python-Yapsy.changes b/python-Yapsy.changes index 1618d92..b2d2f4d 100644 --- a/python-Yapsy.changes +++ b/python-Yapsy.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jul 22 18:38:21 UTC 2017 - sebix+novell.com@sebix.at + +- convert to singlespec +- run tests during build + * add fix-file-location-test.patch to fix a hardcoded path in the tests + * add fix-error-plugin-test.patch to fix test on 3.6 +- add documentation in subpackage python-Yapsy-doc + ------------------------------------------------------------------- Fri Jan 6 21:09:16 UTC 2017 - boris@steki.net diff --git a/python-Yapsy.spec b/python-Yapsy.spec index 1111763..d12783b 100644 --- a/python-Yapsy.spec +++ b/python-Yapsy.spec @@ -16,6 +16,8 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without test Name: python-Yapsy Version: 1.11.223 Release: 0 @@ -23,15 +25,27 @@ Summary: Yet another plugin system License: BSD-2-Clause Group: Development/Languages/Python Url: http://yapsy.sourceforge.net -Source: https://pypi.python.org/packages/8f/02/0f635f65c6ecbc75bd18f07fa9bb29c7823f4098b37623000bfc6e5861f4/Yapsy-1.11.223.tar.gz -BuildRequires: python-devel -BuildRequires: python-setuptools -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()")} -%else +Source: https://files.pythonhosted.org/packages/source/Y/Yapsy/Yapsy-1.11.223.tar.gz +# PATCH-FIX-OPENSUSE fix-file-location-test.patch sebix+novell.com@sebix.at -- Fix file locations for tests +Patch0: fix-file-location-test.patch +# PATCH-FIX-OPENSUSE fix-error-plugin-test.patch sebix+novell.com@sebix.at -- Fix exception class for tests +Patch1: fix-error-plugin-test.patch +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +# SECTION docs +BuildRequires: python-Sphinx +# /SECTION +Provides: python-yapsy +Suggests: %{name}-doc BuildArch: noarch -%endif + +%{python_subpackages} + +%package -n %{name}-doc +Summary: Documentation for %{name} +Group: Documentation/HTML %description Yapsy is a small library implementing the core mechanisms needed to @@ -41,19 +55,38 @@ The main purpose is to depend only on Python's standard libraries (at least version 2.3) and to implement only the basic functionalities needed to detect, load and keep track of several plugins. +%description -n %{name}-doc +HTML documentation files for %{name}. %prep %setup -q -n Yapsy-%{version} +%patch0 +%patch1 %build -python setup.py build +%{python_build} find yapsy/ -name "*.py" -exec sed -i -e '/^#!\s\?\/usr\/bin\/\(env\s\)\?python$/d' {} ';' +pushd doc +make html +#rm _build/html/.buildinfo +popd %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%{python_install} +%{python_expand %fdupes %{buildroot}%{$python_sitelib}} -%files -%defattr(-,root,root,-) +%if %{with test} +%check +%{python_exec setup.py test} +%endif + +%files %{python_files} %{python_sitelib}/* +%doc CHANGELOG.txt README.txt +%license LICENSE.txt + +%files -n %{name}-doc +%doc doc/_build/html +%doc artwork %changelog