forked from pool/python-apache-libcloud
Accepting request 1003312 from devel:languages:python
- Removed patch skip-some-tests-for-older-paramiko-versions.patch, mock.patch
Both the patches are already applied
- update to 3.6.0
Compute
* [OpenStack] Fix error attaching/detaching a Floating IP to an OpenStack node when
ex_force_microversion is set with 2.44 or newer microversion.
* (GITHUB-1674) [Miguel Caballer - @micafer]
* [OpenStack] Error in volume api calls if microversion is set in OpenStack. In previous
version if ex_force_microversion is set, it is assumed to set it to the compute service.
Now if only a version is set 2.67, compute service is assumed but it can be also set the service name volume 3.21.
* (GITHUB-1675) [Miguel Caballer - @micafer]
* [OpenStack] Fix error creating and getting node in OpenStack when ex_force_microversion is set to a version newer than 2.47.
* (GITHUB-1672) [Miguel Caballer - @micafer]
* [EC2] Add support for new af-south-1 region. (GITHUB-1688) [Balazs Baranyi - @balazsbaranyi]
* [SSH] Update deploy node and ParamikoSSHClient related code so it works with paramiko >= 2.9.0
and older OpenSSH server versions which doesn't support SHA-2 variants of RSA key verification algorithm.
* paramiko v2.9.0 introduced a change to prefer SHA-2 variants of RSA key verification algorithm.
With this version paramiko would fail to connect to older OpenSSH servers which don't support this
algorithm (e.g. default setup on Ubuntu 14.04) and throw authentication error.
* The code has been updated to be backward compatible. It first tries to connect to the server
using default preferred algorithm values and in case this fails, it will fall back to the old approach
with SHA-2 variants disabled.
* This functionality can be disabled by setting LIBCLOUD_PARAMIKO_SHA2_BACKWARD_COMPATIBILITY``environment
variable to ``false.
* For security reasons (to prevent possible downgrade attacks and similar) you are encouraged to do that
in case you know you won't be connecting to any old OpenSSH servers. [Tomaz Muraus]
Storage
* [Google Storage] Fix public objects retrieval. In some scenarios, Google doesn't return etag header in the
response (e.g. for gzip content encoding). The code has been updated to take this into account and not
throw if the header is not present.
* (GITHUB-1682, GITHUB-1683) [Veith Röthlingshöfer - @RunOrVeith]
* [Azure Blobs] Add support for authenticating with Azure AD by passing auth_type="azureAd" argument to the driver constructor.
* (GITHUB-1663) [Brooke White - @brookewhite9]
DNS
* [GoDaddy] Fix list_zones() method so it doesn't throw if an item is missing expires attribute. (GITHUB-1681) [Dave Grenier - @livegrenier]
Container
* [Kubernetes] Various improvements in the driver - implement list methods for nodes, services, deployments,
node/pod metrics, add more fields to Pods and Containers, rename clusters to namespaces, add type annotations.
* (GITHUB-1667) [Dimitris Galanis - @dimgal1]
Other
* Test code has been updated to utilize stdlib unittest.mock module instead of 3rd party PyPi mock package.
* (GITHUG-1684) Reported by @pgajdos.
OBS-URL: https://build.opensuse.org/request/show/1003312
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-apache-libcloud?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
4a6c2a825e
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8f4d98fdf57321a77dc3c6a4f62710dcf230e51c810f4664fd343fdffac14cad
|
||||
size 1859270
|
||||
@ -1,19 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKlBAABCgCPFiEEmXgo3GL3Wc6hidZeLAdUss4GkvMFAmI8iE9fFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk5
|
||||
NzgyOERDNjJGNzU5Q0VBMTg5RDY1RTJDMDc1NEIyQ0UwNjkyRjMRHHRvbWF6QGFw
|
||||
YWNoZS5vcmcACgkQLAdUss4GkvONDA//a7BXU1NSlsp3Ia/CLojXUaAJcq2KsEDQ
|
||||
uPi8jto+/Nq2iV2eYvIjyE7gYJOPX23nf+MPy5kOixA/2gHZBqJGATXWlCMPU+YJ
|
||||
w8WcKEOx4rXAsZECyYEQjP/dDFilpi+jh1YMxpNZ4/3pN44eMC/jup6xJdRhBeDc
|
||||
6gYaiLd59OJo1kYAUzO29WcewL0Zr+QVItzy8sFh7eChnhK31kaOwLOfUlcb1JMq
|
||||
OboVUkjnlK4ew37AkuzICTnFZ7a2SEjStCBmRzu2Zh26rtgE+SAQBgalbSSl/87O
|
||||
5CiIoWPKudlW97s0bxKaT51KfbtGTQ0q6cNMvq9rX6sEVoYeiCoNW/VYXS6s3P3v
|
||||
sr81wZxeTFJoBrSsFYQGiz+zXcMNxjrZcNtH1cun+Y/ld8I8t9c1NZ6A0TgZnGmN
|
||||
5hywAGzzcYOckkLZX09cGyDicQcbmtdR3RzxT8qCz6XZf1U6egTM369gX/g1XMsY
|
||||
9JUDQa44devXC/yifRqZAaP7eWP7vY1cXDliLh8PpfTLwUkiStJFpLAgXqiswOvm
|
||||
C+Xw9A7YUVnd/pQGtDaE6qfExlCPBlKi1H7FyMX2GnNKW0SgYS2xcysAXfCSIv/6
|
||||
I8adC2OfOlkarV7eRDPFhm4cZSIG2pu3bbRaXePF8N+mQ82T/TdPuz3dTLIwGPej
|
||||
vU5lrGycUR4=
|
||||
=2iK8
|
||||
-----END PGP SIGNATURE-----
|
||||
3
apache-libcloud-3.6.0.tar.bz2
Normal file
3
apache-libcloud-3.6.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:111cb947fb9df1abaaf598c5ca640b007efbacaf84cd1e2267dab9b52954a393
|
||||
size 1873596
|
||||
19
apache-libcloud-3.6.0.tar.bz2.asc
Normal file
19
apache-libcloud-3.6.0.tar.bz2.asc
Normal file
@ -0,0 +1,19 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKlBAABCgCPFiEEmXgo3GL3Wc6hidZeLAdUss4GkvMFAmKKiARfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk5
|
||||
NzgyOERDNjJGNzU5Q0VBMTg5RDY1RTJDMDc1NEIyQ0UwNjkyRjMRHHRvbWF6QGFw
|
||||
YWNoZS5vcmcACgkQLAdUss4GkvNd1RAAnESx1WDqOFM6TPZJM4Oxnb/YdsnD5sFy
|
||||
tbIzsMPpShdMpseCmwUF5CdW/gPrEWRXMgTrKx8QjEX43tqET32rCiXaVkHKNCK3
|
||||
5STWeo3C7Wu3zZcD7S3Qu7bfNeYNtll8+M/w8rqcxCpYy3F4/RQpvY6U86rEYObM
|
||||
Y2TBjzDq0refy3DDe8Sx64GueBk92aQ8WMNbP/ntysi1YoJDlMO3b2qhCOKQzr4Z
|
||||
YOunHxSnH0wWWzZ2aTsX02q1wb4uNvKRh1YeFfb2kE1o1UyZkneFcpY572Shojdf
|
||||
5kR4ANueJr7c/C4v4KMJjK/wCAm66/I3i+Z3JLT3JAUTG1ynFG9HTuEJwPI0ywFQ
|
||||
1UnoPAdjulzmR2ocGO0OEJMAujo7ofU8C9XM/1k0DczkSlGO+G5w2FOOmA74F1GV
|
||||
AdvUalXcIQ8lUqd+KvS25yON+XQwIKXVQDVnVMqlG6+R9UQQC/6HpZmqdGT2AxKj
|
||||
2+Gxxs4I4kscIER8llpgVyoY7Q+mRg35BshfM+RpBj3SorOGisJWloFKPNPjXE9Z
|
||||
/NK2vW3wkx24b8NzL9JscOK89FWnMHKjBAOCqAWVMin6b6t4ifWOqYsOV/ng4Sou
|
||||
4bTGGkBQuy7YDKHFLFsmuETsq52VS5vR+bEARQ05+svgL399TwH7oWHzy/UReqSv
|
||||
uwdd90RK2m0=
|
||||
=dnRQ
|
||||
-----END PGP SIGNATURE-----
|
||||
490
mock.patch
490
mock.patch
@ -1,490 +0,0 @@
|
||||
From e62bb28cdbd685203d44a9a4028f311ea155476c Mon Sep 17 00:00:00 2001
|
||||
From: Tomaz Muraus <tomaz@tomaz.me>
|
||||
Date: Tue, 10 May 2022 23:44:18 +0200
|
||||
Subject: [PATCH] Use unittest.mock library from stdlib instead of using 3rd
|
||||
party mock dependency.
|
||||
|
||||
Reported by @pgajdos, closes #1684.
|
||||
---
|
||||
libcloud/test/common/test_aws.py | 2 +-
|
||||
libcloud/test/common/test_base.py | 2 +-
|
||||
libcloud/test/common/test_base_driver.py | 2 +-
|
||||
libcloud/test/common/test_google.py | 2 +-
|
||||
libcloud/test/common/test_nfsn.py | 2 +-
|
||||
libcloud/test/common/test_openstack.py | 2 +-
|
||||
libcloud/test/common/test_openstack_identity.py | 2 +-
|
||||
libcloud/test/common/test_retry_limit.py | 2 +-
|
||||
libcloud/test/common/test_upcloud.py | 2 +-
|
||||
libcloud/test/compute/test_azure_arm.py | 2 +-
|
||||
libcloud/test/compute/test_deployment.py | 2 +-
|
||||
libcloud/test/compute/test_gce.py | 2 +-
|
||||
libcloud/test/compute/test_gig_g8.py | 2 +-
|
||||
libcloud/test/compute/test_libvirt_driver.py | 2 +-
|
||||
libcloud/test/compute/test_openstack.py | 4 ++--
|
||||
libcloud/test/compute/test_ovh.py | 2 +-
|
||||
libcloud/test/compute/test_ssh_client.py | 2 +-
|
||||
libcloud/test/compute/test_vcloud.py | 2 +-
|
||||
libcloud/test/dns/test_base.py | 2 +-
|
||||
libcloud/test/dns/test_durabledns.py | 2 +-
|
||||
libcloud/test/dns/test_zonomi.py | 2 +-
|
||||
libcloud/test/storage/test_backblaze_b2.py | 2 +-
|
||||
libcloud/test/storage/test_base.py | 4 ++--
|
||||
libcloud/test/storage/test_cloudfiles.py | 6 +++---
|
||||
libcloud/test/storage/test_google_storage.py | 6 +++---
|
||||
libcloud/test/storage/test_oss.py | 5 +----
|
||||
libcloud/test/storage/test_s3.py | 6 +++---
|
||||
libcloud/test/test_connection.py | 2 +-
|
||||
libcloud/test/test_init.py | 2 +-
|
||||
libcloud/test/test_logging_connection.py | 2 +-
|
||||
requirements-tests.txt | 1 -
|
||||
setup.py | 1 -
|
||||
35 files changed, 50 insertions(+), 47 deletions(-)
|
||||
|
||||
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_aws.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_aws.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_aws.py
|
||||
@@ -17,7 +17,7 @@ import sys
|
||||
import unittest
|
||||
from datetime import datetime
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
|
||||
from libcloud.common.aws import AWSRequestSignerAlgorithmV4
|
||||
from libcloud.common.aws import SignedAWSConnection
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_base.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_base.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_base.py
|
||||
@@ -16,7 +16,7 @@
|
||||
import unittest
|
||||
import sys
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
|
||||
from libcloud.common.base import LazyObject, Response
|
||||
from libcloud.common.exceptions import BaseHTTPError, RateLimitReachedError
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_base_driver.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_base_driver.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_base_driver.py
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
import sys
|
||||
|
||||
-from mock import Mock
|
||||
+from unittest.mock import Mock
|
||||
|
||||
from libcloud.common.base import BaseDriver
|
||||
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_google.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_google.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_google.py
|
||||
@@ -16,7 +16,7 @@
|
||||
Tests for Google Connection classes.
|
||||
"""
|
||||
import datetime
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_nfsn.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_nfsn.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_nfsn.py
|
||||
@@ -17,7 +17,7 @@ import string
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
-from mock import Mock, patch
|
||||
+from unittest.mock import Mock, patch
|
||||
|
||||
from libcloud.common.nfsn import NFSNConnection
|
||||
from libcloud.test import LibcloudTestCase, MockHttp
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_openstack.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_openstack.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_openstack.py
|
||||
@@ -17,7 +17,7 @@ import sys
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
-from mock import Mock
|
||||
+from unittest.mock import Mock
|
||||
from libcloud.common.base import LibcloudConnection
|
||||
from libcloud.common.openstack import OpenStackBaseConnection
|
||||
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_openstack_identity.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_openstack_identity.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_openstack_identity.py
|
||||
@@ -21,7 +21,7 @@ try:
|
||||
except ImportError:
|
||||
import json
|
||||
|
||||
-from mock import Mock
|
||||
+from unittest.mock import Mock
|
||||
|
||||
from libcloud.utils.py3 import httplib
|
||||
from libcloud.utils.py3 import assertRaisesRegex
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_retry_limit.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_retry_limit.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_retry_limit.py
|
||||
@@ -16,7 +16,7 @@
|
||||
import socket
|
||||
import ssl
|
||||
|
||||
-from mock import Mock, patch, MagicMock
|
||||
+from unittest.mock import Mock, patch, MagicMock
|
||||
|
||||
from libcloud.utils.retry import TRANSIENT_SSL_ERROR
|
||||
from libcloud.common.base import Connection
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/common/test_upcloud.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/common/test_upcloud.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/common/test_upcloud.py
|
||||
@@ -15,7 +15,7 @@
|
||||
import sys
|
||||
import json
|
||||
|
||||
-from mock import Mock, call
|
||||
+from unittest.mock import Mock, call
|
||||
|
||||
from libcloud.common.upcloud import (
|
||||
UpcloudCreateNodeRequestBody,
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_azure_arm.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_azure_arm.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_azure_arm.py
|
||||
@@ -18,7 +18,7 @@ import sys
|
||||
import functools
|
||||
from datetime import datetime
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
|
||||
from libcloud.common.exceptions import BaseHTTPError
|
||||
from libcloud.common.types import LibcloudError
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_deployment.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_deployment.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_deployment.py
|
||||
@@ -39,7 +39,7 @@ from libcloud.compute.drivers.rackspace
|
||||
|
||||
from libcloud.test import MockHttp, XML_HEADERS
|
||||
from libcloud.test.file_fixtures import ComputeFileFixtures
|
||||
-from mock import Mock, patch
|
||||
+from unittest.mock import Mock, patch
|
||||
|
||||
from libcloud.test.secrets import RACKSPACE_PARAMS
|
||||
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_gce.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_gce.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_gce.py
|
||||
@@ -17,7 +17,7 @@ Tests for Google Compute Engine Driver
|
||||
"""
|
||||
|
||||
import datetime
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_gig_g8.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_gig_g8.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_gig_g8.py
|
||||
@@ -18,7 +18,7 @@ import base64
|
||||
import json
|
||||
import time
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
|
||||
from libcloud.utils.py3 import httplib
|
||||
from libcloud.test import MockHttp
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_libvirt_driver.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_libvirt_driver.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_libvirt_driver.py
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
import sys
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
|
||||
from libcloud.compute.drivers.libvirt_driver import LibvirtNodeDriver
|
||||
from libcloud.compute.drivers.libvirt_driver import have_libvirt
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_openstack.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_openstack.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_openstack.py
|
||||
@@ -19,7 +19,7 @@ import os
|
||||
import sys
|
||||
import unittest
|
||||
import datetime
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
import pytest
|
||||
|
||||
from libcloud.utils.iso8601 import UTC
|
||||
@@ -29,7 +29,7 @@ try:
|
||||
except ImportError:
|
||||
import json
|
||||
|
||||
-from mock import Mock, patch
|
||||
+from unittest.mock import Mock, patch
|
||||
import requests_mock
|
||||
|
||||
from libcloud.utils.py3 import httplib
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_ovh.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_ovh.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_ovh.py
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License.
|
||||
import sys
|
||||
import unittest
|
||||
-from mock import patch
|
||||
+from unittest.mock import patch
|
||||
|
||||
from libcloud.utils.py3 import httplib
|
||||
from libcloud.common.exceptions import BaseHTTPError
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_ssh_client.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_ssh_client.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_ssh_client.py
|
||||
@@ -32,7 +32,7 @@ from libcloud.utils.py3 import StringIO
|
||||
from libcloud.utils.py3 import u
|
||||
from libcloud.utils.py3 import assertRaisesRegex
|
||||
|
||||
-from mock import patch, Mock, MagicMock, call
|
||||
+from unittest.mock import patch, Mock, MagicMock, call
|
||||
|
||||
if not have_paramiko:
|
||||
ParamikoSSHClient = None # NOQA
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_vcloud.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_vcloud.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_vcloud.py
|
||||
@@ -45,7 +45,7 @@ from libcloud.compute.types import NodeS
|
||||
from libcloud.test import MockHttp
|
||||
from libcloud.test.compute import TestCaseMixin
|
||||
from libcloud.test.file_fixtures import ComputeFileFixtures
|
||||
-from mock import patch, mock_open
|
||||
+from unittest.mock import patch, mock_open
|
||||
|
||||
from libcloud.test.secrets import VCLOUD_PARAMS
|
||||
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/dns/test_base.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/dns/test_base.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/dns/test_base.py
|
||||
@@ -18,7 +18,7 @@ import sys
|
||||
import tempfile
|
||||
import datetime
|
||||
|
||||
-from mock import Mock
|
||||
+from unittest.mock import Mock
|
||||
|
||||
from libcloud import __version__
|
||||
from libcloud.test import unittest
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/dns/test_durabledns.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/dns/test_durabledns.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/dns/test_durabledns.py
|
||||
@@ -15,7 +15,7 @@
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
-from mock import MagicMock
|
||||
+from unittest.mock import MagicMock
|
||||
|
||||
from libcloud.dns.base import Record, Zone
|
||||
from libcloud.dns.types import RecordType
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/dns/test_zonomi.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/dns/test_zonomi.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/dns/test_zonomi.py
|
||||
@@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
import sys
|
||||
import unittest
|
||||
-from mock import MagicMock
|
||||
+from unittest.mock import MagicMock
|
||||
|
||||
|
||||
from libcloud.test import MockHttp
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/storage/test_backblaze_b2.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/storage/test_backblaze_b2.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/storage/test_backblaze_b2.py
|
||||
@@ -17,7 +17,7 @@ import os
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
import json
|
||||
|
||||
from libcloud.storage.drivers.backblaze_b2 import BackblazeB2StorageDriver
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/storage/test_base.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/storage/test_base.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/storage/test_base.py
|
||||
@@ -18,8 +18,8 @@ import hashlib
|
||||
import sys
|
||||
from io import BytesIO
|
||||
|
||||
-import mock
|
||||
-from mock import Mock
|
||||
+from unittest import mock
|
||||
+from unittest.mock import Mock
|
||||
|
||||
from libcloud.common.exceptions import RateLimitReachedError
|
||||
from libcloud.storage.base import DEFAULT_CONTENT_TYPE
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/storage/test_cloudfiles.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/storage/test_cloudfiles.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/storage/test_cloudfiles.py
|
||||
@@ -24,9 +24,9 @@ from io import BytesIO
|
||||
import hashlib
|
||||
from hashlib import sha1
|
||||
|
||||
-import mock
|
||||
-from mock import Mock
|
||||
-from mock import PropertyMock
|
||||
+from unittest import mock
|
||||
+from unittest.mock import Mock
|
||||
+from unittest.mock import PropertyMock
|
||||
|
||||
import libcloud.utils.files
|
||||
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/storage/test_google_storage.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/storage/test_google_storage.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/storage/test_google_storage.py
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
import copy
|
||||
import json
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
import re
|
||||
import sys
|
||||
import unittest
|
||||
@@ -24,8 +24,8 @@ from io import BytesIO
|
||||
|
||||
import email.utils
|
||||
import pytest
|
||||
-from mock import Mock
|
||||
-from mock import PropertyMock
|
||||
+from unittest.mock import Mock
|
||||
+from unittest.mock import PropertyMock
|
||||
|
||||
from libcloud.common.google import GoogleAuthType
|
||||
from libcloud.common.types import InvalidCredsError
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/storage/test_oss.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/storage/test_oss.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/storage/test_oss.py
|
||||
@@ -19,10 +19,7 @@ import os
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
-try:
|
||||
- import mock
|
||||
-except ImportError:
|
||||
- from unittest import mock
|
||||
+from unittest import mock
|
||||
|
||||
from libcloud.utils.py3 import b
|
||||
from libcloud.utils.py3 import httplib
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/storage/test_s3.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/storage/test_s3.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/storage/test_s3.py
|
||||
@@ -21,9 +21,9 @@ import sys
|
||||
from io import BytesIO
|
||||
from hashlib import sha1
|
||||
|
||||
-import mock
|
||||
-from mock import Mock
|
||||
-from mock import PropertyMock
|
||||
+from unittest import mock
|
||||
+from unittest.mock import Mock
|
||||
+from unittest.mock import PropertyMock
|
||||
import libcloud.utils.files # NOQA: F401
|
||||
|
||||
from libcloud.utils.py3 import ET
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/test_connection.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/test_connection.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/test_connection.py
|
||||
@@ -21,7 +21,7 @@ import sys
|
||||
from unittest import mock
|
||||
|
||||
import requests_mock
|
||||
-from mock import Mock, patch
|
||||
+from unittest.mock import Mock, patch
|
||||
from requests.exceptions import ConnectTimeout
|
||||
|
||||
import libcloud.common.base
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/test_init.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/test_init.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/test_init.py
|
||||
@@ -26,7 +26,7 @@ try:
|
||||
except ImportError:
|
||||
have_paramiko = False
|
||||
|
||||
-from mock import patch
|
||||
+from unittest.mock import patch
|
||||
|
||||
import libcloud
|
||||
from libcloud import _init_once
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/test_logging_connection.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/test_logging_connection.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/test_logging_connection.py
|
||||
@@ -19,7 +19,7 @@ from io import StringIO
|
||||
import zlib
|
||||
import requests_mock
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
|
||||
import libcloud
|
||||
from libcloud.test import unittest
|
||||
Index: apache-libcloud-3.5.1/requirements-tests.txt
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/requirements-tests.txt
|
||||
+++ apache-libcloud-3.5.1/requirements-tests.txt
|
||||
@@ -2,7 +2,6 @@ pep8==1.7.1
|
||||
flake8==4.0.1
|
||||
astroid==2.8.4
|
||||
pylint==2.11.1
|
||||
-mock==4.0.3
|
||||
codecov==2.1.12
|
||||
coverage==4.5.4
|
||||
requests>=2.27.1
|
||||
Index: apache-libcloud-3.5.1/setup.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/setup.py
|
||||
+++ apache-libcloud-3.5.1/setup.py
|
||||
@@ -208,7 +208,6 @@ if setuptools_version < (36, 2):
|
||||
raise RuntimeError(msg)
|
||||
|
||||
TEST_REQUIREMENTS = [
|
||||
- "mock",
|
||||
"requests_mock",
|
||||
"pytest",
|
||||
"pytest-runner",
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 7 03:23:41 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
|
||||
|
||||
- Removed patch skip-some-tests-for-older-paramiko-versions.patch, mock.patch
|
||||
Both the patches are already applied
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 7 02:58:46 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
|
||||
|
||||
- update to 3.6.0
|
||||
Compute
|
||||
* [OpenStack] Fix error attaching/detaching a Floating IP to an OpenStack node when
|
||||
ex_force_microversion is set with 2.44 or newer microversion.
|
||||
* (GITHUB-1674) [Miguel Caballer - @micafer]
|
||||
* [OpenStack] Error in volume api calls if microversion is set in OpenStack. In previous
|
||||
version if ex_force_microversion is set, it is assumed to set it to the compute service.
|
||||
Now if only a version is set 2.67, compute service is assumed but it can be also set the service name volume 3.21.
|
||||
* (GITHUB-1675) [Miguel Caballer - @micafer]
|
||||
* [OpenStack] Fix error creating and getting node in OpenStack when ex_force_microversion is set to a version newer than 2.47.
|
||||
* (GITHUB-1672) [Miguel Caballer - @micafer]
|
||||
* [EC2] Add support for new af-south-1 region. (GITHUB-1688) [Balazs Baranyi - @balazsbaranyi]
|
||||
* [SSH] Update deploy node and ParamikoSSHClient related code so it works with paramiko >= 2.9.0
|
||||
and older OpenSSH server versions which doesn't support SHA-2 variants of RSA key verification algorithm.
|
||||
* paramiko v2.9.0 introduced a change to prefer SHA-2 variants of RSA key verification algorithm.
|
||||
With this version paramiko would fail to connect to older OpenSSH servers which don't support this
|
||||
algorithm (e.g. default setup on Ubuntu 14.04) and throw authentication error.
|
||||
* The code has been updated to be backward compatible. It first tries to connect to the server
|
||||
using default preferred algorithm values and in case this fails, it will fall back to the old approach
|
||||
with SHA-2 variants disabled.
|
||||
* This functionality can be disabled by setting LIBCLOUD_PARAMIKO_SHA2_BACKWARD_COMPATIBILITY``environment
|
||||
variable to ``false.
|
||||
* For security reasons (to prevent possible downgrade attacks and similar) you are encouraged to do that
|
||||
in case you know you won't be connecting to any old OpenSSH servers. [Tomaz Muraus]
|
||||
Storage
|
||||
* [Google Storage] Fix public objects retrieval. In some scenarios, Google doesn't return etag header in the
|
||||
response (e.g. for gzip content encoding). The code has been updated to take this into account and not
|
||||
throw if the header is not present.
|
||||
* (GITHUB-1682, GITHUB-1683) [Veith Röthlingshöfer - @RunOrVeith]
|
||||
* [Azure Blobs] Add support for authenticating with Azure AD by passing auth_type="azureAd" argument to the driver constructor.
|
||||
* (GITHUB-1663) [Brooke White - @brookewhite9]
|
||||
DNS
|
||||
* [GoDaddy] Fix list_zones() method so it doesn't throw if an item is missing expires attribute. (GITHUB-1681) [Dave Grenier - @livegrenier]
|
||||
Container
|
||||
* [Kubernetes] Various improvements in the driver - implement list methods for nodes, services, deployments,
|
||||
node/pod metrics, add more fields to Pods and Containers, rename clusters to namespaces, add type annotations.
|
||||
* (GITHUB-1667) [Dimitris Galanis - @dimgal1]
|
||||
Other
|
||||
* Test code has been updated to utilize stdlib unittest.mock module instead of 3rd party PyPi mock package.
|
||||
* (GITHUG-1684) Reported by @pgajdos.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 13 11:21:00 UTC 2022 - Markéta Machová <mmachova@suse.com>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
%define skip_python2 1
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
Name: python-apache-libcloud
|
||||
Version: 3.5.1
|
||||
Version: 3.6.0
|
||||
Release: 0
|
||||
Summary: Abstraction over multiple cloud provider APIs
|
||||
License: Apache-2.0
|
||||
@ -32,9 +32,6 @@ Source1: https://downloads.apache.org/libcloud/apache-libcloud-%{version}
|
||||
Source2: https://www.apache.org/dist/libcloud/KEYS#/%{name}.keyring
|
||||
Patch1: gce_image_projects.patch
|
||||
Patch2: ec2_create_node.patch
|
||||
Patch3: skip-some-tests-for-older-paramiko-versions.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/Kami/libcloud/commit/e62bb28cdbd685203d44a9a4028f311ea155476c Use unittest.mock library from stdlib instead of using 3rd party mock dependency.
|
||||
Patch4: mock.patch
|
||||
BuildRequires: %{python_module libvirt-python}
|
||||
BuildRequires: %{python_module lockfile}
|
||||
BuildRequires: %{python_module lxml}
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
Index: apache-libcloud-3.5.1/libcloud/test/compute/test_ssh_client.py
|
||||
===================================================================
|
||||
--- apache-libcloud-3.5.1.orig/libcloud/test/compute/test_ssh_client.py
|
||||
+++ apache-libcloud-3.5.1/libcloud/test/compute/test_ssh_client.py
|
||||
@@ -193,6 +193,8 @@ class ParamikoSSHClientTests(LibcloudTes
|
||||
)
|
||||
|
||||
@patch("paramiko.SSHClient", Mock)
|
||||
+ @unittest.skipIf(paramiko_version < '2.7.0',
|
||||
+ 'Old versions of paramiko do not support OPENSSH key format')
|
||||
def test_password_protected_key_no_password_provided_1(self):
|
||||
path = os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
@@ -238,6 +240,8 @@ class ParamikoSSHClientTests(LibcloudTes
|
||||
)
|
||||
|
||||
@patch("paramiko.SSHClient", Mock)
|
||||
+ @unittest.skipIf(paramiko_version < '2.7.0',
|
||||
+ 'Old versions of paramiko do not support OPENSSH key format')
|
||||
def test_password_protected_key_no_password_provided_2(self):
|
||||
path = os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
@@ -265,6 +269,8 @@ class ParamikoSSHClientTests(LibcloudTes
|
||||
)
|
||||
|
||||
@patch("paramiko.SSHClient", Mock)
|
||||
+ @unittest.skipIf(paramiko_version < '2.7.0',
|
||||
+ 'Old versions of paramiko do not support OPENSSH key format')
|
||||
def test_password_protected_key_valid_password_provided(self):
|
||||
path = os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
Loading…
Reference in New Issue
Block a user