From 65ad7eabd35c9f2b64d2cfdf5593d56403734b85 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jun 2020 07:45:33 +0530
Subject: [PATCH] version 4.18.0

---
 Changelog.yaml           | 52 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 13a9a0e422..758f16d9f3 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,58 @@
 #   new recipes:
 #     - title:
 
+- version: 4.18.0
+  date: 2020-06-05
+
+  new features:
+    - title: "Viewer: Search panel: Add a button to return to the position the book was at before doing a search."
+      tickets: [1879889]
+
+    - title: "Tag browser: Improve handling of hierarchical tags"
+      description: "Renaming a tag now renames it and all its children. Drag and drop of hierarchical tags alters their hierarchy. Deleting a tag now deletes all its children."
+      tickets: [1880264]
+
+    - title: "Viewer: In flow mode, implement drag scrolling."
+      tickets: [1880707]
+
+    - title: "Tag browser: Allow Manage Tags to open to a selected letter when clicking on a letter."
+      tickets: [1880175]
+
+    - title: "Viewer: Show number of search results in title of search panel."
+      tickets: [1881792]
+
+    - title: "Content server: In the book list hovering over the library name now shows the total number of books in the library."
+      tickets: [1881384]
+
+  bug fixes:
+    - title: "Fix a regression in the previous release that broke the copy and recalculate author sort buttons."
+      tickets: [1880395]
+
+    - title: "Book details: Fix extra margin to the right of the metadata fields."
+      tickets: [1881488]
+
+    - title: "Cover grid: Show text under books that have no cover as well."
+      tickets: [1880558]
+
+    - title: "When merging metadata, if a custom column has type multiple in the new data and some other type in the old data, ignore the old data instead of failing"
+      tickets: [1881796]
+
+    - title: "macOS: When using the single instance option of the viewer, crashes should not require a restart of the computer to use the viewer again."
+      tickets: [1881375]
+
+    - title: "Windows: Fix an error when changing title/author for books in a library whose name contains characters not encodeable in the current code page"
+
+    - title: "Windows: Fix amazon metadata download failing when accented characters in search query"
+      tickets: [1880300]
+
+    - title: "Comments editor: Fix shortcuts for bold/italic not working when toolbars are hidden"
+
+  improved recipes:
+    - The Hindu
+    - Wired Daily Edition
+    - The Economist
+
+
 - version: 4.17.0
   date: 2020-05-23
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 04e47e2abd..fc203cb407 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -6,7 +6,7 @@ from polyglot.builtins import map, unicode_type, environ_item, hasenv, getenv, a
 import sys, locale, codecs, os, importlib, collections
 
 __appname__   = 'calibre'
-numeric_version = (4, 17, 0)
+numeric_version = (4, 18, 0)
 __version__   = '.'.join(map(unicode_type, numeric_version))
 git_version   = None
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"