Merge pull request #94 from brittonsmith/release

1.2 Release

.mailmap

@@ -0,0 +1,130 @@
+Stephen Skory <s@skory.us> Stephen Skory <stephenskory@yahoo.com>
+Stephen Skory <s@skory.us> "Stephen Skory stephenskory@yahoo.com" <"Stephen Skory stephenskory@yahoo.com">
+Yuan Li <yuan@astro.columbia.edu> Yuan Li <bear0980@gmail.com>
+Chris Moody <juxtaposicion@gmail.com> Chris Moody <cemoody@ucsc.edu>
+Chris Moody <juxtaposicion@gmail.com> Christopher Erick Moody <cemoody@ucsc.edu>
+Cameron Hummels <chummels@gmail.com> Cameron Hummels <chummels@astro.columbia.edu>
+Cameron Hummels <chummels@gmail.com> chummels <chummels@gmail.com>
+John Wise <jwise@physics.gatech.edu> John Wise <jwise@astro.princeton.edu>
+Sam Skillman <samskillman@gmail.com> Sam Skillman <sam.skillman@gmail.com>
+Sam Skillman <samskillman@gmail.com> samskillman <sam.skillman@gmail.com>
+Casey Stark <caseywstark@gmail.com> Casey Stark <casey@thestarkeffect.com>
+Christian Karch <chiffre@posteo.de> chiffre <none@none>
+Christian Karch <chiffre@posteo.de> Christian Karch <none@none>
+Andrew Myers <atmyers2@gmail.com> Andrew Myers <atmyers@berkeley.edu>
+Andrew Myers <atmyers2@gmail.com> atmyers <none@none>
+Douglas Rudd <drudd@uchicago.edu> drudd <none@none>
+Andrew Wetzel <andrew.wetzel@yale.edu> awetzel <none@none>
+David Collins <dcollins4096@gmail.com> David Collins <dcollins@physics.ucsd.edu>
+David Collins <dcollins4096@gmail.com> dcollins4096 <none@none>
+David Collins <dcollins4096@gmail.com> David Collins (dcollins4096@gmail.com) <David Collins (dcollins4096@gmail.com)>
+Tom Abel <tabel@slac.stanford.edu> tabel <none@none>
+Kaylea Nelson <kaylea.nelson@yale.edu> sername=kayleanelson <none@none>
+Kaylea Nelson <kaylea.nelson@yale.edu> kayleanelson <none@none
+Kaylea Nelson <kaylea.nelson@yale.edu> kayleanelson <none@none>
+Stephanie Tonnesen <stonnes@gmail.com> stonnes <stonnes@gmail.com>
+John Forbes <jcforbes@ucsc.edu> John Forbes <jforbes@ucolick.org>
+Elliott Biondo <biondo@wisc.edu> Elliott Biondo <Biondo@wisc.edu>
+Sam Geen <samgeen@gmail.com> Sam Geen <samgeen@googlemail.com>
+Alex Bogert <fbogert@ucsc.edu> fbogert <none@none>
+Brian O'Shea <oshea@msu.edu> bwoshea <none@none>
+Ji-hoon Kim <me@jihoonkim.org> Ji-hoon Kim <mornkr@slac.stanford.edu>
+Kirk Barrow <kssbarrow@gatech.edu> Kirk Barrow <kssbarrow@gmail.com>
+Kirk Barrow <kssbarrow@gatech.edu> Kirk Barrow <kassbarrow@gmail.com>
+Kirk Barrow <kssbarrow@gatech.edu> kbarrow <none@none>
+Kirk Barrow <kssbarrow@gatech.edu> kbarrow <kassbarrow@gmail.com>
+Antoine Strugarek <antoine.strugarek@cea.fr> Antoine Strugarek <strugarek@astro.umontreal.ca>
+Antoine Strugarek <antoine.strugarek@cea.fr> astrugarek <strugarek@astro.umontreal.ca>
+Antoine Strugarek <antoine.strugarek@cea.fr> Antoine Strugarek <antoine.strugarek@cea.fr>
+Anna Rosen <rosen@ucolick.org> Anna Rosen <alrosen@ucsc.edu>
+John ZuHone <jzuhone@gmail.com> jzuhone <none@none>
+John ZuHone <jzuhone@gmail.com> jzuhone <jzuhone@gmail.com>
+John ZuHone <jzuhone@gmail.com> John Zuhone <jzuhone@mfe1.nas.nasa.gov>
+John ZuHone <jzuhone@gmail.com> John Zuhone <jzuhone@ldan6.nas.nasa.gov>
+Kenza Arraki <karraki@nmsu.edu> Kenza Arraki <karraki@gmail.com>
+Allyson Julian <astrohckr@gmail.com> Allyson Julian <hckr@eml.cc>
+Allyson Julian <astrohckr@gmail.com> Allyson Julian <julian3@illinois.edu>
+Allyson Julian <astrohckr@gmail.com> Allyson Julian <aj@hckr.eml.cc>
+Allyson Julian <astrohckr@gmail.com> AJ <astrohckr@gmail.com>
+Allyson Julian <astrohckr@gmail.com> Al Jul <hckr@eml.cc>
+Allyson Julian <astrohckr@gmail.com> AJ <aj@hckr.eml.cc>
+Allyson Julian <astrohckr@gmail.com> AJ <hckr@eml.cc>
+Brian Crosby <bcrosby.bd@gmail.com> bcrosby <bcrosby.bd@gmail.com>
+Ben Thompson <bthompson2090@gmail.com> Ben Thompson <none@none>
+Ben Thompson <bthompson2090@gmail.com> cosmosquark <none@none>
+Chris Malone <chris.m.malone@gmail.com> Chris Malone <chris.m.malone@lanl.gov>
+Chris Malone <chris.m.malone@gmail.com> ChrisMalone <chris.m.malone@gmail.com>
+Chris Malone <chris.m.malone@gmail.com> ChrisMalone <chris.m.malone@lanl.gov>
+Jill Naiman <jnaiman@cfa.harvard.edu> Jill Naiman <jnaiman@ucolick.org>
+Jill Naiman <jnaiman@cfa.harvard.edu> jnaiman <none@none>
+Jill Naiman <jnaiman@cfa.harvard.edu> jnaiman <jnaiman@ucolick.org>
+Miguel de Val-Borro <miguel.deval@gmail.com> Miguel de Val-Borro <miguel@archlinux.net>
+Stuary Levy <salevy@illinois.edu> Stuart Levy <slevy@ncsa.illinois.edu>
+Ben Keller <malzraa@gmail.com> Ben Keller <kellerbw@mcmaster.ca>
+Daniel Fenn <df11c@my.fsu.edu> dfenn <none@none>
+Meagan Lang <langmm.astro@gmail.com> langmm <none@none>
+Joseph Tomlinson <jmtomlinson95@gmail.com> jmt354 <none@none>
+Desika Narayanan <dnarayan@haverford.edu> desika <none@none>
+Nathan Goldbaum <ngoldbau@illinois.edu> Nathan Goldbaum <goldbaum@ucolick.org>
+Nathan Goldbaum <ngoldbau@illinois.edu> Nathan Goldbaum <ngoldbau@ucsc.edu>
+Fabian Koller <anokfireball@posteo.de> NTAuthority@honeypot.fritz.box <NTAuthority@honeypot.fritz.box>
+Fabian Koller <anokfireball@posteo.de> NTAuthority@guest053.fz-rossendorf.de <NTAuthority@guest053.fz-rossendorf.de>
+Fabian Koller <anokfireball@posteo.de> NTAuthority@guest692.fz-rossendorf.de <NTAuthority@guest692.fz-rossendorf.de>
+Fabian Koller <anokfireball@posteo.de> NTAuthority@guest692.fz-rossendorf.de <NTAuthority@guest692.fz-rossendorf.de>
+Fabian Koller <anokfireball@posteo.de> Fabian Koller <none@none>
+Fabian Koller <anokfireball@posteo.de> Fabian Koller <anokfireball@poseto.de>
+Fabian Koller <anokfireball@posteo.de> C0nsultant <anokfireball@posteo.de>
+Rafael Ruggiero <rafael.ruggiero@usp.br> Rafael Ruggiero <none@none>
+John Regan <john.regan@helsinki.fi> John Regan <john.a.regan@durham.ac.uk>
+Gabriel Altay <gabriel.altay@gmail.com> galtay <gabriel.altay@gmail.com>
+Mark Richardson <Mark.Richardson.Work@gmail.com> Mark Richardson <Mark.L.Richardson@asu.edu>
+Jared Coughlin <jcoughl2@nd.edu> Jared <none@none>
+Corentin Cadiou <corentin.cadiou@iap.fr> cphyc <contact@cphyc.me>
+Corentin Cadiou <corentin.cadiou@iap.fr> ccc@pingouin.local <ccc@pingouin.local>
+Corentin Cadiou <corentin.cadiou@iap.fr> ccc@pingouin-2.local <ccc@pingouin-2.local>
+Corentin Cadiou <corentin.cadiou@iap.fr> Corentin Cadiou <contact@cphyc.me>
+convert-repo <none@none> None <none@none>
+Patrick Shriwise <shriwise@wisc.edu> pshriwise <shriwise@wisc.edu>
+Michael Zingale <michael.zingale@stonybrook.edu> Michael  Zingale <michael.zingale@stonybrook.edu>
+Sam Leitner <sam.leitner@gmail.com> Sam  Leitner <sam.leitner@gmail.com>
+Geoffrey So <gsiisg@gmail.com> gsiisg <gsiisg@gmail.com>
+Matthew Turk <matthewturk@gmail.com> Matt Turk <matthewturk@gmail.com>
+Stephanie Ho <stephaniehkho@gmail.com> Stephanie Ho <stephaniehho@tsubasa.physics.ucsb.edu>
+Stephanie Ho <stephaniehkho@gmail.com> stephaniehho <20467246+stephaniehho@users.noreply.github.com>
+Stephanie Ho <stephaniehkho@gmail.com> Stephanie Ho <stephaniehho@169-231-104-205.wireless.ucsb.edu>
+Salvatore Cielo <cielo@iap.fr> sacielo <sacielo@gmail.com>
+Nicholas Earl <nchlsearl@gmail.com> nmearl <nchlsearl@gmail.com>
+Marianne Corvellec <marianne.corvellec@ens-lyon.org> Marianne Corvellec <marianne.corvellec@crim.ca>
+Hugo Pfister <pfister@loginhz02.iap.fr> Hugo Pfister <pfister@loginhz01.iap.fr>
+André-Patrick Bubel <code@andre-bubel.de> Moredread <code@andre-bubel.de>
+Abhishek Singh <abhisheksing@umass.edu> git-abhishek <36498066+git-abhishek@users.noreply.github.com>
+Abhishek Singh <abhisheksing@umass.edu> Abhishek Singh <36498066+git-abhishek@users.noreply.github.com>
+Ashley Kelly <a.j.kelly@durham.ac.uk> ash <Ashley Kelly>
+Max Katz <maximilian.katz@stonybrook.edu> Max Katz <maxpkatz@gmail.com>
+Suoqing Ji <jisuoqing@gmail.com> Suoqing JI <jisuoqing@gmail.com>
+Bili Dong <qobilidop@gmail.com> qobilidop <qobilidop@gmail.com>
+Donald E Willcox <eugene.willcox@gmail.com> dwillcox <eugene.willcox@gmail.com>
+Yingchao Lu <yingchao.lu@gmail.com> yingchaolu <yingchao.lu@gmail.com>
+Andrew Myers <atmyers2@gmail.com> atmyers <atmyers2@gmail.com>
+Ricarda Beckmann <ricarda.beckmann@astro.ox.ac.uk> Ricarda Beckmann <Ricarda.Beckmann@astro.ox.ac.uk>
+Ricarda Beckmann <beckmann@iap.fr> Ricarda Beckmann <ricarda.beckmann@astro.ox.ac.uk>
+Ricarda Beckmann <beckmann@iap.fr> RicardaBeckmann <beckmann@iap.fr>
+Ricarda Beckmann <beckmann@iap.fr> Ricarda Beckmann <ricarda.beckmann@astro.ox.ac.uk>
+Ricarda Beckmann <beckmann@iap.fr> RicardaBeckmann <ricarda.beckmann@astro.ox.ac.uk>
+Corentin Cadiou <corentin.cadiou@iap.fr> Corentin Cadiou <corentin.cadiou@cphyc.me>
+Christopher Moody <cemoody@ucsc.edu> Christopher Moody <juxtaposicion@gmail.com>
+Casey W. Stark <caseywstark@gmail.com> Casey W. Stark <casey@thestarkeffect.com>
+BW Keller <kellerbw@mcmaster.ca> Ben Keller <malzraa@gmail.com>
+Benjamin Thompson <bthompson2090@gmail.com> Ben Thompson <bthompson2090@gmail.com>
+Alex Lindsay <al007@illinois.edu> Alex Lindsay <alexlindsay239@gmail.com>
+Yi-Hao Chen (ychen@astro.wisc.edu) Yi-Hao Chen (yihaochentw@gmail.com)
+Kacper Kowalik <xarthisius.kk@gmail.com> Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com>
+John ZuHone <jzuhone@gmail.com> John Zuhone <jzuhone@lfe4.nas.nasa.gov>
+Clayton Strawn <cjstrawn@ucsc.edu> Clayton Strawn <33767568+claytonstrawn@users.noreply.github.com>
+Hilary Egan <hilary.egan@colorado.edu> Hilary Egan <hilaryye@gmail.com>
+Yi-Hao Chen <ychen@astro.wisc.edu> Yi-Hao Chen <yihaochentw@gmail.com>
+Prateek Gupta <prateek91gidolia@gmail.com> Prateekgidolia <prateek91gidolia@gmail.com>
+Max Gronke <maxbg@astro.uio.no> maxbeegee <maxbg@astro.uio.no>
+Ashley Kelly <a.j.kelly@durham.ac.uk> ashkelly <a.j.kelly@durham.ac.uk>
+Sean Larkin <sflarkin@ucsc.edu> sflarkin <41403179+sflarkin@users.noreply.github.com>
+Lauren Corlies <laurennc009@gmail.com> laurennc <none@none>

