summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Socol <me@jamessocol.com>2014-01-03 02:02:58 -0500
committerJames Socol <me@jamessocol.com>2014-01-03 02:02:58 -0500
commit59e3e2e64a3009697502c6064da997268419921a (patch)
tree79fcbb2d9daed4d03930563e9f2e8b75a703a1c8
parent56e553055e7acb02fcdaeb56b598e5a8cce431b4 (diff)
downloadpystatsd-59e3e2e64a3009697502c6064da997268419921a.tar.gz
Version 2.1.
-rw-r--r--CHANGES6
-rw-r--r--docs/conf.py4
-rw-r--r--docs/configure.rst2
-rw-r--r--docs/timing.rst2
-rw-r--r--statsd/__init__.py2
-rw-r--r--statsd/_version.py3
6 files changed, 15 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index e7a276f..93af7b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
Statsd Changelog
================
+Version 2.1
+-----------
+
+- Add maxudpsize option for Pipelines.
+- Add methods to use Timer objects directly.
+
Version 2.0.3
-------------
diff --git a/docs/conf.py b/docs/conf.py
index c96ee5d..e0faa98 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2012, James Socol'
# built documents.
#
# The short X.Y version.
-version = '2.0'
+version = '2.1'
# The full version, including alpha/beta/rc tags.
-release = '2.0.3'
+release = '2.1.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/configure.rst b/docs/configure.rst
index 37354a1..752898a 100644
--- a/docs/configure.rst
+++ b/docs/configure.rst
@@ -51,6 +51,8 @@ will produce two different stats, ``foo.baz`` and ``bar.baz``. Without
the ``prefix`` argument, or with the same ``prefix``, two
``StatsClient`` instances will update the same stats.
+.. versionadded:: 2.0.3
+
``maxudpsize`` specifies the maximum packet size statsd will use. This is
an advanced options and should not be changed unless you know what you are
doing. Larger values then the default of 512 are generally deemed unsafe for use
diff --git a/docs/timing.rst b/docs/timing.rst
index da4e241..8608db0 100644
--- a/docs/timing.rst
+++ b/docs/timing.rst
@@ -74,6 +74,8 @@ be sent to the statsd server.
Using a Timer object directly
=============================
+.. versionadded:: 2.1
+
:py:class:`statsd.client.Timer` objects function as context managers and
as decorators, but they can also be used directly. (Flat is, after all,
better than nested.)
diff --git a/statsd/__init__.py b/statsd/__init__.py
index 6af74c5..4aa254c 100644
--- a/statsd/__init__.py
+++ b/statsd/__init__.py
@@ -16,7 +16,7 @@ except ImportError:
settings = None
from .client import StatsClient
-from ._version import __version__ # noqa
+from ._version import __version__, VERSION # noqa
__all__ = ['StatsClient', 'statsd']
diff --git a/statsd/_version.py b/statsd/_version.py
index e7c12d2..e2baefa 100644
--- a/statsd/_version.py
+++ b/statsd/_version.py
@@ -1 +1,2 @@
-__version__ = '2.0.3'
+VERSION = (2, 1, 0)
+__version__ = '.'.join(map(str, VERSION))