diff options
Diffstat (limited to 'meta-python/recipes-devtools/python')
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-google-auth/0001-make-the-TLS-tests-skip-when-pyopenssl-isn-t-availab.patch | 34 | ||||
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-google-auth_2.43.0.bb (renamed from meta-python/recipes-devtools/python/python3-google-auth_2.40.3.bb) | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-python/recipes-devtools/python/python3-google-auth/0001-make-the-TLS-tests-skip-when-pyopenssl-isn-t-availab.patch b/meta-python/recipes-devtools/python/python3-google-auth/0001-make-the-TLS-tests-skip-when-pyopenssl-isn-t-availab.patch new file mode 100644 index 0000000000..5ee13f3d63 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-google-auth/0001-make-the-TLS-tests-skip-when-pyopenssl-isn-t-availab.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From 35eea881e1aeb27fc12cfb301e497e72e59e720f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 18 Nov 2025 17:23:09 -0800 | ||
| 4 | Subject: [PATCH] make the TLS tests skip when pyopenssl isn't available | ||
| 5 | |||
| 6 | In some distributions e.g. yocto | ||
| 7 | pyOpenSSL is a packageconfig and disabled by default, | ||
| 8 | and it means pyopenssl.py module is not installed as a result. | ||
| 9 | |||
| 10 | This test fails plainly when it can not find urllib3.contrib.pyopenssl | ||
| 11 | instead skip the test if it does not find the module. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/googleapis/google-auth-library-python/pull/1873] | ||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | tests/transport/test__custom_tls_signer.py | 5 ++++- | ||
| 17 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/tests/transport/test__custom_tls_signer.py b/tests/transport/test__custom_tls_signer.py | ||
| 20 | index 3a33c2c..6f88ddf 100644 | ||
| 21 | --- a/tests/transport/test__custom_tls_signer.py | ||
| 22 | +++ b/tests/transport/test__custom_tls_signer.py | ||
| 23 | @@ -18,7 +18,10 @@ import os | ||
| 24 | import mock | ||
| 25 | import pytest # type: ignore | ||
| 26 | from requests.packages.urllib3.util.ssl_ import create_urllib3_context # type: ignore | ||
| 27 | -import urllib3.contrib.pyopenssl # type: ignore | ||
| 28 | +urllib3_pyopenssl = pytest.importorskip( | ||
| 29 | + "urllib3.contrib.pyopenssl", | ||
| 30 | + reason="urllib3.contrib.pyopenssl not available in this environment", | ||
| 31 | +) | ||
| 32 | |||
| 33 | from google.auth import exceptions | ||
| 34 | from google.auth.transport import _custom_tls_signer | ||
diff --git a/meta-python/recipes-devtools/python/python3-google-auth_2.40.3.bb b/meta-python/recipes-devtools/python/python3-google-auth_2.43.0.bb index b7498dcc99..aa94035eb6 100644 --- a/meta-python/recipes-devtools/python/python3-google-auth_2.40.3.bb +++ b/meta-python/recipes-devtools/python/python3-google-auth_2.43.0.bb | |||
| @@ -5,10 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | |||
| 5 | 5 | ||
| 6 | inherit pypi setuptools3 ptest | 6 | inherit pypi setuptools3 ptest |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "500c3a29adedeb36ea9cf24b8d10858e152f2412e3ca37829b3fa18e33d63b77" | ||
| 9 | SRC_URI += " \ | 8 | SRC_URI += " \ |
| 9 | file://0001-make-the-TLS-tests-skip-when-pyopenssl-isn-t-availab.patch \ | ||
| 10 | file://run-ptest \ | 10 | file://run-ptest \ |
| 11 | " | 11 | " |
| 12 | SRC_URI[sha256sum] = "88228eee5fc21b62a1b5fe773ca15e67778cb07dc8363adcb4a8827b52d81483" | ||
| 12 | 13 | ||
| 13 | PYPI_PACKAGE = "google_auth" | 14 | PYPI_PACKAGE = "google_auth" |
| 14 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 15 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
