tests pass again

PCMDI · Sep 27, 2019 · d7fc6ce · d7fc6ce
1 parent 775287a
commit d7fc6ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/pcmdi_metrics/graphics/portraits.py b/pcmdi_metrics/graphics/portraits.py
@@ -786,23 +786,23 @@ def generateTemplate(self):
  template.xtic1.y2 = self.PLOT_SETTINGS.xtic1.y2
  template.xtic1.priority = 1
  if self.PLOT_SETTINGS.xtic2.y1 is not None:
- template.xtic2.y1 = self.PLOT_SETTINGS.xtic2.y1
- template.xtic2.priority = 1
+ template.xmintic2.y1 = self.PLOT_SETTINGS.xtic2.y1
+ template.xmintic2.priority = 1
  if self.PLOT_SETTINGS.xtic2.y2 is not None:
- template.xtic2.y2 = self.PLOT_SETTINGS.xtic2.y2
- template.xtic2.priority = 1
+ template.xmintic2.y2 = self.PLOT_SETTINGS.xtic2.y2
+ template.xmintic2.priority = 1
  if self.PLOT_SETTINGS.ytic1.x1 is not None:
  template.ytic1.x1 = self.PLOT_SETTINGS.ytic1.x1
  template.ytic1.priority = 1
  if self.PLOT_SETTINGS.ytic1.x2 is not None:
  template.ytic1.x2 = self.PLOT_SETTINGS.ytic1.x2
  template.ytic1.priority = 1
  if self.PLOT_SETTINGS.ytic2.x1 is not None:
- template.ytic2.priority = 1
- template.ytic2.x1 = self.PLOT_SETTINGS.ytic2.x1
+ template.ymintic2.priority = 1
+ template.ymintic2.x1 = self.PLOT_SETTINGS.ytic2.x1
  if self.PLOT_SETTINGS.ytic2.x2 is not None:
- template.ytic2.priority = 1
- template.ytic2.x2 = self.PLOT_SETTINGS.ytic2.x2
+ template.ymintic2.priority = 1
+ template.ymintic2.x2 = self.PLOT_SETTINGS.ytic2.x2
  template.legend.x1 = self.PLOT_SETTINGS.legend.x1
  template.legend.x2 = self.PLOT_SETTINGS.legend.x2
  template.legend.y1 = self.PLOT_SETTINGS.legend.y1
@@ -870,6 +870,8 @@ def plot(self, data=None, mesh=None, template=None,
  meshfill.missing = self.PLOT_SETTINGS.missing_color
  meshfill.xticlabels2 = meshfill.xticlabels1
  meshfill.yticlabels2 = meshfill.yticlabels1
+ meshfill.xmtics2 = mtics
+ meshfill.ymtics2 = mtics
  if self.PLOT_SETTINGS.colormap is None:
  self.set_colormap()
  elif self.x.getcolormapname() != self.PLOT_SETTINGS.colormap:

diff --git a/pcmdi_metrics/version.py b/pcmdi_metrics/version.py
@@ -1,3 +1,3 @@
 __version__ = 'v1.2.1'
-__git_tag_describe__ = 'v1.2.1-5-g9ac46c7'
-__git_sha1__ = '9ac46c77ea030c077dcdbbdf8b1444613aa37812'
+__git_tag_describe__ = 'v1.2.1-5-g775287a'
+__git_sha1__ = '775287a4c3835437c48f95a99baf3357210395a9'