Merge branch 'cleanup'

Author: georgemarshall

.coveragerc

@@ -0,0 +1,15 @@
+[run]
+branch = True
+source = telesign
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    docs/*
+    examples/*
+    tests/*

.gitignore

@@ -1,13 +1,18 @@
-*.egg-info/
-*.pyc
-*.zip
-dist/*
-_build
+# general things to ignore
+.eggs/
+.tox/
 .coverage
-*.swp
+build/
+dist/
+*.egg-info/
+*.egg
+*.py[cod]
+__pycache__/
+*.so
+*~
 
-# PyCharm IDE
-.idea
+# intelliJ IDE
+.idea/
 
 # Other
 .DS_Store

.travis.yml

@@ -1,15 +1,25 @@
+---
 language: python
+sudo: false
+cache: pip
+matrix:
+  allow_failures:
+    - python: nightly
 python:
   - "2.6"
   - "2.7"
   - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
-install:
-  - pip install .
-script: nosetests --with-coverage --cover-package=telesign --cover-inclusive
+  - "nightly"
 before_install:
-  - pip install nose mock pytz coverage codecov
+  - pip install --quiet codecov
+install:
+  # Install deps with pip so they are cached
+  - pip install --quiet nose pytz requests
+  - python setup.py -q install
+script:
+  - coverage run setup.py -v test
 after_success:
   - codecov

LICENSE LICENSE.txtLICENSE renamed to LICENSE.txt

@@ -1,4 +1,4 @@
-include *.py
-include *.txt
-include *.rst
-include MANIFEST.in
+include LICENSE.txt
+include README.rst
+graft examples
+graft tests

MANIFEST.in

@@ -0,0 +1,2 @@
+[wheel]
+universal = 1

setup.cfg

@@ -1,23 +1,32 @@
+import sys
+from codecs import open
+from os import path
+
 from setuptools import setup, find_packages
 
+EXCLUDE_FROM_PACKAGES = ['tests']
+
+needs_mock = sys.version_info < (3, 3)
+mock = ['mock'] if needs_mock else []
+
+here = path.abspath(path.dirname(__file__))
+
 version = "2.2.1"
 
-try:
-    with open("README") as f:
-        readme_content = f.read()
-except (IOError, Exception):
-    readme_content = ""
+with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
 
 setup(name='telesign',
       version=version,
-      description="Telesign SDK",
-      license="MIT License",
+      description="TeleSign SDK",
+      license="MIT",
       classifiers=[
           "Development Status :: 5 - Production/Stable",
           "Intended Audience :: Developers",
           "License :: OSI Approved :: MIT License",
           "Natural Language :: English",
           "Programming Language :: Python",
+          "Programming Language :: Python :: 2",
           "Programming Language :: Python :: 2.6",
           "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
@@ -26,12 +35,13 @@
           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
       ],
-      long_description=readme_content,
+      long_description=long_description,
       keywords='telesign, sms, voice, mobile, authentication, identity, messaging',
       author='TeleSign Corp.',
       author_email='support@telesign.com',
       url="https://github.com/telesign/python_telesign",
       install_requires=['requests'],
-      tests_require=['nose', 'mock', 'pytz', 'coverage', 'codecov'],
-      packages=find_packages(exclude=['test', 'test.*', 'examples', 'examples.*']),
+      test_suite='nose.collector',
+      tests_require=['nose', 'pytz'] + mock,
+      packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
       )

setup.py

@@ -1,12 +1,17 @@
 from __future__ import unicode_literals
 
-from unittest import TestCase
+import sys
 from email.utils import parsedate_tz
+from unittest import TestCase
 from uuid import UUID
-from mock import Mock, patch
 
 from telesign.rest import RestClient
 
+if sys.version_info < (3, 3):
+    from mock import Mock, patch
+else:
+    from unittest.mock import Mock, patch
+
 
 class TestRest(TestCase):
     def setUp(self):