Merge branch 'develop' into timer_itself_context_manager

Author: wolph

docs/requirements.txt

@@ -0,0 +1 @@
+-e.[docs,tests]

setup.cfg

@@ -25,3 +25,6 @@ universal = 1
 [flake8]
 ignore = W391
 exclude = docs/*,statsd/compat.py
+
+[upload]
+sign = 1

setup.py

@@ -7,20 +7,35 @@
 else:
     long_description = 'See http://pypi.python.org/pypi/python-statsd/'
 
-setuptools.setup(
-    name=statsd.__package_name__,
-    version=statsd.__version__,
-    author=statsd.__author__,
-    author_email=statsd.__author_email__,
-    description=statsd.__description__,
-    url=statsd.__url__,
-    license='BSD',
-    packages=setuptools.find_packages(exclude=('tests',)),
-    long_description=long_description,
-    test_suite='nose.collector',
-    tests_require=['nose', 'mock', 'coverage'],
-    classifiers=[
-        'License :: OSI Approved :: BSD License',
-    ],
-)
+tests_require = [
+    'nose',
+    'coverage',
+    'mock',
+]
+
+docs_require = [
+    'changelog',
+    'sphinx>=1.5.0',
+]
+
+if __name__ == '__main__':
+    setuptools.setup(
+        name=statsd.__package_name__,
+        version=statsd.__version__,
+        author=statsd.__author__,
+        author_email=statsd.__author_email__,
+        description=statsd.__description__,
+        url=statsd.__url__,
+        license='BSD',
+        packages=setuptools.find_packages(exclude=('docs', 'tests',)),
+        long_description=long_description,
+        test_suite='nose.collector',
+        classifiers=[
+            'License :: OSI Approved :: BSD License',
+        ],
+        extras_require={
+            'docs': docs_require,
+            'tests': tests_require,
+        },
+    )
 

tests/conftest.py

@@ -0,0 +1 @@
+-e.[tests]

tests/requirements.txt

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py34, py35, pypy, pypy3, flake8, docs
+envlist = py27, py33, py34, py35, py36, pypy, flake8, docs
 skip_missing_interpreters = True
 
 [testenv]
@@ -13,8 +13,9 @@ commands =
     nosetests --with-coverage --cover-min-percentage=100
 
 [testenv:flake8]
+basepython = python2.7
 deps = flake8
-commands = flake8 --ignore=W391 statsd
+commands = flake8 --ignore=W391 {toxinidir}/statsd {toxinidir}/tests
 
 [testenv:docs]
 deps = sphinx