Merge branch 'backport'

trident-project · Oct 1, 2019 · bd1d28e · bd1d28e
2 parents ac41126 + 778d444
commit bd1d28e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
@@ -11,6 +11,17 @@ 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.1 (October 1, 2019)
+-------------------------------
+
+This is a bug fix release.
+
+Bug Fixes
+^^^^^^^^^
+
+- Logging info doesn't use correct units
+  (`PR 99 <https://github.com/trident-project/trident/pull/99>`__)
+
 Version 1.2 (September 19, 2019)
 --------------------------------
 

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -68,9 +68,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.dev0'
+version = '1.3.dev1'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.dev0'
+release = '1.3.dev1'
 
 # 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
@@ -15,7 +15,7 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-__version__ = "1.3.dev0"
+__version__ = "1.3.dev1"
 
 # Must run import_check() before anything else is imported to avoid
 # astropy error when importing trident in trident package directory