Tests: tox and mock cleanup

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

Author: medmunds

setup.py

@@ -30,15 +30,18 @@ def long_description_from_readme(rst):
     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 @@
 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 @@
 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