From 41ef5421c3800688c101b651f46fa71c876afcd517b0630027dcfdfb3ab68b40 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Tue, 3 Mar 2020 19:46:38 +0000 Subject: [PATCH] Accepting request 777780 from home:jfehlig:branches:devel:languages:python Upstream libvirt dropped py2 support, so likewise I would like to drop the python2-libvirt-python bindings from Factory. But python-apache-libcloud has a dependency on the bindings. Stop building the py2 components in python-apache-libcloud, thus eliminating the dependency. See the following req for more details https://build.opensuse.org/request/show/770736 OBS-URL: https://build.opensuse.org/request/show/777780 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-apache-libcloud?expand=0&rev=96 --- python-apache-libcloud.changes | 5 +++++ python-apache-libcloud.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/python-apache-libcloud.changes b/python-apache-libcloud.changes index e290ff8..433696b 100644 --- a/python-apache-libcloud.changes +++ b/python-apache-libcloud.changes @@ -4,6 +4,11 @@ Fri Feb 21 19:48:04 UTC 2020 - Sean Marlow - Add gce_image_projects.patch to update the current list of SUSE image projects in GCE. +------------------------------------------------------------------- +Thu Feb 20 18:19:46 UTC 2020 - James Fehlig + +- Stop building for python2 + ------------------------------------------------------------------- Thu Jan 16 17:28:20 UTC 2020 - Marketa Calabkova diff --git a/python-apache-libcloud.spec b/python-apache-libcloud.spec index 16d987a..6d65582 100644 --- a/python-apache-libcloud.spec +++ b/python-apache-libcloud.spec @@ -16,6 +16,9 @@ # +# No longer build for python2 +%define skip_python2 1 + %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-apache-libcloud Version: 2.8.0 @@ -41,7 +44,9 @@ BuildRequires: %{python_module xml} BuildRequires: fdupes BuildRequires: python-backports.ssl_match_hostname BuildRequires: python-rpm-macros +%if ! 0%{?skip_python2} BuildRequires: python2 +%endif Requires: python-lxml Requires: python-requests Requires: python-typing @@ -78,8 +83,10 @@ find %{buildroot} -name '*.pem' -size 0 -delete %check # Skip ShellOutSSHClientTests tests which attempt to ssh to localhost +%if ! 0%{?skip_python2} python2 -m pytest -k 'not ShellOutSSHClientTests and \ - not ElasticContainerDriverTestCase' + not ElasticContainerDriverTestCase' +%endif # Note these two extra py3 failures are undesirable and should be fixed python3 -m pytest -k \ 'not test_consume_stderr_chunk_contains_part_of_multi_byte_utf8_character and \