diff --git a/CHANGELOG.md b/CHANGELOG.md index ec44b09bfa2871a8aba2ac95a3e44aa359470b17..ccb269826f8947a9c17653a6441276dbb8934465 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # v2.1.10 -* _TBA_ +* added [metrics](satella/instrumentation/metrics) +* [documentation](https://satella.readthedocs.io/en/develop/) improved # v2.1.9 diff --git a/docs/conf.py b/docs/conf.py index 654fa5c0a55ced5256dab1fccfee268198e70daf..3a7e1863de18430ff5ae19cb65a49ce40189a0c5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,7 +51,7 @@ master_doc = 'index' # General information about the project. project = u'satella' -copyright = u'2017-2018, Piotr MaĹlanka' +copyright = u'2017-2019, Piotr MaĹlanka' author = u'Piotr MaĹlanka' # The version info for the project you're documenting, acts as replacement for diff --git a/docs/index.rst b/docs/index.rst index 453d3b89168e0981f2337c5dfcd2ca1f98e22c6d..a47ed1cebc7de8ab8ab8f8760bd0f3e2c1a12089 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -5,14 +5,15 @@ Welcome to satella's documentation! :maxdepth: 2 :caption: Contents: - coding/monitor - coding/debug - coding/typechecking - coding/structures - instrumentation/traceback - instrumentation/metrics - source/modules - posix + coding/monitor + coding/debug + coding/typechecking + coding/structures + instrumentation/traceback + instrumentation/metrics + source/modules + posix + recipes Indices and tables diff --git a/docs/instrumentation/metrics.md b/docs/instrumentation/metrics.rst similarity index 99% rename from docs/instrumentation/metrics.md rename to docs/instrumentation/metrics.rst index 2118fccb1ae436c998aaa561793023eb3ebf7534..9440cd8feceeb4afe55e4ed73d2ccf9765e3cc53 100644 --- a/docs/instrumentation/metrics.md +++ b/docs/instrumentation/metrics.rst @@ -1,3 +1,6 @@ +Metrics +------- + Metrics and instruments are a system to output real-time statistics. Metrics are defined and meant to be used in a similar way diff --git a/satella/__init__.py b/satella/__init__.py index 1617bb15a5b029f31a46f28daa375faf990a1ef4..861666c6e09c7dc3a813cc7384bef69d4d0ffd09 100644 --- a/satella/__init__.py +++ b/satella/__init__.py @@ -1,3 +1,3 @@ # coding=UTF-8 -__version__ = '2.1.10a5' +__version__ = '2.1.10rc1' diff --git a/setup.cfg b/setup.cfg index dc321ce6b880d3d1c316e6c65d2d00144602e513..a4f1ae15314f877de1e56b0a1a4213efbf2d171f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,7 +10,7 @@ author_email = piotrm@smok.co description = Utilities for writing servers in Python url = https://github.com/piotrmaslanka/satella project-urls = - Documentation = https://satella.readthedocs.io/ + Documentation = https://satella.readthedocs.io/en/develop/ classifier = Programming Language :: Python Programming Language :: Python :: 3.5