CREDITS

@@ -2,13 +2,26 @@ Trident is a collaborative effort from multiple developers.
 
 Contributors:   
 
-Cameron Hummels
-Britton Smith
-Devin Silvia
-Matthew Turk
-Nathan Goldbaum
-Kacper Kowalik
+Brendan Boyd
 Lauren Corlies
 Bili Dong
 Hilary Egan
+Nathan Goldbaum
+Cameron Hummels
+Bharat Kambalur
+BW Keller
+Kacper Kowalik
+Erwin Lau
+Andrew Myers
+Molly S. Peeples
+Douglas Rudd
+Anthony Scopatz
+Devin Silvia
+Stephen Skory
+Britton Smith
 Clayton Strawn
+Stephanie Tonnesen
+Matthew Turk
+Miguel de Val-Borro
+John Wise
+John ZuHone

doc/source/changelog.rst

@@ -11,8 +11,67 @@ Contributors
 The `CREDITS file <https://github.com/trident-project/trident/blob/master/CREDITS>`_
 has an updated list of contributors to the codebase.
 
-Version 1.1
------------
+Version 1.2 (September 19, 2019)
+--------------------------------
+
+New Features
+^^^^^^^^^^^^
+
+- Add support for creating spectra in velocity space
+  (`PR 90 <https://github.com/trident-project/trident/pull/90>`__)
+- Add ability to set wavelength limits to 'auto'
+  (`PR 87 <https://github.com/trident-project/trident/pull/87>`__)
+- Add ability to make spectrum from data container
+  (`PR 91 <https://github.com/trident-project/trident/pull/91>`__)
+
+Bug Fixes
+^^^^^^^^^
+
+- off by one error in subgrid index calculation
+  (`PR 85 <https://github.com/trident-project/trident/pull/85>`__)
+- fixing error in _ion_mass
+  (`PR 81 <https://github.com/trident-project/trident/pull/81>`__)
+- H_p0_number_density to default, H_number_density to alias
+  (`PR 78 <https://github.com/trident-project/trident/pull/78>`__)
+- Implements a better way of calculating the redshift on the light ray
+  (`PR 71 <https://github.com/trident-project/trident/pull/71>`__)
+- Assures that ion_fraction field reflects on-disk fields
+  (`PR 64 <https://github.com/trident-project/trident/pull/64>`__)
+- Fix atomic data for Si II 1260 according to Morton 2003
+  (`PR 43 <https://github.com/trident-project/trident/pull/43>`__)
+- A check to avoid failure when no continuum absorbers were found in the ray
+  (`PR 39 <https://github.com/trident-project/trident/pull/39>`__)
+- Auto-addition of H_nuclei_density to a LightRay when present in the base dataset
+  (`PR 39 <https://github.com/trident-project/trident/pull/39>`__)
+- Adding max_box_fraction as a kwarg to make_compound_ray
+  (`PR 37 <https://github.com/trident-project/trident/pull/37>`__)
+- Updated trident_path() to be OS Independent
+  (`PR 36 <https://github.com/trident-project/trident/pull/36>`__)
+- simplify setting up ion fields using the "local" field type
+  (`PR 30 <https://github.com/trident-project/trident/pull/30>`__)
+- split and join filenames using os.sep instead of assuming unix
+  (`PR 29 <https://github.com/trident-project/trident/pull/29>`__)
+- updated oscillator strengths and gamma's for Si II 1206 and Si III 1260
+  (`PR 25 <https://github.com/trident-project/trident/pull/25>`__)
+
+Minor Enhancements
+^^^^^^^^^^^^^^^^^^
+
+- Calculating LOS velocity with relative velocities to account for bulk motion
+  (`PR 93 <https://github.com/trident-project/trident/pull/93>`__)
+- Enabling use of `output_absorbers_file` kwarg in SpectrumGenerator
+  (`PR 58 <https://github.com/trident-project/trident/pull/58>`__)
+- Switching imports from yt.analysis_modules to yt_astro_analysis
+  (`PR 55 <https://github.com/trident-project/trident/pull/55>`__)
+- Enable passing in-memory LineDatabase to SpectrumGenerator
+  (`PR 42 <https://github.com/trident-project/trident/pull/42>`__)
+- Added equivalent width calculation to line_observables_dict
+  (`PR 40 <https://github.com/trident-project/trident/pull/40>`__)
+- Numerous documentation updates
+- Updates and fixes to testing
+
+Version 1.1 (November 18, 2017)
+-------------------------------
 
 - Trident development has changed from mercurial to git, and the source has
   moved from bitbucket to github.  This was done in recognition that more
@@ -63,8 +122,8 @@ Version 1.1
 - Replaced internal instances of ``particle_type`` with ``sampling_type`` to
   match similar yt conversion.
 
-Version 1.0
------------
+Version 1.0 (November 16, 2017)
+-------------------------------
 
 Initial release.  See our :ref:`method paper <citation>` for details.
 

doc/source/conf.py

@@ -71,7 +71,7 @@
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2-dev'
+release = '1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

trident/__init__.py

@@ -15,7 +15,7 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-__version__ = "1.2-dev"
+__version__ = "1.2"
 
 # Must run import_check() before anything else is imported to avoid
 # astropy error when importing trident in trident package directory