diff options
| author | alexzorin <alex@zorin.id.au> | 2022-07-29 03:26:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 03:26:12 +0300 |
| commit | 42a4d30267c731b80fe73c1d38add046d0bd0899 (patch) | |
| tree | 7badc467c3ec6f1a11584cbc7c11e9afed875f1e /certbot-ci | |
| parent | e9e7a69c7bb5cdac8215692d4bda9a661c0189c1 (diff) | |
deps: remove pyjwt dependency (#9337)
* deps: remove pyjwt dependency
* pinning: strip extras from dependencies
`poetry export` outputs in requirements.txt format, which is now
apparently producing "dep[extra]==...". We are using this output
as the constraints file for pip and pip's new resolver does not
permit extras in the constraints file.
This change filters out the extras specifiers.
* repin current dependencies
* fix new pylint complaints
* silence lint about distutils.version
We have already deprecated the function and it'll be removed in
2.0.
* docs: set sphinx language to 'en'
this is emitting a warning and failing the build
* Revert "pinning: strip extras from dependencies"
This reverts commit 11268fd23160ac53fd8dad7a2ff15e453678e159.
* pin poetry back to avoid extras issue
* repin
* fix new mypy complaints in acme/
Diffstat (limited to 'certbot-ci')
| -rw-r--r-- | certbot-ci/certbot_integration_tests/certbot_tests/assertions.py | 4 | ||||
| -rwxr-xr-x | certbot-ci/certbot_integration_tests/utils/acme_server.py | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/assertions.py b/certbot-ci/certbot_integration_tests/certbot_tests/assertions.py index 3650f64f0..3563b30af 100644 --- a/certbot-ci/certbot_integration_tests/certbot_tests/assertions.py +++ b/certbot-ci/certbot_integration_tests/certbot_tests/assertions.py @@ -125,7 +125,7 @@ def assert_equals_world_read_permissions(file1: str, file2: str) -> None: mode_file1 = os.stat(file1).st_mode & 0o004 mode_file2 = os.stat(file2).st_mode & 0o004 else: - everybody = win32security.ConvertStringSidToSid(EVERYBODY_SID) + everybody = win32security.ConvertStringSidToSid(EVERYBODY_SID) # pylint: disable=used-before-assignment security1 = win32security.GetFileSecurity(file1, win32security.DACL_SECURITY_INFORMATION) dacl1 = security1.GetSecurityDescriptorDacl() @@ -135,7 +135,7 @@ def assert_equals_world_read_permissions(file1: str, file2: str) -> None: 'TrusteeType': win32security.TRUSTEE_IS_USER, 'Identifier': everybody, }) - mode_file1 = mode_file1 & ntsecuritycon.FILE_GENERIC_READ + mode_file1 = mode_file1 & ntsecuritycon.FILE_GENERIC_READ # pylint: disable=used-before-assignment security2 = win32security.GetFileSecurity(file2, win32security.DACL_SECURITY_INFORMATION) dacl2 = security2.GetSecurityDescriptorDacl() diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/certbot_integration_tests/utils/acme_server.py index 9e56e3036..8994d0ef0 100755 --- a/certbot-ci/certbot_integration_tests/utils/acme_server.py +++ b/certbot-ci/certbot_integration_tests/utils/acme_server.py @@ -133,18 +133,9 @@ class ACMEServer: acme_xdist['directory_url'] = BOULDER_V2_DIRECTORY_URL acme_xdist['challtestsrv_url'] = BOULDER_V2_CHALLTESTSRV_URL - acme_xdist['http_port'] = { - node: port for (node, port) in # pylint: disable=unnecessary-comprehension - zip(nodes, range(5200, 5200 + len(nodes))) - } - acme_xdist['https_port'] = { - node: port for (node, port) in # pylint: disable=unnecessary-comprehension - zip(nodes, range(5100, 5100 + len(nodes))) - } - acme_xdist['other_port'] = { - node: port for (node, port) in # pylint: disable=unnecessary-comprehension - zip(nodes, range(5300, 5300 + len(nodes))) - } + acme_xdist['http_port'] = dict(zip(nodes, range(5200, 5200 + len(nodes)))) + acme_xdist['https_port'] = dict(zip(nodes, range(5100, 5100 + len(nodes)))) + acme_xdist['other_port'] = dict(zip(nodes, range(5300, 5300 + len(nodes)))) self.acme_xdist = acme_xdist |