<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/59ba829f8cfc17b0620f6caf0e6fcd0c59dfbe47">https://github.com/macports/macports-ports/commit/59ba829f8cfc17b0620f6caf0e6fcd0c59dfbe47</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 59ba829f8cfc17b0620f6caf0e6fcd0c59dfbe47
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue May 21 17:36:01 2024 +1000

<span style='display:block; white-space:pre;color:#404040;'>    diffoscope: update to 267, use python312
</span>---
 sysutils/diffoscope/Portfile                       | 18 ++++++++--------
 .../files/patch-tests__tests-source__py.diff       | 24 ----------------------
 2 files changed, 8 insertions(+), 34 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/diffoscope/Portfile b/sysutils/diffoscope/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d1818e54e8..0538e34b257 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/diffoscope/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/diffoscope/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                diffoscope
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             222
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             267
</span> categories          sysutils python
 platforms           {darwin any}
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,14 +23,12 @@ long_description    diffoscope will try to get to the bottom of what makes \
</span> 
 homepage            https://diffoscope.org/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  1d91698559acf0aecc9b67237ab06820d686e3d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  ffb90a9f6000c9b27763eb58bcdd9e3681fccec857e6807d4568680a3801098e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    3145249
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           md5 faa8723ce1e3f5bed10a91ea629c93b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160 6ee1be034a4759bc792443235ab5fe8c6a10f340 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 c0a807aa66e18eae88c1adca28988675c9749d3ad1a8db3d2eb7e2afb8763568 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size   3286596
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 310
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 312
</span> 
 depends_lib-append  port:py${python.version}-libarchive-c \
                     port:py${python.version}-magic
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +38,7 @@ depends_run-append  port:gnutar \
</span>                     bin:gzip:gzip \
                     bin:cpio:cpio
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-locale.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-tests__tests-source__py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-locale.diff
</span> 
 depends_test-append \
                     port:py${python.version}-py \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,3 +46,4 @@ depends_test-append \
</span>                     port:py${python.version}-black
 
 test.run            yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env-append     PATH=${python.prefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/diffoscope/files/patch-tests__tests-source__py.diff b/sysutils/diffoscope/files/patch-tests__tests-source__py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 94263fc8a2b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/diffoscope/files/patch-tests__tests-source__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;'>---- ./tests/test_source.py.orig    2022-09-27 17:48:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./tests/test_source.py 2022-09-27 17:48:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,7 +246,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def black_version():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        out = subprocess.check_output(("black", "--version"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        out = subprocess.check_output(("black-3.10", "--version"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     except subprocess.CalledProcessError as e:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         out = e.output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -257,10 +257,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@skip_unless_tool_is_at_least("black", black_version, "22.1.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@skip_unless_tool_is_at_least("black-3.10", black_version, "22.1.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def test_code_is_black_clean():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     output = subprocess.check_output(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        ("black", "--diff", "."), stderr=subprocess.PIPE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        ("black-3.10", "--diff", "."), stderr=subprocess.PIPE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     ).decode("utf-8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # Display diff in "captured stdout call"
</span></pre><pre style='margin:0'>

</pre>