Tests: tox and mock cleanup

* Remove mock dependency
  (mock is now part of standard unittest package)
* Cleanup tox dependency installation logic

setup.py

@@ -30,15 +30,18 @@ with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
     long_description = long_description_from_readme(f.read())
 
 
+# Additional requirements for development/build/release
 requirements_dev = [
     "flake8",
     "sphinx",
     "sphinx-rtd-theme",
     "tox",
     "twine",
+    "wheel",
 ]
 
-requirements_test = ["mock", "boto3", "cryptography"]
+# Additional requirements for running tests
+requirements_test = []
 
 
 setup(

tests/mock_requests_backend.py

@@ -1,10 +1,10 @@
 import json
 from io import BytesIO
+from unittest.mock import patch
 
 from django.core import mail
 from django.test import SimpleTestCase
 import requests
-from mock import patch
 
 from anymail.exceptions import AnymailAPIError
 

tests/test_amazon_ses_backend.py

@@ -1,11 +1,11 @@
 import json
 from datetime import datetime
 from email.mime.application import MIMEApplication
+from unittest.mock import ANY, patch
 
 from django.core import mail
 from django.core.mail import BadHeaderError
 from django.test import SimpleTestCase, override_settings, tag
-from mock import ANY, patch
 
 from anymail.exceptions import AnymailAPIError, AnymailUnsupportedFeature
 from anymail.inbound import AnymailInboundMessage

tests/test_amazon_ses_inbound.py

@@ -2,10 +2,10 @@ import json
 from base64 import b64encode
 from datetime import datetime
 from textwrap import dedent
+from unittest.mock import ANY, patch
 
 from django.test import tag
 from django.utils.timezone import utc
-from mock import ANY, patch
 
 from anymail.exceptions import AnymailAPIError, AnymailConfigurationError
 from anymail.inbound import AnymailInboundMessage

tests/test_amazon_ses_webhooks.py

@@ -1,10 +1,10 @@
 import json
 import warnings
 from datetime import datetime
+from unittest.mock import ANY, patch
 
 from django.test import SimpleTestCase, override_settings, tag
 from django.utils.timezone import utc
-from mock import ANY, patch
 
 from anymail.exceptions import AnymailConfigurationError, AnymailInsecureWebhookWarning
 from anymail.signals import AnymailTrackingEvent

tests/test_mailgun_inbound.py

@@ -2,10 +2,10 @@ import json
 from datetime import datetime
 from io import BytesIO
 from textwrap import dedent
+from unittest.mock import ANY
 
 from django.test import override_settings, tag
 from django.utils.timezone import utc
-from mock import ANY
 
 from anymail.exceptions import AnymailConfigurationError
 from anymail.inbound import AnymailInboundMessage

tests/test_mailgun_webhooks.py

@@ -1,12 +1,12 @@
 import json
 from datetime import datetime
+from unittest.mock import ANY
 
 import hashlib
 import hmac
 from django.core.exceptions import ImproperlyConfigured
 from django.test import override_settings, tag
 from django.utils.timezone import utc
-from mock import ANY
 
 from anymail.exceptions import AnymailConfigurationError
 from anymail.signals import AnymailTrackingEvent

tests/test_mailjet_inbound.py

@@ -1,8 +1,8 @@
 import json
 from base64 import b64encode
+from unittest.mock import ANY
 
 from django.test import tag
-from mock import ANY
 
 from anymail.inbound import AnymailInboundMessage
 from anymail.signals import AnymailInboundEvent

tests/test_mailjet_webhooks.py

@@ -1,9 +1,9 @@
 import json
 from datetime import datetime
+from unittest.mock import ANY
 
 from django.test import tag
 from django.utils.timezone import utc
-from mock import ANY
 
 from anymail.signals import AnymailTrackingEvent
 from anymail.webhooks.mailjet import MailjetTrackingWebhookView

tests/test_mandrill_inbound.py

@@ -1,7 +1,7 @@
 from textwrap import dedent
+from unittest.mock import ANY
 
 from django.test import override_settings, tag
-from mock import ANY
 
 from anymail.inbound import AnymailInboundMessage
 from anymail.signals import AnymailInboundEvent

tests/test_mandrill_webhooks.py

@@ -3,12 +3,12 @@ import hmac
 import json
 from base64 import b64encode
 from datetime import datetime
+from unittest.mock import ANY
 from urllib.parse import urljoin
 
 from django.core.exceptions import ImproperlyConfigured
 from django.test import override_settings, tag
 from django.utils.timezone import utc
-from mock import ANY
 
 from anymail.signals import AnymailTrackingEvent
 from anymail.webhooks.mandrill import MandrillCombinedWebhookView, MandrillTrackingWebhookView

tests/test_message.py

@@ -1,6 +1,7 @@
+from unittest.mock import patch
+
 from django.core.mail import EmailMultiAlternatives
 from django.test import SimpleTestCase
-from mock import patch
 
 from anymail.message import AnymailRecipientStatus, AnymailStatus, attach_inline_image
 

tests/test_postal_inbound.py

@@ -2,9 +2,9 @@ import json
 import unittest
 from base64 import b64encode
 from textwrap import dedent
+from unittest.mock import ANY
 
 from django.test import tag
-from mock import ANY
 
 from anymail.exceptions import AnymailConfigurationError
 from anymail.inbound import AnymailInboundMessage

tests/test_postal_webhooks.py

@@ -2,10 +2,10 @@ import json
 import unittest
 from base64 import b64encode
 from datetime import datetime
+from unittest.mock import ANY
 
 from django.test import tag
 from django.utils.timezone import utc
-from mock import ANY
 
 from anymail.exceptions import AnymailConfigurationError
 from anymail.signals import AnymailTrackingEvent

tests/test_postmark_inbound.py

@@ -1,8 +1,8 @@
 import json
 from base64 import b64encode
+from unittest.mock import ANY
 
 from django.test import tag
-from mock import ANY
 
 from anymail.exceptions import AnymailConfigurationError
 from anymail.inbound import AnymailInboundMessage

tests/test_postmark_webhooks.py

@@ -1,9 +1,9 @@
 import json
 from datetime import datetime
+from unittest.mock import ANY
 
 from django.test import tag
 from django.utils.timezone import get_fixed_timezone, utc
-from mock import ANY
 
 from anymail.exceptions import AnymailConfigurationError
 from anymail.signals import AnymailTrackingEvent

tests/test_sendgrid_backend.py

@@ -4,11 +4,11 @@ from datetime import date, datetime
 from decimal import Decimal
 from email.mime.base import MIMEBase
 from email.mime.image import MIMEImage
+from unittest.mock import patch
 
 from django.core import mail
 from django.test import SimpleTestCase, override_settings, tag
 from django.utils.timezone import get_fixed_timezone, override as override_current_timezone
-from mock import patch
 
 from anymail.exceptions import (AnymailAPIError, AnymailConfigurationError, AnymailSerializationError,
                                 AnymailUnsupportedFeature, AnymailWarning)

tests/test_sendgrid_inbound.py

@@ -1,9 +1,9 @@
 import json
 from io import BytesIO
 from textwrap import dedent
+from unittest.mock import ANY
 
 from django.test import tag
-from mock import ANY
 
 from anymail.inbound import AnymailInboundMessage
 from anymail.signals import AnymailInboundEvent

tests/test_sendgrid_webhooks.py

@@ -1,9 +1,9 @@
 import json
 from datetime import datetime
+from unittest.mock import ANY
 
 from django.test import tag
 from django.utils.timezone import utc
-from mock import ANY
 
 from anymail.signals import AnymailTrackingEvent
 from anymail.webhooks.sendgrid import SendGridTrackingWebhookView

tests/test_sendinblue_webhooks.py

@@ -1,9 +1,9 @@
 import json
 from datetime import datetime
+from unittest.mock import ANY
 
 from django.test import tag
 from django.utils.timezone import utc
-from mock import ANY
 
 from anymail.signals import AnymailTrackingEvent
 from anymail.webhooks.sendinblue import SendinBlueTrackingWebhookView

tests/test_sparkpost_inbound.py

@@ -1,9 +1,9 @@
 import json
 from base64 import b64encode
 from textwrap import dedent
+from unittest.mock import ANY
 
 from django.test import tag
-from mock import ANY
 
 from anymail.inbound import AnymailInboundMessage
 from anymail.signals import AnymailInboundEvent

tests/test_sparkpost_webhooks.py

@@ -1,9 +1,9 @@
 import json
 from datetime import datetime
+from unittest.mock import ANY
 
 from django.test import override_settings, tag
 from django.utils.timezone import utc
-from mock import ANY
 
 from anymail.signals import AnymailTrackingEvent
 from anymail.webhooks.sparkpost import SparkPostTrackingWebhookView

tests/webhook_cases.py

@@ -1,7 +1,7 @@
 import base64
+from unittest.mock import create_autospec, ANY
 
 from django.test import override_settings, SimpleTestCase
-from mock import create_autospec, ANY
 
 from anymail.exceptions import AnymailInsecureWebhookWarning
 from anymail.signals import tracking, inbound

tox.ini

@@ -27,14 +27,15 @@ deps =
     django22: django~=2.2.0
     django30: django~=3.0.0
     django31: django~=3.1.0
-    django32: django>=3.2a1
+    django32: django~=3.2.0
     djangoDev: https://github.com/django/django/tarball/main
     old_urllib3: urllib3<1.25
-    # testing dependencies (duplicates setup.py tests_require, less optional extras):
-    mock
 extras =
+    # install [test] extras, unconditionally
+    test
+    # install [esp_name] extras only when testing "all" or esp_name factor
     all,amazon_ses: amazon_ses
-    all,postal: cryptography
+    all,postal: postal
 setenv =
     # tell runtests.py to limit some test tags based on extras factor
     none: ANYMAIL_SKIP_TESTS=amazon_ses,postal