From 9b23fbc7476ca915b23a41cb6d3f9fc0b18507b7 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Wed, 25 Jul 2018 22:47:43 +0800
Subject: [PATCH] Prepare 1.7

---
 docs/changelog.rst    | 12 +++++++-----
 docs/conf.py          |  2 +-
 electrumx/__init__.py |  2 +-
 setup.py              |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 22bff13..9a59356 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,14 +7,16 @@
    and memory consumption whilst serving clients.  Those problems
    should not occur with Python 3.7.
 
-Version 1.7  (in progress)
+Version 1.7  (25 Jul 2018)
 ==========================
 
-Version 1.6.1  (in progress)
-============================
-
+* completely overhauled mempool and address notifications
+  implementation.  Cleaner and a lot more efficient, especially for
+  initial synchronization of the mempool.  Mempool handling is fully
+  asynchronous and doesn't hinder client responses or block
+  processing.
+* peer discovery cleaned up, more work remains
 * cleaner shutdown process with clear guarantees
-* cleaner mempool and notification handling
 * aiohttp min version requirement raised to 2.0
 * onion peers are ignored if no tor proxy is available
 * add Motion coin (ocruzv), MinexCoin (joesixpack)
diff --git a/docs/conf.py b/docs/conf.py
index 4066338..f5d9c79 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -15,7 +15,7 @@
 import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
-VERSION="ElectrumX 1.6"
+VERSION="ElectrumX 1.7"
 
 # -- Project information -----------------------------------------------------
 
diff --git a/electrumx/__init__.py b/electrumx/__init__.py
index 29fa6d5..24702bd 100644
--- a/electrumx/__init__.py
+++ b/electrumx/__init__.py
@@ -1,4 +1,4 @@
-version = 'ElectrumX 1.6d'
+version = 'ElectrumX 1.7'
 version_short = version.split()[-1]
 
 from electrumx.server.controller import Controller
diff --git a/setup.py b/setup.py
index aa44ad9..2f54368 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 import setuptools
-version = '1.6'
+version = '1.7'
 
 setuptools.setup(
     name='electrumX',