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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/3d2e3a1971e8/
Changeset:   3d2e3a1971e8
Branch:      yt
User:        ngoldbaum
Date:        2017-04-07 16:20:10+00:00
Summary:     Don't handle drawing fancy minor ticks on newer matplotlib versions
Affected #:  1 file

diff -r 11a616b013dda6081d04e4ccd2ad8c71b31fe8dc -r 3d2e3a1971e8713c33c01d704f461917adb538fb yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -68,11 +68,13 @@
     YTDataTypeUnsupported, \
     YTInvalidFieldType
 
+MPL_VERSION = LooseVersion(matplotlib.__version__)
+
 # Some magic for dealing with pyparsing being included or not
 # included in matplotlib (not in gentoo, yes in everything else)
 # Also accounting for the fact that in 1.2.0, pyparsing got renamed.
 try:
-    if LooseVersion(matplotlib.__version__) < LooseVersion("1.2.0"):
+    if MPL_VERSION < LooseVersion("1.2.0"):
         from matplotlib.pyparsing import ParseFatalException
     else:
         if sys.version_info[0] == 3:
@@ -984,7 +986,7 @@
             # colorbar minorticks
             if f not in self._cbar_minorticks:
                 self._cbar_minorticks[f] = True
-            if self._cbar_minorticks[f] is True:
+            if self._cbar_minorticks[f] is True and MPL_VERSION < LooseVersion('2.0.0'):
                 if self._field_transform[f] == linear_transform:
                     self.plots[f].cax.minorticks_on()
                 else:


https://bitbucket.org/yt_analysis/yt/commits/f119d6d90c9f/
Changeset:   f119d6d90c9f
Branch:      yt
User:        ngoldbaum
Date:        2017-04-14 15:35:56+00:00
Summary:     Merged in ngoldbaum/yt (pull request #2574)

Don't handle drawing fancy minor ticks on newer matplotlib versions

Approved-by: Kacper Kowalik <xarthisius.kk at gmail.com>
Approved-by: John ZuHone <jzuhone at gmail.com>
Affected #:  1 file

diff -r b4778e16e503805e693cd14f4829e45e5184f062 -r f119d6d90c9fe228901b95375b145438c08b8481 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -68,11 +68,13 @@
     YTDataTypeUnsupported, \
     YTInvalidFieldType
 
+MPL_VERSION = LooseVersion(matplotlib.__version__)
+
 # Some magic for dealing with pyparsing being included or not
 # included in matplotlib (not in gentoo, yes in everything else)
 # Also accounting for the fact that in 1.2.0, pyparsing got renamed.
 try:
-    if LooseVersion(matplotlib.__version__) < LooseVersion("1.2.0"):
+    if MPL_VERSION < LooseVersion("1.2.0"):
         from matplotlib.pyparsing import ParseFatalException
     else:
         if sys.version_info[0] == 3:
@@ -984,7 +986,7 @@
             # colorbar minorticks
             if f not in self._cbar_minorticks:
                 self._cbar_minorticks[f] = True
-            if self._cbar_minorticks[f] is True:
+            if self._cbar_minorticks[f] is True and MPL_VERSION < LooseVersion('2.0.0'):
                 if self._field_transform[f] == linear_transform:
                     self.plots[f].cax.minorticks_on()
                 else:

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.