[yt-svn] commit/yt: MatthewTurk: Merged in ngoldbaum/yt (pull request #1334)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/e2419cd7c329/
Changeset:   e2419cd7c329
Branch:      yt
User:        MatthewTurk
Date:        2014-12-08 17:56:08+00:00
Summary:     Merged in ngoldbaum/yt (pull request #1334)

Avoid triggering warnings in recent versions of NumPy and matplotlib
Affected #:  2 files

diff -r 134ea7c1c9e8cba1d8845449a000a282ce201a99 -r e2419cd7c32929d3fdfa8d4077f280dfaa17bbcf yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -681,7 +681,8 @@
                     self.length_unit / self.time_unit)
         self.unit_registry.modify("code_velocity", vel_unit)
         # domain_width does not yet exist
-        if None not in (self.domain_left_edge, self.domain_right_edge):
+        if (self.domain_left_edge is not None and
+            self.domain_right_edge is not None):
             DW = self.arr(self.domain_right_edge - self.domain_left_edge, "code_length")
             self.unit_registry.add("unitary", float(DW.max() * DW.units.cgs_value),
                                    DW.units.dimensions)

diff -r 134ea7c1c9e8cba1d8845449a000a282ce201a99 -r e2419cd7c32929d3fdfa8d4077f280dfaa17bbcf yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -701,8 +701,8 @@
             # This will likely be replaced at some point by the coordinate handler
             # setting plot aspect.
             if self.aspect is None:
-                self.aspect = np.float64((self.ds.quan(1.0, unit_y) /
-                                         self.ds.quan(1.0, unit_x)).in_cgs())
+                self.aspect = float((self.ds.quan(1.0, unit_y) /
+                                     self.ds.quan(1.0, unit_x)).in_cgs())
 
             extentx = [(self.xlim[i] - xc).in_units(unit_x) for i in (0, 1)]
             extenty = [(self.ylim[i] - yc).in_units(unit_y) for i in (0, 1)]

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.