<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/f6185cab98e2d52207596e4afbfc049e184c06b5">https://github.com/macports/macports-ports/commit/f6185cab98e2d52207596e4afbfc049e184c06b5</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 f6185cab98e py-country: update to 22.3.5
</span>f6185cab98e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f6185cab98e2d52207596e4afbfc049e184c06b5
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Thu Apr 7 10:40:24 2022 +0200

<span style='display:block; white-space:pre;color:#404040;'>    py-country: update to 22.3.5
</span>---
 python/py-country/Portfile                         | 15 +++++++++-----
 .../files/do-not-fail-without-package.dif          | 24 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 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 db9b3e93429..cc12b0f2b7a 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.1.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             22.3.5
</span> revision            0
 
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,16 +17,21 @@ long_description    {*}${description}.
</span> 
 homepage            https://github.com/flyingcircusio/pycountry
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  aae4bc0dd11033b2e99c499ec29c54a992928a4d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  b9a6d9cdbf53f81ccdf73f6f5de01b0d8493cab2213a230af3e34458de85ea32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    10060795
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  4232fb90e97eba3d7a6cdf1f49e2d149184640ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  b2163a246c585894d808f18783e19137cb70a0c18fb36748dc01fc6f109c1646 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    10141551
</span> 
 python.versions     37 38 39 310
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args      -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          do-not-fail-without-package.dif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} ne ${subport}} {
     depends_build-append    port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_test-append     port:py${python.version}-pytest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_test-append     port:py${python.version}-pytest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:py${python.version}-pytest-cov
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # See: https://github.com/flyingcircusio/pycountry/issues/108
</span>     test.run                yes
     test.cmd                py.test-${python.branch}
     test.env                PYTHONPATH=${worksrcpath}/build/lib
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..abd0816b5b5
</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/do-not-fail-without-package.dif
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/flyingcircusio/pycountry/pull/52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/pycountry/__init__.py b/src/pycountry/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2fdaf404..4beeac59 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/pycountry/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/pycountry/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,12 +10,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     import pkg_resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     resource_filename = pkg_resources.resource_filename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    __version__ = pkg_resources.get_distribution("pycountry").version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    __version__ = "n/a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     def resource_filename(package_or_requirement, resource_name):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return os.path.join(os.path.dirname(__file__), resource_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        __version__ = pkg_resources.get_distribution("pycountry").version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    except pkg_resources.DistributionNotFound:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        __version__ = 'n/a'
</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;'>+ LOCALES_DIR = resource_filename("pycountry", "locales")
</span></pre><pre style='margin:0'>

</pre>