Merge remote-tracking branch 'origin/master' into HEAD

.azure-pipelines/templates/jobs/extended-tests-jobs.yml

@@ -17,10 +17,6 @@ jobs:
         linux-py310:
           PYTHON_VERSION: 3.10
           TOXENV: py310
-        linux-py37-nopin:
-          PYTHON_VERSION: 3.7
-          TOXENV: py37
-          CERTBOT_NO_PIN: 1
         linux-boulder-v2-integration-certbot-oldest:
           PYTHON_VERSION: 3.7
           TOXENV: integration-certbot-oldest

.azure-pipelines/templates/jobs/packaging-jobs.yml

@@ -66,7 +66,6 @@ jobs:
           addToPath: true
       - script: |
           python -m venv venv
-          venv\Scripts\python tools\pipstrap.py
           venv\Scripts\python tools\pip_install.py -e windows-installer
         displayName: Prepare Windows installer build environment
       - script: |
@@ -103,7 +102,6 @@ jobs:
         displayName: Retrieve Windows installer
       - script: |
           python -m venv venv
-          venv\Scripts\python tools\pipstrap.py
           venv\Scripts\python tools\pip_install.py -e certbot-ci
         env:
           PIP_NO_BUILD_ISOLATION: no
@@ -175,7 +173,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends nginx-light snapd
           python3 -m venv venv
-          venv/bin/python tools/pipstrap.py
           venv/bin/python tools/pip_install.py -U tox
         displayName: Install dependencies
       - task: DownloadPipelineArtifact@2
@@ -213,7 +210,6 @@ jobs:
       - script: |
           set -e
           python3 -m venv venv
-          venv/bin/python tools/pipstrap.py
           venv/bin/python tools/pip_install.py -e certbot-ci
         displayName: Prepare Certbot-CI
       - script: |

.azure-pipelines/templates/steps/tox-steps.yml

@@ -28,17 +28,9 @@ steps:
     inputs:
       versionSpec: $(PYTHON_VERSION)
       addToPath: true
-    # tools/pip_install.py is used to pin packages to a known working version
-    # except in tests where the environment variable CERTBOT_NO_PIN is set.
-    # virtualenv is listed here explicitly to make sure it is upgraded when
-    # CERTBOT_NO_PIN is set to work around failures we've seen when using an older
-    # version of virtualenv. The option "-I" is set so when CERTBOT_NO_PIN is also
-    # set, pip updates dependencies it thinks are already satisfied to avoid some
-    # problems with its lack of real dependency resolution.
   - bash: |
       set -e
-      python3 tools/pipstrap.py
-      python3 tools/pip_install.py -I tox virtualenv
+      python3 tools/pip_install.py tox
     displayName: Install runtime dependencies
   - task: DownloadSecureFile@1
     name: testFarmPem

.github/workflows/stale.yml

@@ -1,8 +1,8 @@
 name: Update Stale Issues
 on:
   schedule:
-    # Run at midnight every night
-    - cron: '24 1 * * *'
+    # Run 24 minutes past the hour 4 times a day.
+    - cron: '24 */6 * * *'
 permissions:
   issues: write
 jobs:

.pylintrc

@@ -48,7 +48,10 @@ ignore=CVS
 # ignore-list. The regex matches against paths and can be in Posix or Windows
 # format. Because '\' represents the directory delimiter on Windows systems, it
 # can't be used as an escape character.
-ignore-paths=
+# CERTBOT COMMENT
+# Changing this line back to the default of `ignore-paths=` is being tracked by
+# https://github.com/certbot/certbot/issues/7908.
+ignore-paths=.*/_internal/tests/
 
 # Files or directories matching the regular expression patterns are skipped.
 # The regex matches against base names, not paths. The default value ignores

acme/MANIFEST.in

@@ -3,7 +3,7 @@ include README.rst
 include pytest.ini
 recursive-include docs *
 recursive-include examples *
-recursive-include tests *
+recursive-include acme/_internal/tests/testdata *
 include acme/py.typed
 global-exclude __pycache__
 global-exclude *.py[cod]

acme/acme/_internal/__init__.py

@@ -0,0 +1 @@
+"""acme's internal implementation"""

acme/acme/_internal/tests/__init__.py

@@ -0,0 +1 @@
+"""acme tests"""

acme/acme/_internal/tests/challenges_test.py

@@ -11,7 +11,7 @@ import pytest
 import requests
 
 from acme import errors
-import test_util
+from acme._internal.tests import test_util
 
 CERT = test_util.load_comparable_cert('cert.pem')
 KEY = jose.JWKRSA(key=test_util.load_rsa_private_key('rsa512_key.pem'))

acme/acme/_internal/tests/client_test.py

@@ -17,10 +17,10 @@ from acme import challenges
 from acme import errors
 from acme import jws as acme_jws
 from acme import messages
+from acme._internal.tests import messages_test
+from acme._internal.tests import test_util
 from acme.client import ClientNetwork
 from acme.client import ClientV2
-import messages_test
-import test_util
 
 CERT_SAN_PEM = test_util.load_vector('cert-san.pem')
 CSR_MIXED_PEM = test_util.load_vector('csr-mixed.pem')

acme/acme/_internal/tests/crypto_util_test.py

@@ -14,7 +14,7 @@ import OpenSSL
 import pytest
 
 from acme import errors
-import test_util
+from acme._internal.tests import test_util
 
 
 class SSLSocketAndProbeSNITest(unittest.TestCase):

acme/acme/_internal/tests/jws_test.py

@@ -5,7 +5,7 @@ import unittest
 import josepy as jose
 import pytest
 
-import test_util
+from acme._internal.tests import test_util
 
 KEY = jose.JWKRSA.load(test_util.load_vector('rsa512_key.pem'))
 

