Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/certbot/certbot.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien Ferrand <adferrand@users.noreply.github.com>2021-03-10 03:12:32 +0300
committerGitHub <noreply@github.com>2021-03-10 03:12:32 +0300
commit67b65bb2c0b5fee3b97ae2e94649e8ef28fcbd74 (patch)
treebedcaee8347c9a59ec2c782f131d64e93e4c13ed /certbot-ci
parent76895457c9f5956ec97ccadc3e0d7e894db17094 (diff)
Deprecate acme.typing_magic module, stop using it in certbot (#8643)
* Deprecate acme.magic_typing, stop to use it in certbot * Isort * Add a changelog entry Co-authored-by: Brad Warren <bmw@users.noreply.github.com>
Diffstat (limited to 'certbot-ci')
-rw-r--r--certbot-ci/certbot_integration_tests/nginx_tests/test_main.py2
-rw-r--r--certbot-ci/certbot_integration_tests/rfc2136_tests/context.py2
-rwxr-xr-xcertbot-ci/certbot_integration_tests/utils/acme_server.py4
-rw-r--r--certbot-ci/certbot_integration_tests/utils/misc.py4
-rw-r--r--certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py3
-rw-r--r--certbot-ci/snap_integration_tests/dns_tests/test_main.py5
-rw-r--r--certbot-ci/windows_installer_integration_tests/test_main.py4
7 files changed, 13 insertions, 11 deletions
diff --git a/certbot-ci/certbot_integration_tests/nginx_tests/test_main.py b/certbot-ci/certbot_integration_tests/nginx_tests/test_main.py
index 8a2d48a50..4c746e1ee 100644
--- a/certbot-ci/certbot_integration_tests/nginx_tests/test_main.py
+++ b/certbot-ci/certbot_integration_tests/nginx_tests/test_main.py
@@ -1,8 +1,8 @@
"""Module executing integration tests against certbot with nginx plugin."""
import os
import ssl
-
from typing import List
+
import pytest
from certbot_integration_tests.nginx_tests import context as nginx_context
diff --git a/certbot-ci/certbot_integration_tests/rfc2136_tests/context.py b/certbot-ci/certbot_integration_tests/rfc2136_tests/context.py
index bdedee1fe..c8024b21d 100644
--- a/certbot-ci/certbot_integration_tests/rfc2136_tests/context.py
+++ b/certbot-ci/certbot_integration_tests/rfc2136_tests/context.py
@@ -1,7 +1,7 @@
"""Module to handle the context of RFC2136 integration tests."""
-import tempfile
from contextlib import contextmanager
+import tempfile
from pkg_resources import resource_filename
from pytest import skip
diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/certbot_integration_tests/utils/acme_server.py
index b16aa80af..706c3ebae 100755
--- a/certbot-ci/certbot_integration_tests/utils/acme_server.py
+++ b/certbot-ci/certbot_integration_tests/utils/acme_server.py
@@ -11,14 +11,14 @@ import subprocess
import sys
import tempfile
import time
-
from typing import List
+
import requests
+# pylint: disable=wildcard-import,unused-wildcard-import
from certbot_integration_tests.utils import misc
from certbot_integration_tests.utils import pebble_artifacts
from certbot_integration_tests.utils import proxy
-# pylint: disable=wildcard-import,unused-wildcard-import
from certbot_integration_tests.utils.constants import *
diff --git a/certbot-ci/certbot_integration_tests/utils/misc.py b/certbot-ci/certbot_integration_tests/utils/misc.py
index cf2e7ff09..2fac494f2 100644
--- a/certbot-ci/certbot_integration_tests/utils/misc.py
+++ b/certbot-ci/certbot_integration_tests/utils/misc.py
@@ -26,8 +26,8 @@ from OpenSSL import crypto
import pkg_resources
import requests
-from certbot_integration_tests.utils.constants import \
- PEBBLE_ALTERNATE_ROOTS, PEBBLE_MANAGEMENT_URL
+from certbot_integration_tests.utils.constants import PEBBLE_ALTERNATE_ROOTS
+from certbot_integration_tests.utils.constants import PEBBLE_MANAGEMENT_URL
RSA_KEY_TYPE = 'rsa'
ECDSA_KEY_TYPE = 'ecdsa'
diff --git a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py b/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py
index cd62e1a7f..918a5fd04 100644
--- a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py
+++ b/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py
@@ -7,7 +7,8 @@ import stat
import pkg_resources
import requests
-from certbot_integration_tests.utils.constants import DEFAULT_HTTP_01_PORT, MOCK_OCSP_SERVER_PORT
+from certbot_integration_tests.utils.constants import DEFAULT_HTTP_01_PORT
+from certbot_integration_tests.utils.constants import MOCK_OCSP_SERVER_PORT
PEBBLE_VERSION = 'v2.3.0'
ASSETS_PATH = pkg_resources.resource_filename('certbot_integration_tests', 'assets')
diff --git a/certbot-ci/snap_integration_tests/dns_tests/test_main.py b/certbot-ci/snap_integration_tests/dns_tests/test_main.py
index 016355334..721352c04 100644
--- a/certbot-ci/snap_integration_tests/dns_tests/test_main.py
+++ b/certbot-ci/snap_integration_tests/dns_tests/test_main.py
@@ -1,9 +1,10 @@
#!/usr/bin/env python3
-import pytest
-import subprocess
import glob
import os
import re
+import subprocess
+
+import pytest
@pytest.fixture(autouse=True, scope="module")
diff --git a/certbot-ci/windows_installer_integration_tests/test_main.py b/certbot-ci/windows_installer_integration_tests/test_main.py
index c8c347aa8..f699b736a 100644
--- a/certbot-ci/windows_installer_integration_tests/test_main.py
+++ b/certbot-ci/windows_installer_integration_tests/test_main.py
@@ -1,8 +1,8 @@
import os
+import re
+import subprocess
import time
import unittest
-import subprocess
-import re
@unittest.skipIf(os.name != 'nt', reason='Windows installer tests must be run on Windows.')