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:
authorBrad Warren <bmw@users.noreply.github.com>2021-02-06 02:51:18 +0300
committerGitHub <noreply@github.com>2021-02-06 02:51:18 +0300
commit711cc95dc466c569c120bd7fcda8e67c135cb101 (patch)
tree1c4f3526b3eaed3e35ad6c4dcbfa920b85e134e8 /certbot-compatibility-test
parentc2ee0d29382d9613cc3a8d4cee6cb4aa3ce239c4 (diff)
Remove mock dependency (#8630)
Fixes https://github.com/certbot/certbot/issues/7913. I only added the deprecation warning to `certbot.tests.util` because that's the only place where I think someone could be using the `mock` module through our API. * remove external mock from acme * update Certbot's mock usage * remove mock dependency in plugins * remove external mock from compatibility test * add changelog entry
Diffstat (limited to 'certbot-compatibility-test')
-rw-r--r--certbot-compatibility-test/certbot_compatibility_test/configurators/apache/common.py5
-rw-r--r--certbot-compatibility-test/certbot_compatibility_test/validator_test.py5
-rw-r--r--certbot-compatibility-test/setup.py11
3 files changed, 2 insertions, 19 deletions
diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/apache/common.py b/certbot-compatibility-test/certbot_compatibility_test/configurators/apache/common.py
index b6fbe2817..2b3f94581 100644
--- a/certbot-compatibility-test/certbot_compatibility_test/configurators/apache/common.py
+++ b/certbot-compatibility-test/certbot_compatibility_test/configurators/apache/common.py
@@ -2,11 +2,8 @@
import os
import shutil
import subprocess
+from unittest import mock
-try:
- import mock
-except ImportError: # pragma: no cover
- from unittest import mock # type: ignore
import zope.interface
from certbot import errors as le_errors
diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator_test.py b/certbot-compatibility-test/certbot_compatibility_test/validator_test.py
index 0b1056561..711d1b38e 100644
--- a/certbot-compatibility-test/certbot_compatibility_test/validator_test.py
+++ b/certbot-compatibility-test/certbot_compatibility_test/validator_test.py
@@ -1,10 +1,7 @@
"""Tests for certbot_compatibility_test.validator."""
import unittest
+from unittest import mock
-try:
- import mock
-except ImportError: # pragma: no cover
- from unittest import mock # type: ignore
import OpenSSL
import requests
diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py
index 19ee74efe..0236773f0 100644
--- a/certbot-compatibility-test/setup.py
+++ b/certbot-compatibility-test/setup.py
@@ -1,7 +1,5 @@
-from distutils.version import LooseVersion
import sys
-from setuptools import __version__ as setuptools_version
from setuptools import find_packages
from setuptools import setup
@@ -15,15 +13,6 @@ install_requires = [
'zope.interface',
]
-setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2'))
-if setuptools_known_environment_markers:
- install_requires.append('mock ; python_version < "3.3"')
-elif 'bdist_wheel' in sys.argv[1:]:
- raise RuntimeError('Error, you are trying to build certbot wheels using an old version '
- 'of setuptools. Version 36.2+ of setuptools is required.')
-elif sys.version_info < (3,3):
- install_requires.append('mock')
-
if sys.version_info < (2, 7, 9):
# For secure SSL connexion with Python 2.7 (InsecurePlatformWarning)
install_requires.append('ndg-httpsclient')