From 43ae15c0d14b3e968e8d5bfef72ac0c39783c3a2 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Sat, 14 Apr 2018 08:36:10 -0700
Subject: [PATCH] Releasing v0.18 - support for units!

Refs #203
---
 datasette/version.py |  2 +-
 docs/changelog.rst   | 50 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/datasette/version.py b/datasette/version.py
index 1fc5c35b..514c36de 100644
--- a/datasette/version.py
+++ b/datasette/version.py
@@ -1,2 +1,2 @@
-__version_info__ = (0, 17)
+__version_info__ = (0, 18)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 36df0120..f5284f8a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,56 @@
 Changelog
 =========
 
+0.18 (2018-04-14)
+-----------------
+
+This release introduces `support for units <http://datasette.readthedocs.io/en/latest/metadata.html#specifying-units-for-a-column>`_,
+contributed by Russ Garrett (`#203 <https://github.com/simonw/datasette/issues/203>`_).
+You can now optionally specify the units for specific columns using ``metadata.json``.
+Once specified, units will be displayed in the HTML view of your table. They also become
+available for use in filters - if a column is configured with a unit of distance, you can
+request all rows where that column is less than 50 meters or more than 20 feet for example.
+
+- Link foreign keys which don't have labels. [Russ Garrett]
+
+  This renders unlabeled FKs as simple links.
+
+  Also includes bonus fixes for two minor issues:
+
+  * In foreign key link hrefs the primary key was escaped using HTML
+    escaping rather than URL escaping. This broke some non-integer PKs.
+  * Print tracebacks to console when handling 500 errors.
+
+- Fix SQLite error when loading rows with no incoming FKs. [Russ
+  Garrett]
+
+  This fixes ``ERROR: conn=<sqlite3.Connection object at 0x10bbb9f10>, sql
+  = 'select ', params = {'id': '1'}`` caused by an invalid query when
+  loading incoming FKs.
+
+  The error was ignored due to async but it still got printed to the
+  console.
+
+- Allow custom units to be registered with Pint. [Russ Garrett]
+- Support units in filters. [Russ Garrett]
+- Tidy up units support. [Russ Garrett]
+
+  * Add units to exported JSON
+  * Units key in metadata skeleton
+  * Docs
+
+- Initial units support. [Russ Garrett]
+
+  Add support for specifying units for a column in ``metadata.json`` and
+  rendering them on display using
+  `pint <https://pint.readthedocs.io/en/latest/>`_
+
+
+0.17 (2018-04-13)
+-----------------
+- Release 0.17 to fix issues with PyPI
+
+
 0.16 (2018-04-13)
 -----------------
 - Better mechanism for handling errors; 404s for missing table/database