<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/3a5ef42daf1f144e8a4dfcce921fe9dab30bafb2">https://github.com/macports/macports-ports/commit/3a5ef42daf1f144e8a4dfcce921fe9dab30bafb2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3a5ef42daf1f144e8a4dfcce921fe9dab30bafb2
</span>Author: Antoine Beyeler <abeyeler@ab-ware.com>
AuthorDate: Sat Apr 16 22:42:30 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> vpype: update to 1.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Switched to Python 3.10
</span><span style='display:block; white-space:pre;color:#404040;'> - Cleaned up shapely-related fix into a patch
</span><span style='display:block; white-space:pre;color:#404040;'> - Back-ported fix to remove dependency on setuptools
</span>---
graphics/vpype/Portfile | 16 ++++++----------
graphics/vpype/files/deps.patch | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vpype/Portfile b/graphics/vpype/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70a522c293f..bb9ee814fd1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vpype/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vpype/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,12 @@ PortSystem 1.0
</span> PortGroup python 1.0
name vpype
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.10.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b56bed854d574f69bf3c264d5c08c7061e238f6d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1b09fcd67ba911d8f558a09e3da6ae655ed921b7de599ebcacc7090550f77a71 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 476328
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 61a169e1f8eb1b4467bc1bdd4ec802b73003eca3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 782aa5ceb87fd88c81caeb3382f380ef3854d50b27be8857feca611a7dfc60e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 478984
</span>
description The Swiss-Army-knife command-line tool for plotter vector graphics.
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ license MIT
</span>
homepage https://github.com/abey79/vpype
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 310
</span>
depends_build-append \
port:py${python.version}-poetry-core
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +43,4 @@ depends_lib-append port:py${python.version}-asteval \
</span> port:py${python.version}-svgwrite \
port:py${python.version}-tomli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # vpype 1.9 pins shapely to 1.8.0 because of a compatibility issue with Pyinstaller
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this constraint must be relaxed for compatibility with py39-shapely
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\'Shapely\\\[vectorized\\\]==1\.8\.0\'|\'Shapely\\\[vectorized\\\]>=1\.8\.0\'|" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles deps.patch
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vpype/files/deps.patch b/graphics/vpype/files/deps.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a217002a350
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vpype/files/deps.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vpype/__init__.py.orig 2022-04-07 15:51:28.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vpype/__init__.py 2022-04-16 18:16:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,9 +14,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _get_version() -> str:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- import pkg_resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ from importlib.metadata import version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return pkg_resources.get_distribution("vpype").version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return version(__name__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __version__ = _get_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2022-04-07 15:51:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2022-04-16 18:30:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'vpype_viewer.qtviewer': ['resources/*']}
</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;'>+-['Shapely[vectorized]>=1.8.1.post1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++['Shapely[vectorized]>=1.8.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'asteval>=0.9.26,<0.10.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'cachetools>=4.2.2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'click>=8.0.1,<8.2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'numpy>=1.20',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pnoise>=0.1.0,<0.2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'scipy>=1.6,<2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'setuptools>=51.0.0,<52.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'svgelements>=1.6.10',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'svgwrite>=1.4,<1.5',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'tomli>=2.0.0,<3.0.0']
</span></pre><pre style='margin:0'>
</pre>