Merge pull request #143 from brittonsmith/legmerge

merge legacy branch into master

doc/source/changelog.rst

@@ -11,6 +11,39 @@ 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)
+---------------------------------
+
+This is a bug fix release.
+
+Bug Fixes
+^^^^^^^^^
+
+- Shift wavelength of velocity center to redshift from light ray solution
+  (`PR 102 <https://github.com/trident-project/trident/pull/102>`__)
+
 Version 1.2.1 (October 1, 2019)
 -------------------------------
 

environment.yml

@@ -11,7 +11,6 @@ dependencies:
     - cycler==0.10.0
     - cython==0.29.13
     - decorator==4.4.0
-    - future==0.17.1
     - h5py==2.9.0
     - idna==2.8
     - ipython==7.7.0
@@ -30,7 +29,6 @@ dependencies:
     - pyparsing==2.4.2
     - python-dateutil==2.8.0
     - requests==2.22.0
-    - six==1.12.0
     - sympy==1.4
     - traitlets==4.3.2
     - urllib3==1.25.3

setup.py

@@ -63,7 +63,7 @@ def get_version(filename):
         'matplotlib',
         'numpy!=1.14.0',
         'requests',
-        'yt>=3.4.0',
+        'yt>=3.6.0',
         'yt_astro_analysis'],
       python_requires='>=3.5'
 )

trident/light_ray.py

@@ -493,8 +493,8 @@ def make_light_ray(self, seed=None, periodic=True,
 
         if get_los_velocity is not None:
             use_peculiar_velocity = get_los_velocity
-            mylog.warn("'get_los_velocity' kwarg is deprecated. " + \
-                       "Use 'use_peculiar_velocity' instead.")
+            mylog.warning("'get_los_velocity' kwarg is deprecated. " + \
+                          "Use 'use_peculiar_velocity' instead.")
 
         # Calculate solution.
         self._calculate_light_ray_solution(seed=seed,
@@ -542,8 +542,8 @@ def make_light_ray(self, seed=None, periodic=True,
 
             if redshift is not None:
                 if ds.cosmological_simulation and redshift != ds.current_redshift:
-                    mylog.warn("Generating light ray with different redshift than " +
-                               "the dataset itself.")
+                    mylog.warning("Generating light ray with different redshift than " +
+                                  "the dataset itself.")
                 my_segment["redshift"] = redshift
 
             if setup_function is not None:

trident/lsf.py

@@ -86,7 +86,7 @@ def __init__(self, function=None, width=None, filename=None):
         elif function is not None and width is not None:
             if function == 'boxcar':
                 if width % 2 == 0:
-                    mylog.warn("LSF kernel must have an odd length. Reducing kernel size by 1.")
+                    mylog.warning("LSF kernel must have an odd length. Reducing kernel size by 1.")
                     width -= 1
                 self.kernel = np.ones(width)/width
             elif function == 'gaussian':