Merge branch 'update-deps'

* update-deps:
  Make setup.py not depend on the code being set up
  Update import logic to better work with python 3
  Update author email
  Fix python lint issues
  Move requirements definitions around
  Add coverage package
  Delete tox, codecov, codeclimate-test-reporter

.codeclimate.yml

@@ -12,5 +12,4 @@ engines:
     enabled: true
 ratings:
   paths:
-    - "tests"
     - "mailgun2"

.coveragerc

@@ -0,0 +1,4 @@
+[run]
+source=.
+omit =
+  setup.py

mailgun2/__init__.py

@@ -1,9 +1,5 @@
-__title__ = 'mailgun2'
-__version__ = '1.1.0'
-__author__ = 'Albert Wang'
-__license__ = 'Apache 2.0'
+from __future__ import absolute_import
 
-try:
-    from .mailgun import Mailgun
-except:
-    pass
+from .__version__ import __version__  # noqa: F401
+
+from .mailgun import Mailgun  # noqa: F401

mailgun2/__version__.py

@@ -0,0 +1,3 @@
+VERSION = (1, 1, 0)
+
+__version__ = '.'.join(map(str, VERSION))

mailgun2/mailgun.py

@@ -145,4 +145,9 @@ def verify_authenticity(self, token, timestamp, signature):
     def validate(self, address):
         params = {'address': address}
         auth = ('api', self.public_key)
-        return self.get('/address/validate', params=params, auth=auth, include_domain=False)
+        return self.get(
+            '/address/validate',
+            params=params,
+            auth=auth,
+            include_domain=False,
+        )

tests/mailgun.py → mailgun2/tests/mailgun.py

@@ -1,9 +1,10 @@
+from __future__ import absolute_import
 import os
 import unittest
 
-from mock import patch, MagicMock
+from mock import patch
 
-import mailgun2
+from .. import Mailgun
 
 
 class MailgunTestBase(unittest.TestCase):
@@ -12,7 +13,11 @@ def setUp(self):
         self.public_key = 'test_public_key'
         self.private_key = 'test_private_key'
         self.domain = 'test.domain'
-        self.mailgun = mailgun2.Mailgun(self.domain, self.public_key, self.private_key)
+        self.mailgun = Mailgun(
+            self.domain,
+            self.public_key,
+            self.private_key,
+        )
         self.post_patcher = patch('mailgun2.mailgun.requests.post')
         self.mock_post = self.post_patcher.start()
 
@@ -90,7 +95,7 @@ def test_headers(self):
 
     def test_inlines_attachments(self):
         current_path = os.path.abspath(os.path.dirname(__file__))
-        license_file = current_path + '/../LICENSE'
+        license_file = current_path + '/../../LICENSE'
         self.mailgun.send_message(
             'from@example.com',
             'to@example.com',

requirements-test.txt

@@ -0,0 +1,5 @@
+# Testing
+coverage==5.0.3                  # Test coverage
+flake8==3.7.9                    # Python linting
+mock==3.0.5                      # Test mocking and patching
+mypy==0.761                      # Static typing

setup.py

@@ -1,38 +1,42 @@
 #!/usr/bin/env python
-from setuptools import setup
-import mailgun2
+# -*- coding: utf-8 -*-
 
-try:
-    readme = open("README.rst")
-    long_description = str(readme.read())
-finally:
-    readme.close()
+from setuptools import setup, find_packages
+from codecs import open
+from os import path
+
+
+# Get the long description from the README file
+here = path.abspath(path.dirname(__file__))
+with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
+about = {}
+with open(path.join(here, 'mailgun2', '__version__.py')) as f:
+    exec(f.read(), about)
 
-download_url = ("https://github.com/albertyw/python-mailgun2/"
-                "archive/%s.tar.gz") % mailgun2.__version__
 
 setup(
-    name=mailgun2.__title__,
-    packages=[mailgun2.__title__],
-    version=mailgun2.__version__,
+    name='mailgun2',
+    packages=find_packages(exclude=['tests']),
+    version=about['__version__'],
     description='A python client for Mailgun API v2',
     long_description=long_description,
-    author=mailgun2.__author__,
-    author_email='albertyw@mit.edu',
+    author='Albert Wang',
+    author_email='git@albertyw.com',
     url='https://github.com/albertyw/python-mailgun2',
-    download_url=download_url,
     keywords=['mailgun', 'email'],
     install_requires=[
-        'requests>=2.6',
+        'requests>=2.6,<3.0',
     ],
     license='Apache',
-    test_suite="tests",
-    tests_require=[
-        'codecov>=1.6',
-        'mock>=0.8',
-        'codeclimate-test-reporter',
-        'tox>=2.3'
-    ],
+    test_suite="mailgun2.tests",
+    # testing requires flake8 and coverage but they're listed separately
+    # because they need to wrap setup.py
+    extras_require={
+        'dev': [],
+        'test': [],
+    },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',