<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/3f80d45a31c3e70f0d698a6a6a2fc17cb2d10cb5">https://github.com/macports/macports-ports/commit/3f80d45a31c3e70f0d698a6a6a2fc17cb2d10cb5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3f80d45a31c py-matplotlib: update to 3.5.3
</span>3f80d45a31c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3f80d45a31c3e70f0d698a6a6a2fc17cb2d10cb5
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Wed Aug 17 21:42:08 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: update to 3.5.3
</span>---
python/py-matplotlib/Portfile | 11 +++----
python/py-matplotlib/files/patch-v35-setup.py.diff | 20 +++++++++++++
.../py-matplotlib/files/patch-v35-setupext.py.diff | 34 +++++++++++-----------
3 files changed, 43 insertions(+), 22 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 0ec20fe66d7..d85bf19ec3a 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;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span> PortGroup compiler_wrapper 1.0
name py-matplotlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.5.3
</span> revision 0
categories-append graphics math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,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 a24f5168091825aae8fec8278c46a8e4fd3d2173 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 48cf850ce14fa18067f2d9e0d646763681948487a8080ec0af2686468b4607a2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 35210006
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6eef2bea598dcd4b004e861349c081fe712a11c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 339cac48b80ddbc8bfd05daae0a3a73414651a8596904c2a881cfd1edb65f26c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 35236343
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,8 @@ 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:#e0ffe0;'>+ patch-v35-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v35-setup.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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ff24281abc5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v35-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2022-08-17 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2022-08-17 21:52:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setup_requires=[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "certifi>=2020.06.20",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "numpy>=1.17",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "setuptools_scm>=4,<7",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "setuptools_scm>=4",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "setuptools_scm_git_archive",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_requires=[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -330,7 +330,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "python-dateutil>=2.7",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] + (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Installing from a git checkout that is not producing a wheel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ["setuptools_scm>=4,<7"] if (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ["setuptools_scm>=4"] if (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Path(__file__).with_name(".git").exists() and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.environ.get("CIBUILDWHEEL", "0") != "1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ) else []
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v35-setupext.py.diff b/python/py-matplotlib/files/patch-v35-setupext.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fc7ce6e458..ca10116075c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v35-setupext.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v35-setupext.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setupext.py.orig 2021-05-09 11:35:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setupext.py 2021-05-09 11:35:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -381,6 +381,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setupext.py.orig 2022-08-10 22:00:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setupext.py 2022-08-17 21:46:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -391,6 +391,7 @@
</span> "src/_backend_agg_wrapper.cpp",
])
add_numpy_flags(ext)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> add_libagg_flags_and_sources(ext)
FreeType.add_flags(ext)
yield ext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,6 +392,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -401,6 +402,7 @@
</span> "linux": ["dl"],
"win32": ["ole32", "shell32", "user32"],
}.get(sys.platform, [])))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span> yield ext
# contour
ext = Extension(
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -400,6 +402,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -410,6 +412,7 @@
</span> "src/py_converters.cpp",
])
add_numpy_flags(ext)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@
</span> add_libagg_flags(ext)
yield ext
# ft2font
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,6 +415,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -421,6 +424,7 @@
</span> ])
FreeType.add_flags(ext)
add_numpy_flags(ext)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@
</span> add_libagg_flags(ext)
yield ext
# image
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -423,6 +427,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -430,6 +434,7 @@
</span> "src/py_converters.cpp",
])
add_numpy_flags(ext)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@
</span> add_libagg_flags_and_sources(ext)
yield ext
# path
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -432,6 +437,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -439,6 +444,7 @@
</span> "src/_path_wrapper.cpp",
])
add_numpy_flags(ext)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,31 +48,31 @@
</span> add_libagg_flags_and_sources(ext)
yield ext
# qhull
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -439,6 +445,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "matplotlib._qhull", ["src/qhull_wrap.c"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -446,6 +452,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "matplotlib._qhull", ["src/qhull_wrap.cpp"],
</span> define_macros=[("MPL_DEVNULL", os.devnull)])
add_numpy_flags(ext)
+ add_macports_flags(ext)
Qhull.add_flags(ext)
yield ext
# tkagg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -452,6 +459,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cygwin": ["psapi"]}.get(sys.platform, [])),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -459,6 +466,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "cygwin": ["comctl32", "psapi"]}.get(sys.platform, []),
</span> extra_link_args={"win32": ["-mwindows"]}.get(sys.platform, []))
add_numpy_flags(ext)
+ add_macports_flags(ext)
add_libagg_flags(ext)
yield ext
# tri
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -462,6 +470,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "src/mplutils.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -468,6 +476,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "src/tri/_tri_wrapper.cpp",
</span> ])
add_numpy_flags(ext)
+ add_macports_flags(ext)
yield ext
# ttconv
ext = Extension(
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -473,9 +482,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,9 +488,11 @@
</span> ],
include_dirs=["extern"])
add_numpy_flags(ext)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@
</span> class Tests(OptionalPackage):
name = "tests"
default_config = False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -494,6 +505,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -501,6 +512,11 @@
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,7 @@
</span> def add_numpy_flags(ext):
import numpy as np
ext.include_dirs.append(np.get_include())
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -706,4 +722,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -771,4 +787,5 @@
</span> ext.extra_link_args.extend(['-framework', 'Cocoa'])
if platform.python_implementation().lower() == 'pypy':
ext.extra_compile_args.append('-DPYPY=1')
</pre><pre style='margin:0'>
</pre>