<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/453019efee226dc9f5c3387c2d683ef139113ed8">https://github.com/macports/macports-ports/commit/453019efee226dc9f5c3387c2d683ef139113ed8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 453019efee226dc9f5c3387c2d683ef139113ed8
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Dec 13 11:03:53 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-matplotlib: update to 3.5.1
</span>---
 python/py-matplotlib/Portfile                      | 14 ++++++-------
 python/py-matplotlib/files/patch-v35-setup.py.diff | 24 ----------------------
 2 files changed, 6 insertions(+), 32 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/Portfile b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd466dfeedf..2e5d67da06e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,10 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-matplotlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> 
 categories-append   graphics math
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> license             {PSF BSD}
 maintainers         {reneeotten @reneeotten} openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +24,9 @@ long_description    Matplotlib strives to produce publication quality 2D \
</span> 
 homepage            https://matplotlib.org/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  10659b89bc347e5e05b854cb43d81086ece8f58e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  38892a254420d95594285077276162a5e9e9c30b6da08bdc2a4d53331ad9a6fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    34963685
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  6edc7ff839d76140b465e56cd89e8ff0e140f949 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    35320470
</span> 
 use_parallel_build  no
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,8 +54,7 @@ if {${name} ne ${subport}} {
</span> 
     patchfiles      patch-v35-mplsetup.cfg.diff \
                     patch-v35-src-macosx.m.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-v35-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-v35-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-v35-setupext.py.diff
</span> 
     if {${python.version} eq 27} {
         version     2.2.5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v35-setup.py.diff b/python/py-matplotlib/files/patch-v35-setup.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eb30bf6ceef..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v35-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The released version throws the error below when importing matplotlib:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Traceback (most recent call last):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  File "<stdin>", line 1, in <module>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  File "/opt/local/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages/matplotlib/__init__.py", line 895, in <module>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    defaultParams = rcsetup.defaultParams = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  File "/opt/local/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages/matplotlib/__init__.py", line 898, in <dictcomp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    rcParamsDefault[key]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  File "/opt/local/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages/matplotlib/__init__.py", line 674, in __getitem__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    return dict.__getitem__(self, key)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-KeyError: 'webagg.port'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-For upstream's merged fix see: https://github.com/matplotlib/matplotlib/pull/21662
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,7 +205,7 @@ def update_matplotlibrc(path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         idx for idx, line in enumerate(template_lines)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if "#backend:" in line]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     template_lines[backend_line_idx] = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        "#backend: {}".format(setupext.options["backend"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        "#backend: {}\n".format(setupext.options["backend"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if setupext.options["backend"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         else "##backend: Agg")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     path.write_text("".join(template_lines))
</span></pre><pre style='margin:0'>

</pre>