[yt-svn] commit/yt: 2 new changesets

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/ba5bdf622566/
changeset:   ba5bdf622566
branch:      yt
user:        ngoldbaum
date:        2012-11-30 23:27:29
summary:     Skipping the weight_field comparison is the weight field is None.
affected #:  1 file

diff -r 18feb7c37f901a092d311ed1402dcb986bccf56e -r ba5bdf622566599cdaf771d1b13f77f94a398385 yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -420,6 +420,8 @@
         for k in new_result:
             err_msg = "%s values of %s (%s weighted) projection (axis %s) not equal." % \
               (k, self.field, self.weight_field, self.axis)
+            if k == 'weight_field' and self.weight_field is None:
+                continue
             if self.decimals is None:
                 assert_equal(new_result[k], old_result[k],
                              err_msg=err_msg)



https://bitbucket.org/yt_analysis/yt/changeset/d0d4240f066b/
changeset:   d0d4240f066b
branch:      yt
user:        ngoldbaum
date:        2012-11-30 23:28:12
summary:     Merging.
affected #:  1 file

diff -r 4f88d432d0dab1c918a641316720bc58462fcc19 -r d0d4240f066b608c6bca18e34524eabd2fdb0695 yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -420,6 +420,8 @@
         for k in new_result:
             err_msg = "%s values of %s (%s weighted) projection (axis %s) not equal." % \
               (k, self.field, self.weight_field, self.axis)
+            if k == 'weight_field' and self.weight_field is None:
+                continue
             if self.decimals is None:
                 assert_equal(new_result[k], old_result[k],
                              err_msg=err_msg)

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.