4 files changed, 15 insertions, 66 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6b5e832..f146ee5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,8 @@ A note on versioning: This librarys major version will grow with the APIs
 version number. Breaking changes will be indicated by a change in the minor
 (or major) version number, and will generally be avoided.  
 
-v1.8.0 (in progress)
---------------------
+v1.8.0
+------
 * Overall: Support level is now 3.5.5 (last before 4.0.0)
 * BREAKING CHANGE: Switch the base URL to None, throw an error when no base url is passed. Having mastosoc as default was sensible when there were only three mastodon servers. It is not sensible now and trips people up constantly.
 * GENERAL WARNING: Currently, Mastodon.py does not support the "new" filter system. In the future, it will, and it will respect filters by default (i.e. remove filtered posts).
@@ -11,7 +11,6 @@ v1.8.0 (in progress)
 * Added trending APIs (`trending_tags`, `trending_statuses`, `trending_links`, `admin_trending_tags`, `admin_trending_statuses`, `admin_trending_links`)
 * Added `lang` parameter and document what it does properly.
 * Added `category` and `rule_ids` to `reports`
-* This too isn't really a changelog entry but in the same vein as the last post, thank you Claire and Gargron for clarifying many things about the API when asked.
 * Made the documentation a bit neater (thanks dieseltravis)
 * Added the domain blocking admin API (`admin_domain_blocks`, `admin_domain_block`, `admin_update_domain_block`, `admin_delete_domain_block` - thanks catgoat)
 * Added the stats admin APIs (`admin_measures`, `admin_dimensions`, `admin_retention`)
@@ -20,11 +19,13 @@ v1.8.0 (in progress)
 * Added `account_remove_from_followers` API
 * Added `admin_accounts_v2` API
 * FUTURE BREAKING CHANGE WARNING: For now, `admin_accounts` still calls v1, but this may change in the future. You are encouraged to use v2 instead.
-* Make the version comparisons a bit nicer (thanks eumiro)
+* Made the version comparisons a bit nicer (thanks eumiro)
 * Switch to more recent modules for datetime and timezone stuff (thanks eumiro)
-* Substantially restructure the documentation, making it a lot nicer to read
-* Substantially restructure the code, making it hopefully a lot easier to maintain
+* Made the documentation a bit more consistent (thanks dieseltravis)
+* Substantially restructured the documentation, making it a lot nicer to read
+* Substantially restructured the code, making it hopefully a lot easier to maintain
     * This SHOULD NOT break anything. If this breaks your code, please let me know.
+* This too isn't really a changelog entry but in the same vein as the last post, thank you Claire and Gargron for clarifying many things about the API when asked.
 
 v1.7.0
 ------
diff --git a/TODO.md b/TODO.md
index 173662c..9fc3c70 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,68 +2,16 @@ API relevant changes since last release / "to implement" list:
 

 Refer to mastodon changelog and API docs for details when implementing, add or modify tests where needed

 

-3.1.3

------

-* [x] POST /api/v1/media → POST /api/v2/media (v1 deprecated)

-

-3.1.4

------

-* [x] Add ability to exclude local content from federated timeline

-* [x] Add ability to exclude remote content from hashtag timelines in web UI

-* [x] Add invites_enabled attribute to GET /api/v1/instance in REST API

-

-3.2.0

------

-* [x] Add personal notes for accounts

-* [x] Add customizable thumbnails for audio and video attachments

-* [x] Add color extraction for thumbnails

-

-3.3.0

------

-* [x] Add option to be notified when a followed user posts

-* [x] Add duration option to the mute function

-* [postponed to 4.0 because that's when the official docs say it starts existing as an API] Add ability to block access or limit sign-ups from chosen IPs

-* [postponed - need websocket support first] Add support for managing multiple stream subscriptions in a single connection

-* [x] Add support for limiting results by both min_id and max_id at the same time in REST API

-* [x] Add GET /api/v1/accounts/:id/featured_tags to REST API

-

-3.4.0

------

-* [x] Add server rules

-* [x] Add POST /api/v1/emails/confirmations to REST API

-* [x] Add GET /api/v1/accounts/lookup to REST API

-* [x] Add policy param to POST /api/v1/push/subscriptions in REST API

-* [x] Add details to error response for POST /api/v1/accounts in REST API

-

-3.4.2

------

-* [postpone to later] Add configuration attribute to GET /api/v1/instance

-

-3.5.0

------

-* [x] Add support for incoming edited posts

-* [x] Add notifications for posts deleted by moderators <- by email. not actually API relevant.

-* [x] Add explore page with trending posts and links

-* [x] Add graphs and retention metrics to admin dashboard

-* [x] Add GET /api/v1/accounts/familiar_followers to REST API

-* [x] Add POST /api/v1/accounts/:id/remove_from_followers to REST API

-* [x] Add category and rule_ids params to POST /api/v1/reports IN REST API

-* [x] Add global lang param to REST API

-* [x] Add types param to GET /api/v1/notifications in REST API

-* [x] Add notifications for moderators about new sign-ups

-* [x] v2 admin account api

-

-3.5.3

------

-* [later with tool to update dicts] Add limited attribute to accounts in REST API

-

 4.0.0 and beyond

 ----------------

 ? ? ? ?

 

-General improvements that would be good to do before doing another release:

-* [ ] Split mastodon.py into parts in some way that makes sense, it's getting very unwieldy

+General improvements that would be good to do before doing another release

+--------------------------------------------------------------------------

+* [x] Split mastodon.py into parts in some way that makes sense, it's getting very unwieldy

 * [x] Fix the CI

 * [ ] Get test coverage like, real high

 * [x] Add all those streaming events??

 * [ ] Document return values (skipping this for a bit to then do it at the end with tooling)

+    * [ ] Do this with models properly, that would be cool as heck

+* [ ] Add links to mastodon docs to entities and endpoints
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index c3ded5e..55a6944 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,9 +66,9 @@ author = u'Lorenz Diener'
 # built documents.
 #
 # The short X.Y version.
-version = u'1.7'
+version = u'1.8'
 # The full version, including alpha/beta/rc tags.
-release = u'1.7.0'
+release = u'1.8.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 0bd182d..735b582 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ extras = {
 }
 
 setup(name='Mastodon.py',
-      version='1.7.0',
+      version='1.8.0',
       description='Python wrapper for the Mastodon API',
       packages=['mastodon'],
       install_requires=[