<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/185e8d55d8779653c341323c4c34ad6e1fa96c6b">https://github.com/macports/macports-ports/commit/185e8d55d8779653c341323c4c34ad6e1fa96c6b</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 185e8d55d87 diffoscope: Update to 222, use Python 3.10
</span>185e8d55d87 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 185e8d55d8779653c341323c4c34ad6e1fa96c6b
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Sep 27 18:00:15 2022 +0200

<span style='display:block; white-space:pre;color:#404040;'>    diffoscope: Update to 222, use Python 3.10
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Upstream asked us to ship a newer version. Some of the tests still fail,
</span><span style='display:block; white-space:pre;color:#404040;'>    but that's probably due to missing dependencies or specifics of macOS.
</span>---
 sysutils/diffoscope/Portfile                       | 16 ++++++++-------
 sysutils/diffoscope/files/patch-locale.diff        | 14 ++++++-------
 .../files/patch-tests__tests-source__py.diff       | 24 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 14 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 6c416b83bf4..8e27cebac8a 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             137
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             222
</span> categories          sysutils python
 platforms           darwin
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,11 +24,11 @@ long_description    diffoscope will try to get to the bottom of what makes \
</span> homepage            https://diffoscope.org/
 master_sites        pypi:d/diffoscope
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  f69e86b7c6334bb0a69ef7a8d241a2faed1a9794 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  e1fc59dbbae133da65c827ba990243119f30731b1489002c396d49c66300b9da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1557283
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  1d91698559acf0aecc9b67237ab06820d686e3d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  ffb90a9f6000c9b27763eb58bcdd9e3681fccec857e6807d4568680a3801098e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    3145249
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 310
</span> 
 depends_build-append \
                     port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +41,13 @@ 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:#e0ffe0;'>+patchfiles          patch-locale.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-tests__tests-source__py.diff
</span> 
 depends_test-append \
                     port:py${python.version}-py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-pytest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-pytest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-black
</span> 
 test.run            yes
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/diffoscope/files/patch-locale.diff b/sysutils/diffoscope/files/patch-locale.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c40da365652..6b26a464149 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/diffoscope/files/patch-locale.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/diffoscope/files/patch-locale.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- diffoscope/environ.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ diffoscope/environ.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,6 +55,6 @@ def normalize_environment():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         os.environ[x] = 'C'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./diffoscope/environ.py.orig   2022-09-23 10:04:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./diffoscope/environ.py        2022-09-27 17:22:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         os.environ[x] = "C"
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     os.environ['TZ'] = 'UTC'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    os.environ['LC_CTYPE'] = 'C.UTF-8'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    os.environ['LC_CTYPE'] = 'UTF-8'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     os.environ["TZ"] = "UTC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    os.environ["LC_CTYPE"] = "C.UTF-8"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    os.environ["LC_CTYPE"] = "UTF-8"
</span>  
      time.tzset()
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..94263fc8a2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/diffoscope/files/patch-tests__tests-source__py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tests/test_source.py.orig    2022-09-27 17:48:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tests/test_source.py 2022-09-27 17:48:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +246,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def black_version():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        out = subprocess.check_output(("black", "--version"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        out = subprocess.check_output(("black-3.10", "--version"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     except subprocess.CalledProcessError as e:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         out = e.output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,10 +257,10 @@
</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;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@skip_unless_tool_is_at_least("black", black_version, "22.1.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@skip_unless_tool_is_at_least("black-3.10", black_version, "22.1.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_code_is_black_clean():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     output = subprocess.check_output(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        ("black", "--diff", "."), stderr=subprocess.PIPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        ("black-3.10", "--diff", "."), stderr=subprocess.PIPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ).decode("utf-8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # Display diff in "captured stdout call"
</span></pre><pre style='margin:0'>

</pre>