Merge pull request matplotlib#61 from jimustafa/master

rougier · web-flow · commit 9fc11de5ea93 · 2021-06-16T22:39:41.000+02:00
Automatically generated logo for the cheatsheets
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -0,0 +1,10 @@
+[bumpversion]
+current_version = 3.4.2
+
+[bumpversion:glob:./handout-*.tex]
+search = Matplotlib {current_version}
+replace = Matplotlib {new_version}
+
+[bumpversion:file:./requirements/requirements.in]
+search = matplotlib=={current_version}
+replace = matplotlib=={new_version}
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.7
       - name: Install dependencies
         run: |
           sudo apt update
@@ -25,7 +25,6 @@ jobs:
             libproj-dev   \
             poppler-utils
           python -m pip install --upgrade pip
-          pip install -r requirements/requirements-base.txt
           pip install -r requirements/requirements.txt
       - name: Install Tex Live
         run: |
@@ -45,7 +44,7 @@ jobs:
           make -C fonts/
           cp -r fonts/ /usr/share/fonts/
           fc-cache
-          make figures cheatsheets handouts
+          make all
       - name: Check layouts
         run: |
           set -x
diff --git a/Makefile b/Makefile
@@ -4,7 +4,11 @@ SRC := $(wildcard *.tex)
 default: all
 
 .PHONY: all
-all: figures cheatsheets
+all: logos figures cheatsheets handouts
+
+.PHONY: logos
+logos:
+	cd logos && python mpl-logos2.py && pdfcrop mpl-logo2.pdf mpl-logo2.pdf
 
 .PHONY: figures
 figures:
@@ -31,6 +35,7 @@ fonts:
 
 .PHONY: clean
 clean: $(SRC)
