aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Diener <[email protected]>2018-01-29 15:10:28 +0100
committerLorenz Diener <[email protected]>2018-01-29 15:10:28 +0100
commit70de1eecb359b1acd46b6aab2518d6a013cb12f0 (patch)
tree90cac8ddf248533f37ee6f8a8178324fedbe9c38
parentc1a6772247a086f6e8b39b4b550a1fb22b67bf83 (diff)
downloadmastodon.py-70de1eecb359b1acd46b6aab2518d6a013cb12f0.tar.gz
Prepare release 1.2.2
-rw-r--r--CHANGELOG.rst9
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 22e7c24..f4fa6a7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@ A note on versioning: This librarys major version will grow with the APIs
2version number. Breaking changes will be indicated by a change in the minor 2version number. Breaking changes will be indicated by a change in the minor
3(or major) version number, and will generally be avoided. 3(or major) version number, and will generally be avoided.
4 4
5v1.2.2
6------
7* Several small bugfixes (thanks codl)
8* Mastodon v2.1.2 compatibility
9 * Added instance_activity()
10 * Added instance_peers()
11* Fixed StreamListener breaking when listening to more than one stream (again thanks, codl)
12 * POTENTIALLY BREAKING CHANGE: Remvoved handle_line, which should have been an internal helper to begin with
13
5v1.2.1 14v1.2.1
6------ 15------
7* Internal stability changes and fixes to streaming code 16* Internal stability changes and fixes to streaming code
diff --git a/docs/conf.py b/docs/conf.py
index d4b0e26..6653fea 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -68,7 +68,7 @@ author = u'Lorenz Diener'
68# The short X.Y version. 68# The short X.Y version.
69version = u'1.2' 69version = u'1.2'
70# The full version, including alpha/beta/rc tags. 70# The full version, including alpha/beta/rc tags.
71release = u'1.2.1' 71release = u'1.2.2'
72 72
73# The language for content autogenerated by Sphinx. Refer to documentation 73# The language for content autogenerated by Sphinx. Refer to documentation
74# for a list of supported languages. 74# for a list of supported languages.
diff --git a/setup.py b/setup.py
index c49f534..40e5428 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ extras = {
6} 6}
7 7
8setup(name='Mastodon.py', 8setup(name='Mastodon.py',
9 version='1.2.1', 9 version='1.2.2',
10 description='Python wrapper for the Mastodon API', 10 description='Python wrapper for the Mastodon API',
11 packages=['mastodon'], 11 packages=['mastodon'],
12 setup_requires=['pytest-runner'], 12 setup_requires=['pytest-runner'],
Powered by cgit v1.2.3 (git 2.41.0)