Merge pull request #98 from lukelbd/cmap-cycle-improvements

Colormap class improvements, new static method

Author: lukelbd

CHANGELOG.rst

@@ -47,17 +47,21 @@ ProPlot v0.4.0 (2020-##-##)
 ===========================
 .. rubric:: Deprecated
 
-- Remove redundant `~proplot.rctools.use_fonts`, use ``rcParams['sans-serif']``
-  precedence instead (:pr:`95`).
-- `~proplot.axes.Axes.dualx` and `~proplot.axes.Axes.dualx` no longer accept "scale-spec" arguments.
-  Must be a function, two functions, or an axis scale instance (:pr:`96`).
 - Remove ``subplots.innerspace``, ``subplots.titlespace``,
   ``subplots.xlabspace``, and ``subplots.ylabspace`` spacing arguments,
   automatically calculate default non-tight spacing using `~proplot.subplots._get_space`
   based on current tick lengths, label sizes, etc.
+- Remove redundant `~proplot.rctools.use_fonts`, use ``rcParams['sans-serif']``
+  precedence instead (:pr:`95`).
+- `~proplot.axes.Axes.dualx` and `~proplot.axes.Axes.dualx` no longer accept "scale-spec" arguments.
+  Must be a function, two functions, or an axis scale instance (:pr:`96`).
+- Rename `~proplot.styletools.Cycle` ``samples`` to ``N``, rename
+  `~proplot.styletools.show_colors` ``nbreak`` to ``nhues`` (:pr:`98`).
 
 .. rubric:: Features
 
+- Add `~proplot.styletools.LinearSegmentedColormap.from_file` static methods (:pr:`98`).
+  You can now load files by passing a name to `~proplot.styletools.Colormap`.
 - Add Fira Math as DejaVu Sans-alternative (:pr:`95`). Has complete set of math characters.
 - Add TeX Gyre Heros as Helvetica-alternative (:pr:`95`). This is the new open-source default font.
 - Add `xlinewidth`, `ylinewidth`, `xgridcolor`, `ygridcolor` keyword
@@ -81,7 +85,7 @@ ProPlot v0.4.0 (2020-##-##)
 
 - Imperative mood for docstring summaries (:pr:`92`).
 - Fix `~proplot.styletools.show_cycles` bug (:pr:`90`) and show cycles using colorbars
-  rather than lines.
+  rather than lines (:pr:`98`).
 
 .. rubric:: Internals
 

docs/1dplots.ipynb

@@ -88,11 +88,13 @@
     "axs.format(suptitle='Automatic subplot formatting')\n",
     "\n",
     "# Plot DataArray\n",
-    "cycle = plot.Cycle(plot.shade('light blue', 0.4), fade=90, space='hpl')\n",
+    "color = plot.shade('light blue', 0.4)\n",
+    "cycle = plot.Cycle(color, fade=90, space='hpl')\n",
     "axs[0].plot(da, cycle=cycle, lw=3, colorbar='ul', colorbar_kw={'locator': 20})\n",
     "\n",
     "# Plot Dataframe\n",
-    "cycle = plot.Cycle(plot.shade('jade', 0.4), fade=90, space='hpl')\n",
+    "color = plot.shade('jade', 0.4)\n",
+    "cycle = plot.Cycle(color, fade=90, space='hpl')\n",
     "axs[1].plot(df, cycle=cycle, lw=3, legend='uc')"
    ]
   },

docs/2dplots.ipynb

@@ -95,7 +95,9 @@
     "axs[0].format(yreverse=True)\n",
     "\n",
     "# Plot DataFrame\n",
-    "axs[1].contourf(df, cmap='Blues', colorbar='r', linewidth=0.7, color='gray7')\n",
+    "axs[1].contourf(\n",
+    "    df, cmap='Blues', colorbar='r', linewidth=0.7, color='gray7'\n",
+    ")\n",
     "axs[1].format(xtickminor=False)"
    ]
   },

docs/environment.yml

@@ -18,7 +18,6 @@ dependencies:
   - pip
   - pip:
     - ..
-    - lxml
     - pyyaml
     - pyqt5
     - nbsphinx

proplot/colors/open.txt renamed to proplot/colors/opencolor.txt

@@ -0,0 +1 @@
+'#008fd5', '#fc4f30', '#e5ae38', '#6d904f', '#8b8b8b', '#810f7c',

proplot/cycles/538.hex

@@ -0,0 +1 @@
+"#2B4162", "#FA9F42", "#E0E0E2", "#A21817", "#0B6E4F",

proplot/cycles/Contrast.hex

@@ -0,0 +1 @@
+"#6C464F", "#9E768F", "#9FA4C4", "#B3CDD1", "#C7F0BD",

proplot/cycles/Cool.hex

@@ -0,0 +1 @@
+"#3498db", "#e74c3c", "#95a5a6", "#34495e", "#2ecc71", "#9b59b6",

proplot/cycles/FlatUI.hex

@@ -0,0 +1 @@
+"#23395B", "#D81E5B", "#FFFD98", "#B9E3C6", "#59C9A5",