Merge pull request #510 from ExoCTK/phase-constraint-bugfix

Phase constraint hotfix + ready for development updates
ExoCTK · Jul 9, 2021 · 0a23dda · 0a23dda
2 parents 1f63642 + afd6573
commit 0a23dda
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ This file tracks all major changes in each `exoctk` release.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.2] - 2021-07-09
+
+### Added
+
+- Sweep to update code to match PEP8 standards.
+- Extra authors on citation information to match current working DOI.
+
+### Fixed
+
+- Phase-constraint bug that didn't change `eccentricity` to `nan` when not found by the target resolver.
 
 ## [1.2.1] - 2021-06-09
 

diff --git a/README.rst b/README.rst
@@ -138,33 +138,37 @@ If you use ExoCTK for work/research presented in a publication (whether directly
 
 ::
 
-  This research made use of the open source Python package exoctk, the Exoplanet Characterization Toolkit (Espinoza et al, 2021).
+  This research made use of the open source Python package exoctk, the Exoplanet Characterization Toolkit (Bourque et al, 2021).
 
-where (Espinoza et al, 2021) is a citation of the Zenodo record, e.g.:
+where (Bourque et al, 2021) is a citation of the Zenodo record, e.g.:
 
 ::
 
-  @software{nestor_espinoza_2021_4556063,
-    author       = {Néstor Espinoza and
-                    Matthew Bourque and
-                    Joseph Filippazzo and
-                    Michael Fox and
-                    Jules Fowler and
-                    Teagan King and
-                    Catherine Martlin and
-                    Jennifer Medina and
-                    Mees Fix and
-                    Kevin Stevenson and
-                    Jeff Valenti},
-    title        = {The Exoplanet Characterization Toolkit (ExoCTK)},
-    month        = feb,
-    year         = 2021,
-    publisher    = {Zenodo},
-    version      = {1.0.0},
-    doi          = {10.5281/zenodo.4556063},
-    url          = {https://doi.org/10.5281/zenodo.4556063}
-  }
-
+    @software{matthew_bourque_2021_4556063,
+      author       = {Matthew Bourque and
+                      Néstor Espinoza and
+                      Joseph Filippazzo and
+                      Mees Fix and
+                      Teagan King and
+                      Catherine Martlin and
+                      Jennifer Medina and
+                      Natasha Batalha and
+                      Michael Fox and
+                      Jules Fowler and
+                      Jonathan Fraine and
+                      Matthew Hill and
+                      Nikole Lewis and
+                      Kevin Stevenson and
+                      Jeff Valenti and
+                      Hannah Wakeford},
+      title        = {The Exoplanet Characterization Toolkit (ExoCTK)},
+      month        = feb,
+      year         = 2021,
+      publisher    = {Zenodo},
+      version      = {1.0.0},
+      doi          = {10.5281/zenodo.4556063},
+      url          = {https://doi.org/10.5281/zenodo.4556063}
+    }
 
 Want to stay up-to-date with our releases and updates?
 ------------------------------------------------------

diff --git a/exoctk/exoctk_app/app_exoctk.py b/exoctk/exoctk_app/app_exoctk.py
@@ -750,7 +750,7 @@ def phase_constraint(transit_type='primary'):
 
                 form.eccentricity.data = data.get('eccentricity')
                 if form.eccentricity.data is None:
-                    form.omega.data = np.nan
+                    form.eccentricity.data = np.nan
 
                 form.target_url.data = str(target_url)
 

diff --git a/exoctk/exoctk_app/templates/base.html b/exoctk/exoctk_app/templates/base.html
@@ -146,7 +146,7 @@
                         <div style="float:right; width:120px;text-align:center;">
                             <p>
                                 Running<br>
-                                <a href='https://github.com/ExoCTK/exoctk/releases/tag/v1.2.1'>exoctk v1.2.1</a>{{version|safe}}
+                                <a href='https://github.com/ExoCTK/exoctk/releases/tag/v1.2.2'>exoctk v1.2.2</a>{{version|safe}}
                             </p>
                             <p style='font-size:0.8em'>
                                 <a href='admin' style='color:#aaaaaa;'>Admin Area</a>

diff --git a/setup.py b/setup.py
@@ -49,7 +49,7 @@
 
 setup(
     name='exoctk',
-    version='1.2.1',
+    version='1.2.2',
     description='Observation reduction and planning tools for exoplanet science',
     packages=find_packages(
         ".",