Merge branch 'feature/v0.3.12' into develop

colour-science · Sep 22, 2018 · 85cd185 · 85cd185
2 parents 80c0b37 + 6890d3f
commit 85cd185
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/colour/plotting/temperature.py b/colour/plotting/temperature.py
@@ -113,7 +113,7 @@ def uv_to_ij(uv):
         for x in np.arange(start, end + 250, 250)
     ])
 
-    plt.plot(ij[..., 0], ij[..., 1], color=planckian_locus_colours)
+    axes.plot(ij[..., 0], ij[..., 1], color=planckian_locus_colours)
 
     for i in (1667, 2000, 2500, 3000, 4000, 6000, 10000):
         i0, j0 = uv_to_ij(CCT_to_uv(i, 'Robertson 1968', D_uv=-D_uv))

diff --git a/colour/plotting/volume.py b/colour/plotting/volume.py
@@ -526,9 +526,9 @@ def RGB_colourspaces_gamuts_plot(colourspaces=None,
         c = ((0.0, 0.0, 0.0, 0.5)
              if spectral_locus_colour is None else spectral_locus_colour)
 
-        plt.plot(
+        axes.plot(
             points[..., 0], points[..., 1], points[..., 2], color=c, zorder=1)
-        plt.plot(
+        axes.plot(
             (points[-1][0], points[0][0]), (points[-1][1], points[0][1]),
             (points[-1][2], points[0][2]),
             color=c,

diff --git a/colour/utilities/verbose.py b/colour/utilities/verbose.py
@@ -417,6 +417,7 @@ def describe_environment(runtime_packages=True,
     try:
         version = subprocess.check_output(
             ['git', 'describe'], cwd=colour.__path__[0]).strip()
+        version = version.decode('utf-8')
     except subprocess.CalledProcessError:
         version = colour.__version__