From 0c38bdb34e90769d0652b2fa60e436875841ec4a Mon Sep 17 00:00:00 2001
From: Tyler Martin <tyler.martin@nist.gov>
Date: Wed, 1 Jul 2020 15:23:12 -0400
Subject: [PATCH] preparing for new release

---
 CHANGES.md         | 40 ++++++++++++++++++++++++++--------------
 DEV.md             |  7 ++++---
 env/py3_dev.yml    |  2 ++
 pyPRISM/version.py |  4 ++--
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 47762ba..06b14f6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,26 +1,38 @@
-Change Log
-==========
+#Changelog
+See https://keepachangelog.com/en/1.0.0/
 
-v1.0.3
-------
-- Date:  18/04/05
+## [1.0.4] - 2020/07/01
+### Added
+- PRISM objects now store minimization object from scipy.root as PRISM.minimize_result
+- Pair iterator utility to the core.System object
+
+### Changed
+- Many documentation fixes/tweaks
+     
+### Fixed
+- FJC limit of omega.DiscreteKoyama was incorrect (thanks @Jadrich!)
+- structure factor normalization flag was being ignored
+- fixed domain check in omega.FromArray
+- test suite for when test suite isn't available
+
+## [1.0.3] - 2018/04/05
+### Added
 - MyBinder Support
 
-v1.0.2
-------
-- Date:  18/04/04
+## [1.0.2] - 2018/04/04
+### Changed
 - Moved tests back under pyPRISM
+
+### Added
 - Added test() method to pyPRISM/__init__.py
 
-v1.0.1
-------
-- Date: 18/04/04
+## [1.0.1] - 18/04/04
+###Added
 - Added LICENSE to MANIFEST.in
     - Yes, this required a version bump
     - See here: https://github.com/pypa/packaging-problems/issues/74
 
-v1.0.0
-------
-- Date: 18/04/01
+## [1.0.0] - 2018/04/01
+### Added
 - Initial Release! 
 
diff --git a/DEV.md b/DEV.md
index 83325bb..cf9d2b3 100644
--- a/DEV.md
+++ b/DEV.md
@@ -31,9 +31,10 @@ $ python setup.py build_ext
 $ python setup.py sdist
 ```
 8. Upload to pypi
-    - twine upload --skip--existing dist/*
-9.  Update conda-forge 
-'''
+```bash
+$ twine upload --skip--existing dist/*
+```
+9.  Update conda-forge [link](https://github.com/conda-forge/pyprism-feedstock#updating-pyprism-feedstock)
 
 Compiling C-Extentsions
 -----------------------
diff --git a/env/py3_dev.yml b/env/py3_dev.yml
index 42126be..70f7eb5 100644
--- a/env/py3_dev.yml
+++ b/env/py3_dev.yml
@@ -34,3 +34,5 @@ dependencies:
 
 # JupyterLab Extensions
 # jupyter labextension install jupyterlab_vim jupyterlab_bokeh @pyviz/jupyterlab_holoviews 
+#
+#@axlair/jupyterlab_vim @jupyter-widgets/jupyterlab-manager @jupyterlab/git
diff --git a/pyPRISM/version.py b/pyPRISM/version.py
index 6a06507..f449439 100644
--- a/pyPRISM/version.py
+++ b/pyPRISM/version.py
@@ -1,2 +1,2 @@
-__version__ = 'v1.0.3'
-version = 'v1.0.3'
+__version__ = 'v1.0.4'
+version = 'v1.0.4'