+	- rm ./logos/mpl-logo2.pdf
 	git clean -f -X ./figures/
 	git clean -f ./scripts/*.pdf
 	latexmk -c $^
diff --git a/cheatsheets.tex b/cheatsheets.tex
@@ -261,7 +261,7 @@
 
 \begin{multicols*}{5}
 
-  \includegraphics[width=\columnwidth]{matplotlib.pdf}
+  \includegraphics[width=\columnwidth]{mpl-logo2.pdf}
   %\textbf{\Large \RobotoCon Matplotlib 3.2 cheat sheet}\\
   %{\ttfamily https://matplotlib.org} \hfill CC-BY 4.0
   % \bigskip
@@ -1038,7 +1038,8 @@
   \end{myboxed}
   %
   \begin{center}
-  \href{https://github.com/matplotlib/cheatsheets}{Matplotlib Cheatsheets} (c) 2020 Nicolas P. Rougier\\
+  \href{https://github.com/matplotlib/cheatsheets}{Matplotlib Cheatsheets}\\
+  Copyright (c) 2021 Matplotlib Development Team\\
   Released under a CC-BY 4.0 International License\\
   \smallskip
   \includegraphics[width=\columnwidth]{numfocus.png}
diff --git a/handout-beginner.tex b/handout-beginner.tex
@@ -296,9 +296,12 @@ \subsection*{\rmfamily Save \mdseries (bitmap or vector format)}
 %
 \vfill
 %
-{\scriptsize Matplotlib 3.2 handout for beginners. Copyright (c)
-  2020 Nicolas P. Rougier. Released under a CC-BY International 4.0
-  License. Supported by NumFocus Grant \#12345.\par}
+{\scriptsize
+  Matplotlib 3.4.2 handout for beginners.
+  Copyright (c) 2021 Matplotlib Development Team.
+  Released under a CC-BY 4.0 International License.
+  Supported by NumFOCUS.
+\par}
 
 \end{multicols*}
 \end{document}
diff --git a/handout-intermediate.tex b/handout-intermediate.tex
@@ -182,6 +182,7 @@ \subsection*{\rmfamily Colors}
 %\includegraphics[width=\linewidth]{colormap-magma.pdf} \medskip
 
 % -----------------------------------------------------------------------------
+\vspace{-1em}
 \subsection*{\rmfamily Size \& DPI}
 
 Consider a square figure to be included in a two-columns A4 paper with
@@ -196,9 +197,12 @@ \subsection*{\rmfamily Size \& DPI}
 
 \vfill
 %
-{\scriptsize Matplotlib 3.2 handout for intermediate users. Copyright
-  (c) 2020 Nicolas P. Rougier. Released under a CC-BY 4.0
-  License. Supported by NumFocus Grant \#12345.\par}
+{\scriptsize
+  Matplotlib 3.4.2 handout for intermediate users.
+  Copyright (c) 2021 Matplotlib Development Team.
+  Released under a CC-BY 4.0 International License.
+  Supported by NumFOCUS.
+\par}
 
 
 
diff --git a/handout-tips.tex b/handout-tips.tex
@@ -242,10 +242,12 @@ \subsection*{\rmfamily Read the documentation}
 
 \vfill
 %
-{\scriptsize Matplotlib 3.2 handout for tips \& tricks.
-             Copyright (c) 2020 Nicolas P. Rougier.
-             Released under a CC-BY 4.0 License.
-             Supported by NumFocus Grant \#12345.\par}
+{\scriptsize
+  Matplotlib 3.4.2 handout for tips \& tricks.
+  Copyright (c) 2021 Matplotlib Development Team.
+  Released under a CC-BY 4.0 International License.
+  Supported by NumFOCUS.
+\par}
 
 
 
diff --git a/logos/mpl-logos2.py b/logos/mpl-logos2.py
@@ -0,0 +1,174 @@
+"""
+===============
+Matplotlib logo
+===============
+
+This example generates the current matplotlib logo.
+"""
+
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.cm as cm
+import matplotlib.font_manager
+from matplotlib.patches import Rectangle, PathPatch
+from matplotlib.textpath import TextPath
+import matplotlib.transforms as mtrans
+
+MPL_BLUE = '#11557c'
+
+
+def get_font_properties():
+    # The original font is Calibri, if that is not installed, we fall back
+    # to Carlito, which is metrically equivalent.
+    if 'Calibri' in matplotlib.font_manager.findfont('Calibri:bold'):
+        return matplotlib.font_manager.FontProperties(family='Calibri',
+                                                      weight='bold')
+    if 'Carlito' in matplotlib.font_manager.findfont('Carlito:bold'):
+        print('Original font not found. Falling back to Carlito. '
+              'The logo text will not be in the correct font.')
+        return matplotlib.font_manager.FontProperties(family='Carlito',
+                                                      weight='bold')
+    print('Original font not found. '
+          'The logo text will not be in the correct font.')
+    return None
+
+
+def create_icon_axes(fig, ax_position, lw_bars, lw_grid, lw_border, rgrid):
+    """
+    Create a polar axes containing the matplotlib radar plot.
+
+    Parameters
+    ----------
+    fig : matplotlib.figure.Figure
+        The figure to draw into.
+    ax_position : (float, float, float, float)
+        The position of the created Axes in figure coordinates as
+        (x, y, width, height).
+    lw_bars : float
+        The linewidth of the bars.
+    lw_grid : float
+        The linewidth of the grid.
+    lw_border : float
+        The linewidth of the Axes border.
+    rgrid : array-like
+        Positions of the radial grid.
+
+    Returns
+    -------
+    ax : matplotlib.axes.Axes
+        The created Axes.
+    """
+    with plt.rc_context({'axes.edgecolor': MPL_BLUE,
+                         'axes.linewidth': lw_border}):
+        ax = fig.add_axes(ax_position, projection='polar')
+        ax.set_axisbelow(True)
+
+        N = 7
+        arc = 2. * np.pi
+        theta = np.arange(0.0, arc, arc / N)
+        radii = np.array([2, 6, 8, 7, 4, 5, 8])
+        width = np.pi / 4 * np.array([0.4, 0.4, 0.6, 0.8, 0.2, 0.5, 0.3])
+        bars = ax.bar(theta, radii, width=width, bottom=0.0, align='edge',
+                      edgecolor='0.3', lw=lw_bars)
+        for r, bar in zip(radii, bars):
+            color = *cm.jet(r / 10.)[:3], 0.6  # color from jet with alpha=0.6
+            bar.set_facecolor(color)
+
+        ax.tick_params(labelbottom=False, labeltop=False,
+                       labelleft=False, labelright=False)
+
+        ax.grid(lw=lw_grid, color='0.9')
+        ax.set_rmax(9)
+        ax.set_yticks(rgrid)
+
+        # the actual visible background - extends a bit beyond the axis
+        ax.add_patch(Rectangle((0, 0), arc, 9.58,
+                               facecolor='white', zorder=0,
+                               clip_on=False, in_layout=False))
+        return ax
+
+
+def create_text_axes(fig, height_px):
+    """Create an axes in *fig* that contains 'matplotlib' as Text."""
+    ax = fig.add_axes((0, 0, 1, 1))
+    ax.set_aspect("equal")
+    ax.set_axis_off()
+
+    path = TextPath((0, 0), "matplotlib", size=height_px * 0.8,
+                    prop=get_font_properties())
+
+    fp = get_font_properties()
+    fp.set_weight('light')
+    path1 = TextPath((80, -13), 'Cheat sheet', size=height_px * 0.12,
+                     prop=fp)
+    path2 = TextPath((310, -13), f'Version {matplotlib. __version__}',
+                     size=height_px * 0.12,
+                     prop=fp)
+
+    angle = 4.25  # degrees
+    trans = mtrans.Affine2D().skew_deg(angle, 0)
+
+    patch = PathPatch(path, transform=trans + ax.transData, color=MPL_BLUE,
+                      lw=0)
+    patch1 = PathPatch(path1, transform=trans + ax.transData, color=MPL_BLUE,
+                       lw=0)
+    patch2 = PathPatch(path2, color=MPL_BLUE,
+                       lw=0)
+
+    ax.add_patch(patch)
+    ax.add_patch(patch1)
+    ax.add_patch(patch2)
+    ax.autoscale()
+
+
+def make_logo(height_px, lw_bars, lw_grid, lw_border, rgrid, with_text=False):
+    """
+    Create a full figure with the Matplotlib logo.
+
+    Parameters
+    ----------
+    height_px : int
+        Height of the figure in pixel.
+    lw_bars : float
+        The linewidth of the bar border.
+    lw_grid : float
+        The linewidth of the grid.
+    lw_border : float
+        The linewidth of icon border.
+    rgrid : sequence of float
+        The radial grid positions.
+    with_text : bool
+        Whether to draw only the icon or to include 'matplotlib' as text.
+    """
+    dpi = 100
+    height = height_px / dpi
+    figsize = (5 * height, height) if with_text else (height, height)
+    fig = plt.figure(figsize=figsize, dpi=dpi)
+    fig.patch.set_alpha(0)
+
+    if with_text:
+        create_text_axes(fig, height_px)
+    ax_pos = (0.535, 0.12, .17, 0.75) if with_text else (0.03, 0.03, .94, .94)
+    ax = create_icon_axes(fig, ax_pos, lw_bars, lw_grid, lw_border, rgrid)
+
+    fig.savefig('mpl-logo2.pdf')
+
+    return fig, ax
+
+##############################################################################
+# A large logo:
+
+make_logo(height_px=110, lw_bars=0.7, lw_grid=0.5, lw_border=1,
+          rgrid=[1, 3, 5, 7])
+
+##############################################################################
+# A small 32px logo:
+
+make_logo(height_px=32, lw_bars=0.3, lw_grid=0.3, lw_border=0.3, rgrid=[5])
+
+##############################################################################
+# A large logo including text, as used on the matplotlib website.
+
+make_logo(height_px=110, lw_bars=0.7, lw_grid=0.5, lw_border=1,
+          rgrid=[1, 3, 5, 7], with_text=True)
+# plt.show()
diff --git a/requirements/Makefile b/requirements/Makefile
@@ -2,13 +2,11 @@
 default: all
 
 .PHONY: all
-all: requirements-base.txt requirements.txt
+all: requirements.txt
 
 .PHONY: install
-install: requirements-base.txt requirements.txt
+install: requirements.txt
 	pip-sync $^
 
-requirements.txt: requirements-base.txt
-
 %.txt: %.in
 	pip-compile $<
diff --git a/requirements/requirements-base.in b/requirements/requirements-base.in
diff --git a/requirements/requirements-base.txt b/requirements/requirements-base.txt
diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -1,8 +1,7 @@
--c ./requirements-base.txt
-
-cartopy
-fonttools[woff]
-matplotlib
+bump2version
+cartopy==0.19.0.post1
+matplotlib==3.4.2
+pip-tools
 pre-commit
 scipy
 
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
