You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2022/03/05 11:24:39 UTC
[libcloud] branch trunk updated (536582d -> 4265e32)
This is an automated email from the ASF dual-hosted git repository.
tomaz pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git.
from 536582d Merge pull request #1638 from micafer/fix_1636
new 1534ebc Update dev and test dependencies.
new 10a852b We don't support Python < 3.6 anymore so environment markers are now obsolete and can be removed.
new 5a6af18 Newer versions of requests don't vendor urllib3 anymore so import that module directly.
new 0734e95 Update version of paramiko which is used for tests.
new 4265e32 Merge branch 'trunk' of http://gitbox.apache.org/repos/asf/libcloud into trunk
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
libcloud/http.py | 9 ++++++++-
requirements-rtd.txt | 2 +-
requirements-tests.txt | 22 +++++++++++-----------
tox.ini | 7 ++++---
4 files changed, 24 insertions(+), 16 deletions(-)
[libcloud] 03/05: Newer versions of requests don't vendor urllib3 anymore so import that module directly.
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git
commit 5a6af18bb15222551da3c3da1b3a032029b229a7
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Sat Mar 5 12:20:59 2022 +0100
Newer versions of requests don't vendor urllib3 anymore so import that
module directly.
See https://github.com/psf/requests/pull/4067 for context / details.
---
libcloud/http.py | 9 ++++++++-
tox.ini | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/libcloud/http.py b/libcloud/http.py
index c01b199..58dd612 100644
--- a/libcloud/http.py
+++ b/libcloud/http.py
@@ -21,8 +21,15 @@ verification, depending on libcloud.security settings.
import os
import warnings
import requests
+
from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.poolmanager import PoolManager
+
+try:
+ # requests no longer vendors urllib3 in newer versions
+ # https://github.com/python/typeshed/issues/6893#issuecomment-1012511758
+ from urllib3.poolmanager import PoolManager
+except ImportError:
+ from requests.packages.urllib3.poolmanager import PoolManager # type: ignore
import libcloud.security
from libcloud.utils.py3 import urlparse, PY3
diff --git a/tox.ini b/tox.ini
index 7a3b92b..ef0a782 100644
--- a/tox.ini
+++ b/tox.ini
@@ -352,6 +352,7 @@ deps =
types-simplejson
types-certifi
types-requests
+ types-urllib3
commands =
mypy --no-incremental libcloud/common/
mypy --no-incremental libcloud/compute/
[libcloud] 01/05: Update dev and test dependencies.
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git
commit 1534ebc04297d889864bef0b14d2e4b6581a1c07
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Sat Mar 5 12:14:42 2022 +0100
Update dev and test dependencies.
---
requirements-rtd.txt | 2 +-
requirements-tests.txt | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/requirements-rtd.txt b/requirements-rtd.txt
index 934651b..a68d3f2 100644
--- a/requirements-rtd.txt
+++ b/requirements-rtd.txt
@@ -1,2 +1,2 @@
# Requirements for ReadTheDocs
-sphinx==4.2.0
+sphinx==4.4.0
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 6166df7..2dd33f1 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -5,12 +5,12 @@ pylint==2.11.1; python_version >= '3.6'
mock==4.0.3; python_version >= '3.6'
codecov==2.1.12
coverage==4.5.4
-requests>=2.26.0; python_version >= '3.6'
+requests>=2.27.1; python_version >= '3.6'
requests_mock==1.9.3
-pytest==6.2.5; python_version >= '3.6'
-pytest-xdist==2.4.0; python_version >= '3.6'
-pytest-benchmark[histogram]==3.2.3; python_version >= '3.6'
-cryptography==35.0.0; python_version >= '3.6'
+pytest==7.0.1; python_version >= '3.6'
+pytest-xdist==2.5.0; python_version >= '3.6'
+pytest-benchmark[histogram]==3.4.1; python_version >= '3.6'
+cryptography==36.0.1; python_version >= '3.6'
# NOTE: Only needed by nttcis loadbalancer driver
pyopenssl==21.0.0; python_version >= '3.6'
more-itertools==8.11.0; python_version >= '3.6'
[libcloud] 02/05: We don't support Python < 3.6 anymore so environment markers are now obsolete and can be removed.
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git
commit 10a852bff88c29c2b3d691d9eb6543a73f7dd20e
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Sat Mar 5 12:16:32 2022 +0100
We don't support Python < 3.6 anymore so environment markers are now
obsolete and can be removed.
---
requirements-tests.txt | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 2dd33f1..08713c6 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -1,16 +1,16 @@
pep8==1.7.1
-flake8==4.0.1; python_version >= '3.6'
-astroid==2.8.4; python_version >= '3.6'
-pylint==2.11.1; python_version >= '3.6'
-mock==4.0.3; python_version >= '3.6'
+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; python_version >= '3.6'
+requests>=2.27.1
requests_mock==1.9.3
-pytest==7.0.1; python_version >= '3.6'
-pytest-xdist==2.5.0; python_version >= '3.6'
-pytest-benchmark[histogram]==3.4.1; python_version >= '3.6'
-cryptography==36.0.1; python_version >= '3.6'
+pytest==7.0.1
+pytest-xdist==2.5.0
+pytest-benchmark[histogram]==3.4.1
+cryptography==36.0.1
# NOTE: Only needed by nttcis loadbalancer driver
-pyopenssl==21.0.0; python_version >= '3.6'
-more-itertools==8.11.0; python_version >= '3.6'
+pyopenssl==21.0.0
+more-itertools==8.11.0
[libcloud] 05/05: Merge branch 'trunk' of http://gitbox.apache.org/repos/asf/libcloud into trunk
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git
commit 4265e32bda9868941af188d2763f3a4d01298c3a
Merge: 0734e95 536582d
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Sat Mar 5 12:24:32 2022 +0100
Merge branch 'trunk' of http://gitbox.apache.org/repos/asf/libcloud into trunk
CHANGES.rst | 17 ++
libcloud/compute/drivers/openstack.py | 181 +++++++++++++++++----
.../openstack_v1.1/_v2_0__floatingips.json | 28 ++++
.../openstack_v1.1/_v2_0__floatingips_ip_id.json | 32 ++++
...tingips.json => _v2_0__floatingips_net_id.json} | 0
libcloud/test/compute/test_openstack.py | 65 +++++++-
6 files changed, 279 insertions(+), 44 deletions(-)
[libcloud] 04/05: Update version of paramiko which is used for tests.
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git
commit 0734e95f5867dcc0ab2a841515238d926582edb8
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Sat Mar 5 12:23:01 2022 +0100
Update version of paramiko which is used for tests.
---
tox.ini | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tox.ini b/tox.ini
index ef0a782..e7d4e0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -234,7 +234,7 @@ commands =
deps = -r{toxinidir}/requirements-tests.txt
bottle
fasteners
- paramiko==2.8.0
+ paramiko==2.9.2
pysphere
setenv =
PYTHONPATH={toxinidir}
@@ -320,7 +320,7 @@ commands = pytest -rsx -vvv --capture=tee-sys -o log_cli=True --durations=10 int
[testenv:coverage]
deps =
-r{toxinidir}/requirements-tests.txt
- paramiko==2.8.0
+ paramiko==2.9.2
pyopenssl==21.0.0
python-dateutil
libvirt-python==7.9.0
@@ -334,7 +334,7 @@ commands = cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
passenv = TERM TOXENV CI GITHUB_*
deps =
-r{toxinidir}/requirements-tests.txt
- paramiko==2.8.0
+ paramiko==2.9.2
pyopenssl==21.0.0
libvirt-python==7.9.0
fasteners