<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/7103b8172068875f2239a96e6ce9671f03410a7a">https://github.com/macports/macports-ports/commit/7103b8172068875f2239a96e6ce9671f03410a7a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7103b8172068875f2239a96e6ce9671f03410a7a
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Dec 11 16:30:49 2023 +0100

<span style='display:block; white-space:pre;color:#404040;'>    py-country: update to 23.12.11; drop py37; add py312
</span>---
 python/py-country/Portfile                         | 31 +++++++++++-----------
 python/py-country/files/disable-failing-tests.diff | 14 ++++++++++
 .../files/do-not-fail-without-package.dif          | 24 -----------------
 3 files changed, 30 insertions(+), 39 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-country/Portfile b/python/py-country/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f3aa5396f71..65e59749b67 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-country/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-country/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup           python 1.0
</span> 
 name                py-country
 python.rootname     pycountry
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             22.3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             23.12.11
</span> revision            0
 
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,24 +18,25 @@ long_description    {*}${description}.
</span> 
 homepage            https://github.com/flyingcircusio/pycountry
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  4232fb90e97eba3d7a6cdf1f49e2d149184640ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  b2163a246c585894d808f18783e19137cb70a0c18fb36748dc01fc6f109c1646 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    10141551
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  d1086fa3fa329330e317ea9a60c6f4f753560041 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  00569d82eaefbc6a490a311bfa84a9c571cff9ddbf8b0a4f4e7b4f868b4ad925 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    5927399
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     37 38 39 310 311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     38 39 310 311 312
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args      -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          do-not-fail-without-package.dif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517       yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    poetry
</span> 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    disable-failing-tests.diff
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # See: https://github.com/flyingcircusio/pycountry/issues/108
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    test.run                yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        xinstall -d ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        xinstall -m 0644 -W ${worksrcpath} TODO.txt LICENSE.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            HISTORY.txt README.rst ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} < 39} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-importlib-resources
</span>     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    test.run        yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    test.env-append PYTHONPATH=${worksrcpath}/src
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-country/files/disable-failing-tests.diff b/python/py-country/files/disable-failing-tests.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9ee7fc845b6
</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-country/files/disable-failing-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/pycountry/pycountry/issues/108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/pycountry/tests/test_general.py src/pycountry/tests/test_general.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 61dca7b..bedac98 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pycountry/tests/test_general.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pycountry/tests/test_general.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -242,6 +242,7 @@ def test_subdivision_empty_list():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     assert s.get(country_code="FOOBAR") is None
</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;'>++@pytest.mark.skip(reason="no way of currently testing this under MacPorts")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_has_version_attribute():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     assert pycountry.__version__ != "n/a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     assert len(pycountry.__version__) >= 5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-country/files/do-not-fail-without-package.dif b/python/py-country/files/do-not-fail-without-package.dif
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index abd0816b5b5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-country/files/do-not-fail-without-package.dif
</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;'>-https://github.com/flyingcircusio/pycountry/pull/52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/pycountry/__init__.py b/src/pycountry/__init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2fdaf404..4beeac59 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/pycountry/__init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/pycountry/__init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,12 +10,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     import pkg_resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     resource_filename = pkg_resources.resource_filename
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    __version__ = pkg_resources.get_distribution("pycountry").version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    __version__ = "n/a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     def resource_filename(package_or_requirement, resource_name):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return os.path.join(os.path.dirname(__file__), resource_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        __version__ = pkg_resources.get_distribution("pycountry").version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    except pkg_resources.DistributionNotFound:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        __version__ = 'n/a'
</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;'>- LOCALES_DIR = resource_filename("pycountry", "locales")
</span></pre><pre style='margin:0'>

</pre>