Remove py_release_tools, use flake8

5 files changed, 42 insertions, 10 deletions

diff --git a/pandora/__init__.py b/pandora/__init__.py
index 0de5cfe..bd2fe63 100644
--- a/pandora/__init__.py
+++ b/pandora/__init__.py
@@ -9,5 +9,5 @@ API Spec from: http://6xq.net/playground/pandora-apidoc/
 Keys at: http://6xq.net/playground/pandora-apidoc/json/partners/#partners
 """
 
-from .client import BaseAPIClient, APIClient
-from .transport import APITransport, Encryptor, DEFAULT_API_HOST
+from .client import BaseAPIClient, APIClient  # noqa: F401
+from .transport import APITransport, Encryptor, DEFAULT_API_HOST  # noqa: F401
diff --git a/pandora/errors.py b/pandora/errors.py
index d28a60f..b09e813 100644
--- a/pandora/errors.py
+++ b/pandora/errors.py
@@ -97,7 +97,7 @@ class PandoraException(Exception):
 PandoraException.export_exceptions(locals())
 
 
-class InvalidUserLogin(InvalidPartnerLogin):
+class InvalidUserLogin(InvalidPartnerLogin):  # noqa: F821
     """Pydora Internal Login Error
 
     This is thrown around a user login to disambiguate a login that is invalid
diff --git a/pandora/py2compat.py b/pandora/py2compat.py
index 844ea59..d83f8c5 100644
--- a/pandora/py2compat.py
+++ b/pandora/py2compat.py
@@ -20,9 +20,9 @@ except ImportError:
 
 # Only used in tests
 try:
-    from unittest.mock import Mock, MagicMock, call, patch
+    from unittest.mock import Mock, MagicMock, call, patch  # noqa: F401
 except ImportError:
     try:
-        from mock import Mock, MagicMock, call, patch
+        from mock import Mock, MagicMock, call, patch  # noqa: F401
     except ImportError:
         pass
diff --git a/setup.cfg b/setup.cfg
index 1e9a16c..449b4b1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,5 @@ universal = 1
 universal = 1
 
 [aliases]
-validate = cover_tests pep8
-release = validate increment_semver git_push sdist bdist_wheel upload
-release_major = validate increment_semver -M git_push sdist bdist_wheel upload
-release_minor = validate increment_semver -m git_push sdist bdist_wheel upload
+release = test flake8
+validate = release
diff --git a/setup.py b/setup.py
index 91fa006..715794b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,34 @@
 #!/usr/bin/env python
 
+from setuptools.command.test import test
 from setuptools import setup, find_packages
 
+
+class TestsWithCoverage(test):
+
+    description = "run unit tests with coverage"
+
+    def run(self):
+        # Must install test_requires before importing coverage
+        self.install_dists(self.distribution)
+
+        from coverage import coverage
+
+        cov = coverage(data_file=".coverage", branch=True,
+                       source=self.distribution.packages)
+        cov.start()
+
+        # Unittest calls exit prior to python 3. How naughty
+        try:
+            super(TestsWithCoverage, self).run()
+        except SystemExit:
+            pass
+
+        cov.stop()
+        cov.xml_report(outfile="coverage.xml")
+        cov.html_report()
+
+
 setup(
     name="pydora",
     version="1.8.0",
@@ -12,9 +39,16 @@ setup(
     url="https://github.com/mcrute/pydora",
     test_suite="tests.discover_suite",
     packages=find_packages(exclude=["tests", "tests.*"]),
+    cmdclass={
+        "test": TestsWithCoverage,
+    },
     setup_requires=[
-        "py_release_tools",
         "wheel",
+        "flake8>=3.3",
+    ],
+    tests_require=[
+        "mock>=1.0",
+        "coverage>=4.0",
     ],
     install_requires=[
         "pycrypto>=2.6.1",