aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst6
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3e1e882..60a473e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,11 +2,11 @@ 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.0 (Preliminary) 5v1.2.0
6-------------------- 6------
7* BREAKING CHANGE: Renamed streaming functions to be more in line with the rest 7* BREAKING CHANGE: Renamed streaming functions to be more in line with the rest
8* POTENTIALLY BREAKING CHANGE: Added attribute-style access for returned dicts 8* POTENTIALLY BREAKING CHANGE: Added attribute-style access for returned dicts
9* 2.1.0 compatibility 9* Mastodon v2.1.0 compatibility
10 * Added custom_emojis() 10 * Added custom_emojis()
11 * Added list(), lists(), list_accounts() 11 * Added list(), lists(), list_accounts()
12 * Added list_create(), list_update(), list_delete() 12 * Added list_create(), list_update(), list_delete()
diff --git a/docs/conf.py b/docs/conf.py
index 7ee9605..aa645c8 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.0 (in development)' 71release = u'1.2.0'
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 0cc1be1..3dccfc6 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.1.2', 9 version='1.2.0',
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)