chore: Move to src layout

Stranger6667 · Aug 29, 2020 · 5bf9865 · 5bf9865
1 parent d7b92a1
commit 5bf9865
Show file tree

Hide file tree

Showing 30 changed files with 43 additions and 63 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,5 +1,12 @@
 [run]
 branch = true
+parallel = true
+source = postmarker
+
+[paths]
+source =
+   src/postmarker
+   .tox/*/lib/python*/site-packages/postmarker
 
 [report]
 show_missing = true

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,7 @@
+[build-system]
+requires = ["setuptools >= 40.6.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [tool.black]
 line-length = 120
 target_version = ["py37"]
@@ -9,4 +13,4 @@ multi_line_output = 3
 default_section = "THIRDPARTY"
 include_trailing_comma = true
 known_first_party = "postmarker"
-known_third_party = ["betamax", "betamax_serializers", "django", "pytest", "requests", "setuptools", "sphinx_rtd_theme", "tornado"]
+known_third_party = ["betamax", "betamax_serializers", "django", "postmarker", "pytest", "requests", "setuptools", "sphinx_rtd_theme", "tornado"]
diff --git a/setup.py b/setup.py
@@ -1,7 +1,5 @@
 # coding: utf-8
-from setuptools import setup
-
-import postmarker
+from setuptools import find_packages, setup
 
 install_requires = ["requests>=2.20.0"]
 
@@ -13,8 +11,7 @@
 setup(
     name="postmarker",
     url="https://github.com/Stranger6667/postmarker",
-    version=postmarker.__version__,
-    packages=["postmarker", "postmarker.models", "postmarker.django"],
+    version="0.14.1",
     license="MIT",
     author="Dmitry Dygalo",
     author_email="[email protected]",
@@ -23,6 +20,9 @@
     keywords=["postmark", "api", "client", "email"],
     description="Python client library for Postmark API",
     long_description=long_description,
+    long_description_content_type="text/x-rst",
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",

diff --git a/postmarker/__init__.py → src/postmarker/__init__.py b/postmarker/__init__.py → src/postmarker/__init__.py
diff --git a/postmarker/core.py → src/postmarker/core.py b/postmarker/core.py → src/postmarker/core.py
diff --git a/postmarker/django/__init__.py → src/postmarker/django/__init__.py b/postmarker/django/__init__.py → src/postmarker/django/__init__.py
diff --git a/postmarker/django/backend.py → src/postmarker/django/backend.py b/postmarker/django/backend.py → src/postmarker/django/backend.py
diff --git a/postmarker/django/signals.py → src/postmarker/django/signals.py b/postmarker/django/signals.py → src/postmarker/django/signals.py
diff --git a/postmarker/exceptions.py → src/postmarker/exceptions.py b/postmarker/exceptions.py → src/postmarker/exceptions.py
diff --git a/postmarker/logging.py → src/postmarker/logging.py b/postmarker/logging.py → src/postmarker/logging.py
diff --git a/postmarker/models/__init__.py → src/postmarker/models/__init__.py b/postmarker/models/__init__.py → src/postmarker/models/__init__.py
diff --git a/postmarker/models/base.py → src/postmarker/models/base.py b/postmarker/models/base.py → src/postmarker/models/base.py
diff --git a/postmarker/models/bounces.py → src/postmarker/models/bounces.py b/postmarker/models/bounces.py → src/postmarker/models/bounces.py
diff --git a/postmarker/models/domains.py → src/postmarker/models/domains.py b/postmarker/models/domains.py → src/postmarker/models/domains.py
diff --git a/postmarker/models/emails.py → src/postmarker/models/emails.py b/postmarker/models/emails.py → src/postmarker/models/emails.py
@@ -1,7 +1,6 @@
 """Basic ways to send emails."""
 import mimetypes
 import os
-import sys
 from base64 import b64encode
 from email.header import decode_header
 from email.mime.base import MIMEBase
@@ -11,10 +10,7 @@
 from ..utils import chunks
 from .base import MessageModel, Model, ModelManager
 
-if sys.version_info[:2] <= (3, 2):
-    SEPARATOR = " "
-else:
-    SEPARATOR = ""
+SEPARATOR = ""
 
 
 def list_to_csv(value):
@@ -92,10 +88,7 @@ def deconstruct_multipart_recursive(seen, text, html, attachments, message):
         else:
             # Ignore underlying messages inside `message/rfc822` payload, because the message itself will be passed
             # as an attachment
-            if content_type == "message/rfc822" and sys.version_info[:2] not in (
-                (2, 6),
-                (3, 2),
-            ):
+            if content_type == "message/rfc822":
                 for part in message.get_payload():
                     seen.add(part)
             attachments.append(message)

diff --git a/postmarker/models/messages.py → src/postmarker/models/messages.py b/postmarker/models/messages.py → src/postmarker/models/messages.py
diff --git a/postmarker/models/senders.py → src/postmarker/models/senders.py b/postmarker/models/senders.py → src/postmarker/models/senders.py
diff --git a/postmarker/models/server.py → src/postmarker/models/server.py b/postmarker/models/server.py → src/postmarker/models/server.py
diff --git a/postmarker/models/stats.py → src/postmarker/models/stats.py b/postmarker/models/stats.py → src/postmarker/models/stats.py
diff --git a/postmarker/models/status.py → src/postmarker/models/status.py b/postmarker/models/status.py → src/postmarker/models/status.py
diff --git a/postmarker/models/templates.py → src/postmarker/models/templates.py b/postmarker/models/templates.py → src/postmarker/models/templates.py
diff --git a/postmarker/models/triggers.py → src/postmarker/models/triggers.py b/postmarker/models/triggers.py → src/postmarker/models/triggers.py
diff --git a/postmarker/pytest.py → src/postmarker/pytest.py b/postmarker/pytest.py → src/postmarker/pytest.py
diff --git a/postmarker/tornado.py → src/postmarker/tornado.py b/postmarker/tornado.py → src/postmarker/tornado.py
diff --git a/postmarker/utils.py → src/postmarker/utils.py b/postmarker/utils.py → src/postmarker/utils.py
diff --git a/test/conftest.py b/test/conftest.py
@@ -15,7 +15,7 @@
 
 DEFAULT_SERVER_TOKEN = "SERVER_TOKEN"
 DEFAULT_ACCOUNT_TOKEN = "ACCOUNT_TOKEN"
-CASSETTE_DIR = "tests/cassettes/"
+CASSETTE_DIR = "test/cassettes/"
 SERVER_TOKEN = os.environ.get("SERVER_TOKEN", DEFAULT_SERVER_TOKEN)
 ACCOUNT_TOKEN = os.environ.get("ACCOUNT_TOKEN", DEFAULT_ACCOUNT_TOKEN)
 

diff --git a/test/django/test_backend.py b/test/django/test_backend.py
@@ -1,4 +1,3 @@
-import sys
 from contextlib import contextmanager
 from unittest.mock import patch
 
@@ -177,16 +176,10 @@ def test_send_mail_with_attachment(postmark_request, message):
 def test_text_html_alternative_and_pdf_attachment_failure(postmark_request, message):
     """Send a text body, HTML alternative, and PDF attachment."""
     message.attach_alternative("<html></html>", "text/html")
-    if sys.version_info[:2] == (3, 2):
-        content = b"PDF-File-Contents"
-    else:
-        content = "PDF-File-Contents"
+    content = "PDF-File-Contents"
     message.attach("hello.pdf", content, "application/pdf")
     message.send(fail_silently=False)
-    if sys.version_info[0] < 3:
-        encoded_content = "UERGLUZpbGUtQ29udGVudHM="
-    else:
-        encoded_content = "UERGLUZpbGUtQ29udGVudHM=\n"
+    encoded_content = "UERGLUZpbGUtQ29udGVudHM=\n"
     assert postmark_request.call_args[1]["json"][0] == {
         "Attachments": [
             {
@@ -211,12 +204,8 @@ def test_text_html_alternative_and_pdf_attachment_failure(postmark_request, mess
 
 
 def test_message_rfc822(postmark_request, message):
-    if sys.version_info[:2] == (3, 2):
-        message_content = b"Fake message"
-        expected_content = "RmFrZSBtZXNzYWdl\n"
-    else:
-        message_content = "Fake message"
-        expected_content = "RmFrZSBtZXNzYWdl"
+    message_content = "Fake message"
+    expected_content = "RmFrZSBtZXNzYWdl"
     message.attach_alternative(message_content, "message/rfc822")
     message.send(fail_silently=False)
     assert postmark_request.call_args[1]["json"][0] == {

diff --git a/test/models/test_emails.py b/test/models/test_emails.py
@@ -1,5 +1,4 @@
 import os
-import sys
 from email import encoders
 from email.mime.base import MIMEBase
 from email.mime.image import MIMEImage
@@ -19,12 +18,12 @@ def get_attachment_path(filename):
 
 ATTACHMENT = {
     "Name": "readme.txt",
-    "Content": "dGVzdCBjb250ZW50",
+    "Content": "dGVzdCBjb250ZW50Cg==",
     "ContentType": "text/plain",
 }
 TUPLE_ATTACHMENT = ATTACHMENT["Name"], ATTACHMENT["Content"], ATTACHMENT["ContentType"]
 MIME_ATTACHMENT = MIMEBase("text", "plain")
-MIME_ATTACHMENT.set_payload("dGVzdCBjb250ZW50")
+MIME_ATTACHMENT.set_payload("dGVzdCBjb250ZW50Cg==")
 MIME_ATTACHMENT.add_header("Content-Disposition", "attachment", filename="readme.txt")
 PATH_ATTACHMENT = get_attachment_path("readme.txt")
 
@@ -63,12 +62,7 @@ def get_mime_message(text, html_text=None, **kwargs):
 
 MIME_MESSAGE = get_mime_message("Text", **DEFAULT_HEADERS)
 MIME_ALTERNATIVE = get_mime_message("Text", "HTML content", **DEFAULT_HEADERS)
-
-if sys.version_info[0] < 3:
-    ENCODED_CONTENT = "dGVzdCBjb250ZW50"
-else:
-    ENCODED_CONTENT = "dGVzdCBjb250ZW50\n"
-
+ENCODED_CONTENT = "dGVzdCBjb250ZW50\n"
 
 IMAGE = MIMEImage(b"test content", "png", name="image1.png")
 IMAGE.add_header("Content-ID", "<[email protected]>")
@@ -280,13 +274,13 @@ def test_attach_unknown_content_type(self, email, postmark_request):
         assert postmark_request.call_args[1]["json"]["Attachments"] == [
             {
                 "Name": "report.blabla",
-                "Content": "dGVzdCBjb250ZW50",
+                "Content": "dGVzdCBjb250ZW50Cg==",
                 "ContentType": "application/octet-stream",
             }
         ]
 
     def test_attach_binary(self, email, postmark_request):
-        email.attach_binary(b"test content", "readme.txt")
+        email.attach_binary(b"test content\n", "readme.txt")
         email.send()
         assert postmark_request.call_args[1]["json"]["Attachments"] == [ATTACHMENT]
 

diff --git a/test/test_pytest.py b/test/test_pytest.py
@@ -1,22 +1,6 @@
-import sys
-
-import pytest
-
 from postmarker.core import PostmarkClient
 
 
 def test_postmark_client(postmark_client, postmark_request):
     assert isinstance(postmark_client, PostmarkClient)
     assert postmark_client.mock is postmark_request
-
-
-@pytest.mark.skipif(sys.version_info[0] == 3, reason="Mock is required only for Python 2")
-def test_mock_not_installed():
-    sys.modules["mock"] = None
-    del sys.modules["postmarker._compat"]
-    del sys.modules["postmarker.pytest"]
-
-    from postmarker.pytest import postmark_request
-
-    with pytest.raises(AssertionError, matches="To use pytest fixtures on Python 2.*"):
-        list(postmark_request())
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-envlist = py{35,36,37,py3}
-skipsdist = True
+isolated_build = true
+envlist = py{35,36,37,py3},coverage-report
 
 [testenv]
 passenv =
@@ -18,10 +18,8 @@ deps =
     py35: Django>=1.10.0,<1.11.0
     py36: Django>=1.11.0,<2.0.0
     py37: Django>=2.1.0,<2.2.0
-usedevelop = True
 commands =
-    coverage run --source postmarker -m pytest --ds tests.django.settings {posargs:test}
-    coverage xml
+    coverage run --source postmarker -m pytest --ds test.django.settings {posargs:test}
 
 [testenv:record]
 deps =
@@ -31,3 +29,14 @@ deps =
     betamax_serializers
     Django
 commands = pytest --record {posargs:test}
+
+[testenv:coverage-report]
+description = Report coverage over all measured test runs.
+basepython = python3.7
+deps = coverage
+skip_install = true
+depends = py{35,36,37}
+commands =
+    coverage combine
+    coverage report
+    coverage xml -i {posargs:}