Hello community,
here is the log from the commit of package python-PasteScript for
openSUSE:Factory checked in at 2018-08-24 17:04:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PasteScript (Old)
and /work/SRC/openSUSE:Factory/.python-PasteScript.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PasteScript"
Fri Aug 24 17:04:15 2018 rev:12 rq:629057 version:2.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PasteScript/python-PasteScript.changes
2017-05-17 10:50:56.859580609 +0200
+++
/work/SRC/openSUSE:Factory/.python-PasteScript.new/python-PasteScript.changes
2018-08-24 17:04:16.714083817 +0200
@@ -1,0 +2,6 @@
+Mon Aug 13 13:22:39 UTC 2018 - [email protected]
+
+- Remove dependency on unittest2
+ Add remove_unittest2.patch to facilitate that
+
+-------------------------------------------------------------------
New:
----
remove_unittest2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PasteScript.spec ++++++
--- /var/tmp/diff_new_pack.H3mH2r/_old 2018-08-24 17:04:17.222084419 +0200
+++ /var/tmp/diff_new_pack.H3mH2r/_new 2018-08-24 17:04:17.222084419 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-PasteScript
#
-# Copyright (c) 2017 SUSE LINUX Products 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
@@ -15,49 +15,40 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# Namespace package issues break tests on Factory
-%if 0%{?suse_version} > 1320
-%bcond_with tests
-%else
-%bcond_without tests
-%endif
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-PasteScript
Version: 2.0.2
Release: 0
-Url: http://pythonpaste.org/script/
Summary: A pluggable command-line frontend to setup package file layouts
License: MIT
Group: Development/Languages/Python
+URL: https://bitbucket.org/ianb/pastescript/
Source:
https://files.pythonhosted.org/packages/source/P/PasteScript/PasteScript-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: fdupes
-BuildRequires: python-rpm-macros
-BuildRequires: %{python_module devel}
-BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module six}
+Patch10: remove_unittest2.patch
BuildRequires: %{python_module Paste >= 1.3}
BuildRequires: %{python_module PasteDeploy}
-%if %{with tests}
-# Test requirements
-BuildRequires: %{python_module nose >= 0.11}
-BuildRequires: python-Cheetah
-BuildRequires: python-unittest2
-%endif
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module six}
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
Requires: python-Paste >= 1.3
Requires: python-PasteDeploy
Requires: python-setuptools
Requires: python-six
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
+BuildArch: noarch
+# Test requirements
+BuildRequires: %{python_module nose >= 0.11}
+BuildRequires: python-Cheetah
%ifpython2
Recommends: python-Cheetah
Provides: %{oldpython}-pastescript = %{version}
Obsoletes: %{oldpython}-pastescript < %{version}
%endif
-Requires(post): update-alternatives
-Requires(preun): update-alternatives
-BuildArch: noarch
%python_subpackages
%description
@@ -68,6 +59,7 @@
%prep
%setup -q -n PasteScript-%{version}
+%patch10 -p1
mv docs/_build docs/html # Proper name for HTML docs
sed -i "1d" tests/test_logging_config.py # Fix non-executable script
@@ -82,10 +74,8 @@
# Prepare for update-alternatives usage
%python_clone -a %{buildroot}%{_bindir}/paster
-%if %{with tests}
%check
-%python_expand nosetests-%{$python_bin_suffix} -v tests/
-%endif
+# %%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
nosetests-%{$python_bin_suffix}
%post
%python_install_alternative paster
@@ -94,8 +84,8 @@
%python_uninstall_alternative paster
%files %{python_files}
-%defattr(-,root,root,-)
-%doc README.rst docs/license.txt docs/news.txt
+%license docs/license.txt
+%doc README.rst docs/news.txt
%doc docs/html/
%python_alternative %{_bindir}/paster
%{python_sitelib}/PasteScript-%{version}-py*.egg-info
++++++ remove_unittest2.patch ++++++
--- a/tests/test_command.py
+++ b/tests/test_command.py
@@ -11,11 +11,7 @@ import six
import sys
import tempfile
import textwrap
-try:
- # Use unittest2 for Python 2 to get assertRegex() and assertIn() methods
- import unittest2 as unittest
-except ImportError:
- import unittest
+import unittest
@contextlib.contextmanager
@@ -294,7 +290,7 @@ class PostTest(unittest.TestCase):
''').strip()
html_regex = '\n%s\n' % html_regex
html_regex = re.compile(html_regex, re.DOTALL)
- self.assertRegex(out, html_regex)
+ six.assertRegex(self, out, html_regex)
if __name__ == "__main__":
unittest.main()
