From 6915fbcce24d03d7e7fbcb901c18be84b5568a9d Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Wed, 13 Apr 2022 15:51:48 -0700
Subject: [PATCH] Release 3.26

Refs #415, #416, #420, #421, #425
---
 docs/changelog.rst | 10 ++++++++++
 setup.py           |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 916b9df..ecccfb4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,16 @@
  Changelog
 ===========
 
+.. _v3_26:
+
+3.26 (2022-04-13)
+-----------------
+
+- New ``errors=r.IGNORE/r.SET_NULL`` parameter for the ``r.parsedatetime()`` and ``r.parsedate()`` :ref:`convert recipes <cli_convert_recipes>`. (:issue:`416`)
+- Fixed a bug where ``--multi`` could not be used in combination with ``--dry-run`` for the :ref:`convert <cli_convert>` command. (:issue:`415`)
+- New documentation: :ref:`cli_convert_complex`. (:issue:`420`)
+- More robust detection for whether or not ``deterministic=True`` is supported. (:issue:`425`)
+
 .. _v3_25_1:
 
 3.25.1 (2022-03-11)
diff --git a/setup.py b/setup.py
index d562d40..5152d54 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import io
 import os
 
-VERSION = "3.25.1"
+VERSION = "3.26"
 
 
 def get_long_description():