Merge branch 'master' into MOBILE-9146-add-statsd-tcp

.travis.yml

@@ -3,7 +3,10 @@ python:
 - 2.7
 - 3.4
 - 3.5
+- 3.6
+- 3.7-dev
 - pypy
+- pypy3
 before_install:
 - pip install nose coverage codecov
 - pip install -r requires/testing.txt
@@ -22,4 +25,4 @@ deploy:
     tags: true
     distributions: sdist bdist_wheel
     all_branches: true
-    python: 3.4
+    python: 3.6

README.rst

@@ -1,10 +1,18 @@
 sprockets.mixins.metrics
 ========================
+
+|Version| |Status| |Coverage| |License|
+
 Adjust counter and timer metrics in `InfluxDB`_ or `StatsD`_ using the same API.
 
 The mix-in is configured through the ``tornado.web.Application`` settings
 property using a key defined by the specific mix-in.
 
+Documentation
+-------------
+https://sprocketsmixinsmetrics.readthedocs.io
+
+
 Statsd Mixin
 ------------
 
@@ -157,3 +165,16 @@ Development Quickstart
 
 .. _StatsD: https://github.com/etsy/statsd
 .. _InfluxDB: https://influxdata.com
+
+
+.. |Version| image:: https://img.shields.io/pypi/v/sprockets_mixins_metrics.svg
+   :target: https://pypi.python.org/pypi/sprockets_mixins_metrics
+
+.. |Status| image:: https://img.shields.io/travis/sprockets/sprockets.mixins.metrics.svg
+   :target: https://travis-ci.org/sprockets/sprockets.mixins.metrics
+
+.. |Coverage| image:: https://img.shields.io/codecov/c/github/sprockets/sprockets.mixins.metrics.svg
+   :target: https://codecov.io/github/sprockets/sprockets.mixins.metrics?branch=master
+
+.. |License| image:: https://img.shields.io/pypi/l/sprockets_mixins_metrics.svg
+   :target: https://github.com/sprockets/sprockets.mixins.metrics/blob/master/LICENSE

docs/history.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+`3.1.0`_ (20-Jul-2018)
+----------------------
+- Add TCP support to StatsD
+
 `3.0.4`_ (31-Jan-2018)
 ----------------------
 - Loosen Tornado pin to include 4.4.
@@ -72,7 +76,8 @@ Release History
 - Add :class:`sprockets.mixins.metrics.InfluxDBMixin`
 - Add :class:`sprockets.mixins.metrics.influxdb.InfluxDBConnection`
 
-.. _Next Release: https://github.com/sprockets/sprockets.mixins.metrics/compare/3.0.4...master
+.. _Next Release: https://github.com/sprockets/sprockets.mixins.metrics/compare/3.1.0...master
+.. _3.1.0: https://github.com/sprockets/sprockets.mixins.metrics/compare/3.0.4...3.1.0
 .. _3.0.4: https://github.com/sprockets/sprockets.mixins.metrics/compare/3.0.3...3.0.4
 .. _3.0.3: https://github.com/sprockets/sprockets.mixins.metrics/compare/3.0.2...3.0.3
 .. _3.0.2: https://github.com/sprockets/sprockets.mixins.metrics/compare/3.0.1...3.0.2

requires/development.txt

@@ -1,3 +1,3 @@
 -r testing.txt
-coverage==4.5.1
+coverage>=4.5,<5
 Sphinx

requires/testing.txt

@@ -1,3 +1,3 @@
-mock>=1.0.1,<2
+mock>=2,<3
 nose>=1.3,<2
 tornado>=4.2,<4.3

setup.cfg

@@ -1,5 +1,6 @@
 [bdist_wheel]
 universal = 1
+
 [nosetests]
 cover-package = sprockets.mixins.metrics
 cover-branches = 1

setup.py

@@ -50,6 +50,8 @@ setuptools.setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Internet :: WWW/HTTP',

sprockets/mixins/metrics/__init__.py

@@ -1,3 +1,3 @@
-version_info = (3, 0, 4)
+version_info = (3, 1, 0)
 __version__ = '.'.join(str(v) for v in version_info)
 __all__ = ['__version__', 'version_info']

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,pypy
+envlist = py27,py34,py35,py36,py37,pypy2,pypy3
 indexserver =
 	default = https://pypi.python.org/simple
 toxworkdir = build/tox