Hello community,
here is the log from the commit of package python-pycurl for openSUSE:Factory
checked in at 2020-12-16 11:00:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pycurl (Old)
and /work/SRC/openSUSE:Factory/.python-pycurl.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pycurl"
Wed Dec 16 11:00:16 2020 rev:35 rq:855998 version:7.43.0.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pycurl/python-pycurl.changes
2020-06-23 21:01:57.625333437 +0200
+++ /work/SRC/openSUSE:Factory/.python-pycurl.new.2328/python-pycurl.changes
2020-12-16 11:00:19.403560221 +0100
@@ -1,0 +2,11 @@
+Tue Dec 15 12:56:23 UTC 2020 - Matej Cepl <mc...@suse.com>
+
+- Add make-leap15-compat.patch to pass tests on Leap 15.2
+
+-------------------------------------------------------------------
+Mon Dec 14 14:15:29 UTC 2020 - Matej Cepl <mc...@suse.com>
+
+- Add remove_nose.patch to remove dependency on nose
+ (gh#pycurl/pycurl#655).
+
+-------------------------------------------------------------------
New:
----
make-leap15-compat.patch
remove_nose.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pycurl.spec ++++++
--- /var/tmp/diff_new_pack.2Tku1o/_old 2020-12-16 11:00:20.423561223 +0100
+++ /var/tmp/diff_new_pack.2Tku1o/_new 2020-12-16 11:00:20.427561227 +0100
@@ -40,6 +40,12 @@
# PATCH-FIX-OPENSUSE python-pycurl-7.43.0-tls-backend.patch -- do not run
runtime tests to compare linked libs
Patch2: python-pycurl-7.43.0-tls-backend.patch
Patch3: disable_randomly_failing_tests.patch
+# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#pycurl/pycurl#655 mc...@suse.com
+# remove dependency on nose
+Patch4: remove_nose.patch
+# PATCH-FIX-OPENSUSE make-leap15-compat.patch mc...@suse.com
+# Make tests passing with Leap 15.2
+Patch5: make-leap15-compat.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -50,7 +56,7 @@
%if %{with test}
BuildRequires: %{python_module bottle}
BuildRequires: %{python_module flaky}
-BuildRequires: %{python_module nose}
+BuildRequires: %{python_module pytest}
%endif
%ifpython2
Provides: %{oldpython}-curl = %{version}
@@ -103,19 +109,18 @@
make %{?_smp_mflags}
popd
# exclude certain tests
-test_flags='!online,!occasionally_failing'
+test_flags='online or occasionally_failing'
if ! pkg-config --variable=supported_features libcurl|grep -qw HTTP2; then
- test_flags="$test_flags,\!http2"
+ test_flags="$test_flags or http2"
fi
if ! pkg-config --variable=supported_protocols libcurl|grep -qw SCP; then
- test_flags="$test_flags,\!ssh"
+ test_flags="$test_flags or ssh"
fi
# test_getinfo are failing with new bottle
-%{python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} \
-nosetests-%{$python_bin_suffix} -v --with-flaky -a "$test_flags" -e
'test_getinfo'
-}
+%pytest_arch -s -k "not ($test_flags or test_getinfo)"
rm -rf %{buildroot}%{_prefix}/lib/debug %{buildroot}%{_libdir}/python*
-%endif # test
+# test
+%endif
%if ! %{with test}
%files %{python_files}
++++++ make-leap15-compat.patch ++++++
---
tests/curl_object_test.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/tests/curl_object_test.py
+++ b/tests/curl_object_test.py
@@ -143,11 +143,11 @@ class CurlObjectTest(unittest.TestCase):
# change does not affect objects created later
obj3 = cls()
self.assertEqual(old_value, getattr(obj3, name))
-
+
def test_bogus_attribute_access(self):
- with pytest.raises(AttributeError, match='trying to obtain.*'):
- self.curl.foo
-
+ with pytest.raises(AttributeError):
+ self.curl.foo
+
def test_bogus_attribute_delete(self):
with pytest.raises(AttributeError, match='trying to delete.*'):
del self.curl.foo
++++++ remove_nose.patch ++++++
++++ 933 lines (skipped)
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