acme/acme/_internal/tests/messages_test.py

@@ -10,7 +10,7 @@ import josepy as jose
 import pytest
 
 from acme import challenges
-import test_util
+from acme._internal.tests import test_util
 
 CERT = test_util.load_comparable_cert('cert.der')
 CSR = test_util.load_comparable_csr('csr.der')

acme/acme/_internal/tests/standalone_test.py

@@ -15,7 +15,7 @@ import requests
 from acme import challenges
 from acme import crypto_util
 from acme import errors
-import test_util
+from acme._internal.tests import test_util
 
 
 class TLSServerTest(unittest.TestCase):

acme/docs/jws-help.txt

@@ -3,6 +3,6 @@ usage: jws [-h] [--compact] {sign,verify} ...
 positional arguments:
   {sign,verify}
 
-options:
+optional arguments:
   -h, --help     show this help message and exit
   --compact

acme/setup.py

@@ -3,12 +3,13 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
-    'cryptography>=2.5.0',
+    'cryptography>=3.2.1',
     'josepy>=1.13.0',
-    'PyOpenSSL>=17.5.0',
+    # pyOpenSSL 23.1.0 is a bad release: https://github.com/pyca/pyopenssl/issues/1199
+    'PyOpenSSL>=17.5.0,!=23.1.0',
     'pyrfc3339',
     'pytz>=2019.3',
     'requests>=2.20.0',

certbot-apache/MANIFEST.in

@@ -1,8 +1,8 @@
 include LICENSE.txt
 include README.rst
-recursive-include tests *
 recursive-include certbot_apache/_internal/augeas_lens *.aug
 recursive-include certbot_apache/_internal/tls_configs *.conf
+recursive-include certbot_apache/_internal/tests/testdata *
 include certbot_apache/py.typed
 global-exclude __pycache__
 global-exclude *.py[cod]

certbot-apache/certbot_apache/_internal/tests/__init__.py

@@ -0,0 +1 @@
+"""certbot-apache tests"""

certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py

@@ -12,9 +12,8 @@ from certbot_integration_tests.utils import acme_server
 SCRIPT_DIRNAME = os.path.dirname(__file__)
 
 
-def main(args=None):
-    if not args:
-        args = sys.argv[1:]
+def main() -> int:
+    args = sys.argv[1:]
     with acme_server.ACMEServer('pebble', [], False) as acme_xdist:
         environ = os.environ.copy()
         environ['SERVER'] = acme_xdist['directory_url']

certbot-apache/certbot_apache/_internal/tests/augeasnode_test.py

@@ -3,11 +3,12 @@ import os
 from typing import List
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot_apache._internal import assertions
 from certbot_apache._internal import augeasparser
-import util
-import pytest
+from certbot_apache._internal.tests import util
 
 
 def _get_augeasnode_mock(filepath):

certbot-apache/certbot_apache/_internal/tests/autohsts_test.py

@@ -9,7 +9,7 @@ import pytest
 
 from certbot import errors
 from certbot_apache._internal import constants
-import util
+from certbot_apache._internal.tests import util
 
 
 class AutoHSTSTest(util.ApacheTest):

certbot-apache/certbot_apache/_internal/tests/centos_test.py

@@ -10,7 +10,7 @@ from certbot.compat import filesystem
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_centos
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

certbot-apache/certbot_apache/_internal/tests/complex_parsing_test.py

@@ -7,7 +7,7 @@ import pytest
 
 from certbot import errors
 from certbot.compat import os
-import util
+from certbot_apache._internal.tests import util
 
 
 class ComplexParserTest(util.ParserTest):

certbot-apache/certbot_apache/_internal/tests/configurator_reverter_test.py

@@ -7,7 +7,7 @@ from unittest import mock
 import pytest
 
 from certbot import errors
-import util
+from certbot_apache._internal.tests import util
 
 
 class ConfiguratorReverterTest(util.ApacheTest):

certbot-apache/certbot_apache/_internal/tests/configurator_test.py

@@ -22,7 +22,7 @@ from certbot_apache._internal import apache_util
 from certbot_apache._internal import constants
 from certbot_apache._internal import obj
 from certbot_apache._internal import parser
-import util
+from certbot_apache._internal.tests import util
 
 
 class MultipleVhostsTest(util.ApacheTest):

certbot-apache/certbot_apache/_internal/tests/debian_test.py

@@ -11,7 +11,7 @@ from certbot.compat import os
 from certbot.tests import util as certbot_util
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import obj
-import util
+from certbot_apache._internal.tests import util
 
 
 class MultipleVhostsTestDebian(util.ApacheTest):

certbot-apache/certbot_apache/_internal/tests/display_ops_test.py

@@ -10,7 +10,7 @@ from certbot.display import util as display_util
 from certbot.tests import util as certbot_util
 from certbot_apache._internal import obj
 from certbot_apache._internal.display_ops import select_vhost_multiple
-import util
+from certbot_apache._internal.tests import util
 
 
 class SelectVhostMultiTest(unittest.TestCase):

certbot-apache/certbot_apache/_internal/tests/fedora_test.py

@@ -10,7 +10,7 @@ from certbot.compat import filesystem
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_fedora
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

certbot-apache/certbot_apache/_internal/tests/gentoo_test.py

@@ -10,7 +10,7 @@ from certbot.compat import filesystem
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_gentoo
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

certbot-apache/certbot_apache/_internal/tests/http_01_test.py

@@ -14,7 +14,7 @@ from certbot.compat import filesystem
 from certbot.compat import os
 from certbot.tests import acme_util
 from certbot_apache._internal.parser import get_aug_path
-import util
+from certbot_apache._internal.tests import util
 
 NUM_ACHALLS = 3