From acaccae1dce9921b6033d35136c32ed062e9beec Mon Sep 17 00:00:00 2001
From: Britton Smith <brittonsmith@gmail.com>
Date: Wed, 18 Mar 2020 13:35:03 +0000
Subject: [PATCH] Update changelog and versions for release.

---
 doc/source/changelog.rst | 22 ++++++++++++++++++++++
 doc/source/conf.py       |  4 ++--
 trident/__init__.py      |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
index ea2bddcde4..adb3fe9b80 100644
--- a/doc/source/changelog.rst
+++ b/doc/source/changelog.rst
@@ -11,6 +11,28 @@ Contributors
 The `CREDITS file <https://github.com/trident-project/trident/blob/master/CREDITS>`_
 has an updated list of contributors to the codebase.
 
+
+Version 1.2.3 (March 18, 2020)
+------------------------------
+
+This is a bug fix release.
+
+Enhancements
+^^^^^^^^^^^^
+
+- Move testing to circleci.
+  (`PR 109 <https://github.com/trident-project/trident/pull/109>`__)
+
+Bug Fixes
+^^^^^^^^^
+
+- Allow access to find_outputs kwarg from make_compound_ray.
+  (`PR 126 <https://github.com/trident-project/trident/pull/126>`__)
+- Fix periodic rays.
+  (`PR 125 <https://github.com/trident-project/trident/pull/125>`__)
+- Be more careful about limiting size of line deposition array.
+  (`PR 106 <https://github.com/trident-project/trident/pull/106>`__)
+
 Version 1.2.2 (November 14, 2019)
 ---------------------------------
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index df1c63b274..228fea5ef4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.2'
+version = '1.2.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.2'
+release = '1.2.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/trident/__init__.py b/trident/__init__.py
index 9bb239df06..e9e8eaf3d8 100644
--- a/trident/__init__.py
+++ b/trident/__init__.py
@@ -15,7 +15,7 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 
 # Must run import_check() before anything else is imported to avoid
 # astropy error when importing trident in trident package directory