From 41ef5421c3800688c101b651f46fa71c876afcd517b0630027dcfdfb3ab68b40 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Tue, 3 Mar 2020 19:46:38 +0000 Subject: [PATCH 1/2] 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 \ From f7e7bc6ed08b9596bbbae78728a2846ff478979ab65d618417cbd98954b168fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 6 Mar 2020 07:37:32 +0000 Subject: [PATCH 2/2] Accepting request 781930 from home:aboe76:branches:devel:languages:python - update to 2.8.1 for the changelog see: https://libcloud.readthedocs.io/en/stable/changelog.html#changes-in-apache-libcloud-v2-8-1 OBS-URL: https://build.opensuse.org/request/show/781930 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-apache-libcloud?expand=0&rev=97 --- apache-libcloud-2.8.0.tar.gz | 3 --- apache-libcloud-2.8.1.tar.gz | 3 +++ ec2_create_node.patch | 6 +++--- gce_image_projects.patch | 6 +++--- python-apache-libcloud.changes | 7 +++++++ python-apache-libcloud.spec | 2 +- 6 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 apache-libcloud-2.8.0.tar.gz create mode 100644 apache-libcloud-2.8.1.tar.gz diff --git a/apache-libcloud-2.8.0.tar.gz b/apache-libcloud-2.8.0.tar.gz deleted file mode 100644 index a93802d..0000000 --- a/apache-libcloud-2.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3387a10d2f4df8cf9edb3159e07bcd8087b5e06f85de94b661ffea61d827a5c4 -size 2027189 diff --git a/apache-libcloud-2.8.1.tar.gz b/apache-libcloud-2.8.1.tar.gz new file mode 100644 index 0000000..c80a98b --- /dev/null +++ b/apache-libcloud-2.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c76d6c28c724aed46067d540facc512438362d1c8d02a7e5202864f8ed756e20 +size 2076497 diff --git a/ec2_create_node.patch b/ec2_create_node.patch index cce230f..37919ed 100644 --- a/ec2_create_node.patch +++ b/ec2_create_node.patch @@ -1,7 +1,7 @@ -Index: apache-libcloud-2.8.0/libcloud/compute/drivers/ec2.py +Index: apache-libcloud-2.8.1/libcloud/compute/drivers/ec2.py =================================================================== ---- apache-libcloud-2.8.0.orig/libcloud/compute/drivers/ec2.py -+++ apache-libcloud-2.8.0/libcloud/compute/drivers/ec2.py +--- apache-libcloud-2.8.1.orig/libcloud/compute/drivers/ec2.py ++++ apache-libcloud-2.8.1/libcloud/compute/drivers/ec2.py @@ -1892,12 +1892,18 @@ class BaseEC2NodeDriver(NodeDriver): for system shutdown. :type ex_terminate_on_shutdown: ``bool`` diff --git a/gce_image_projects.patch b/gce_image_projects.patch index 6c8bf78..6e1ec82 100644 --- a/gce_image_projects.patch +++ b/gce_image_projects.patch @@ -1,7 +1,7 @@ -Index: apache-libcloud-2.8.0/libcloud/compute/drivers/gce.py +Index: apache-libcloud-2.8.1/libcloud/compute/drivers/gce.py =================================================================== ---- apache-libcloud-2.8.0.orig/libcloud/compute/drivers/gce.py -+++ apache-libcloud-2.8.0/libcloud/compute/drivers/gce.py +--- apache-libcloud-2.8.1.orig/libcloud/compute/drivers/gce.py ++++ apache-libcloud-2.8.1/libcloud/compute/drivers/gce.py @@ -1803,20 +1803,35 @@ class GCENodeDriver(NodeDriver): "rhel-8", ], diff --git a/python-apache-libcloud.changes b/python-apache-libcloud.changes index 433696b..5594890 100644 --- a/python-apache-libcloud.changes +++ b/python-apache-libcloud.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 5 18:45:41 UTC 2020 - Niels Abspoel + +- update to 2.8.1 + for the changelog see: + https://libcloud.readthedocs.io/en/stable/changelog.html#changes-in-apache-libcloud-v2-8-1 + ------------------------------------------------------------------- Fri Feb 21 19:48:04 UTC 2020 - Sean Marlow diff --git a/python-apache-libcloud.spec b/python-apache-libcloud.spec index 6d65582..0843b05 100644 --- a/python-apache-libcloud.spec +++ b/python-apache-libcloud.spec @@ -21,7 +21,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-apache-libcloud -Version: 2.8.0 +Version: 2.8.1 Release: 0 Summary: Abstraction over multiple cloud provider APIs License: Apache-2.0