Merge pull request #383 from lkluft/fix-tests

Fix broken matplotlib tests

typhon/plots/plots.py

@@ -526,7 +526,7 @@ def profile_p(p, x, ax=None, **kwargs):
 
     # Label and format for yaxis.
     formatter.set_yaxis_formatter(formatter.HectoPascalFormatter(), ax=ax)
-    if ax.is_first_col():
+    if ax.get_subplotspec().is_first_col():
         ax.set_ylabel('Pressure [hPa]')
 
     # Actual plot.

typhon/tests/plots/test_colors.py

@@ -87,22 +87,24 @@ def test_cmap2act(self):
 
     def test_cmap_from_txt(self):
         """Import colormap from txt file."""
+        idx = np.linspace(0, 1, 256)
+
         viridis = plt.get_cmap('viridis')
-        cmap = colors.cmap_from_txt(os.path.join(self.ref_dir, 'viridis.txt'))
 
-        plt.register_cmap(cmap=viridis)  # Register original viridis.
+        cmap = colors.cmap_from_txt(os.path.join(
+            self.ref_dir, 'viridis.txt'), name="viridis_read")
 
-        idx = np.linspace(0, 1, 256)
         assert np.allclose(viridis(idx), cmap(idx), atol=0.001)
 
     def test_cmap_from_act(self):
         """Import colormap from act file."""
+        idx = np.linspace(0, 1, 256)
+
         viridis = plt.get_cmap('viridis')
-        cmap = colors.cmap_from_act(os.path.join(self.ref_dir, 'viridis.act'))
 
-        plt.register_cmap(cmap=viridis)  # Register original viridis.
+        cmap = colors.cmap_from_act(
+            os.path.join(self.ref_dir, 'viridis.act'), name="viridis_read")
 
-        idx = np.linspace(0, 1, 256)
         assert np.allclose(viridis(idx), cmap(idx), atol=0.004)
 
     def test_get_material_design(self):