CVS commit: pkgsrc/geography/py-country

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jun 14 18:54:20 UTC 2024

Modified Files:
        pkgsrc/geography/py-country: Makefile PLIST distinfo

Log Message:
py-country: updated to 24.6.1

24.6.1 (2024-06-01)
-------------------

- **Breaking change**: Reverted the fallback to name when country common_name
  or official_name attributes not available, which was added in 23.12.11.

- Fixed import of importlib_metadata to importlib.metadata

- Fixed bug causing parent subdivision codes to be returned with additional
  country code preceding (i.e. GB-GB-ENG instead of GB-ENG)

- Update to iso-codes 4.16.0. (Thanks to musicinmybrain!)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/geography/py-country/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/py-country/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/geography/py-country/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/py-country/Makefile
diff -u pkgsrc/geography/py-country/Makefile:1.9 pkgsrc/geography/py-country/Makefile:1.10
--- pkgsrc/geography/py-country/Makefile:1.9    Mon Feb  5 21:35:29 2024
+++ pkgsrc/geography/py-country/Makefile        Fri Jun 14 18:54:20 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2024/02/05 21:35:29 adam Exp $
+# $NetBSD: Makefile,v 1.10 2024/06/14 18:54:20 adam Exp $
 
-DISTNAME=      pycountry-23.12.11
+DISTNAME=      pycountry-24.6.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
 CATEGORIES=    geography python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pycountry/}
@@ -11,10 +11,16 @@ COMMENT=    ISO country, subdivision, langu
 LICENSE=       gnu-lgpl-v2.1
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-poetry-core>=1.0.0:../../devel/py-poetry-core
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+.include "../../lang/python/pyversion.mk"
+.if ${PYTHON_VERSION} < 309
+DEPENDS+=      ${PYPKGPREFIX}-importlib-resources-[0-9]*:../../devel/py-importlib-resources
+.endif
+
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/py-country/PLIST
diff -u pkgsrc/geography/py-country/PLIST:1.7 pkgsrc/geography/py-country/PLIST:1.8
--- pkgsrc/geography/py-country/PLIST:1.7       Mon Feb  5 21:35:29 2024
+++ pkgsrc/geography/py-country/PLIST   Fri Jun 14 18:54:20 2024
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2024/02/05 21:35:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2024/06/14 18:54:20 adam Exp $
 ${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.txt
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/pycountry/COPYRIGHT.txt
 ${PYSITELIB}/pycountry/__init__.py
 ${PYSITELIB}/pycountry/__init__.pyc
 ${PYSITELIB}/pycountry/__init__.pyo
@@ -295,7 +296,9 @@ ${PYSITELIB}/pycountry/locales/kk/LC_MES
 ${PYSITELIB}/pycountry/locales/kk/LC_MESSAGES/iso3166-3.mo
 ${PYSITELIB}/pycountry/locales/kl/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/km/LC_MESSAGES/iso3166-1.mo
+${PYSITELIB}/pycountry/locales/km/LC_MESSAGES/iso3166-2.mo
 ${PYSITELIB}/pycountry/locales/km/LC_MESSAGES/iso3166-3.mo
+${PYSITELIB}/pycountry/locales/km/LC_MESSAGES/iso4217.mo
 ${PYSITELIB}/pycountry/locales/kmr/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/kmr/LC_MESSAGES/iso3166-3.mo
 ${PYSITELIB}/pycountry/locales/kmr/LC_MESSAGES/iso639-3.mo
@@ -320,6 +323,7 @@ ${PYSITELIB}/pycountry/locales/lt/LC_MES
 ${PYSITELIB}/pycountry/locales/lt/LC_MESSAGES/iso3166-3.mo
 ${PYSITELIB}/pycountry/locales/lt/LC_MESSAGES/iso4217.mo
 ${PYSITELIB}/pycountry/locales/lt/LC_MESSAGES/iso639-3.mo
+${PYSITELIB}/pycountry/locales/lt/LC_MESSAGES/iso639-5.mo
 ${PYSITELIB}/pycountry/locales/lv/LC_MESSAGES/iso15924.mo
 ${PYSITELIB}/pycountry/locales/lv/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/lv/LC_MESSAGES/iso3166-2.mo
@@ -341,7 +345,6 @@ ${PYSITELIB}/pycountry/locales/mn/LC_MES
 ${PYSITELIB}/pycountry/locales/mn/LC_MESSAGES/iso3166-3.mo
 ${PYSITELIB}/pycountry/locales/mn/LC_MESSAGES/iso4217.mo
 ${PYSITELIB}/pycountry/locales/mn/LC_MESSAGES/iso639-3.mo
-${PYSITELIB}/pycountry/locales/mo/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/mr/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/mr/LC_MESSAGES/iso3166-3.mo
 ${PYSITELIB}/pycountry/locales/mr/LC_MESSAGES/iso639-3.mo
@@ -354,12 +357,12 @@ ${PYSITELIB}/pycountry/locales/mt/LC_MES
 ${PYSITELIB}/pycountry/locales/my/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/na/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/nah/LC_MESSAGES/iso3166-1.mo
-${PYSITELIB}/pycountry/locales/nb/LC_MESSAGES/iso15924.mo
-${PYSITELIB}/pycountry/locales/nb/LC_MESSAGES/iso3166-1.mo
-${PYSITELIB}/pycountry/locales/nb/LC_MESSAGES/iso3166-3.mo
-${PYSITELIB}/pycountry/locales/nb/LC_MESSAGES/iso4217.mo
-${PYSITELIB}/pycountry/locales/nb/LC_MESSAGES/iso639-3.mo
+${PYSITELIB}/pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo
+${PYSITELIB}/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo
+${PYSITELIB}/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-3.mo
+${PYSITELIB}/pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo
+${PYSITELIB}/pycountry/locales/nb_NO/LC_MESSAGES/iso639-3.mo
 ${PYSITELIB}/pycountry/locales/nb_NO/LC_MESSAGES/iso639-5.mo
 ${PYSITELIB}/pycountry/locales/ne/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/ne/LC_MESSAGES/iso3166-3.mo
@@ -426,6 +429,8 @@ ${PYSITELIB}/pycountry/locales/ro/LC_MES
 ${PYSITELIB}/pycountry/locales/ro/LC_MESSAGES/iso3166-3.mo
 ${PYSITELIB}/pycountry/locales/ro/LC_MESSAGES/iso4217.mo
 ${PYSITELIB}/pycountry/locales/ro/LC_MESSAGES/iso639-3.mo
+${PYSITELIB}/pycountry/locales/ro/LC_MESSAGES/iso639-5.mo
+${PYSITELIB}/pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/ru/LC_MESSAGES/iso15924.mo
 ${PYSITELIB}/pycountry/locales/ru/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo
@@ -497,9 +502,13 @@ ${PYSITELIB}/pycountry/locales/sv/LC_MES
 ${PYSITELIB}/pycountry/locales/sv/LC_MESSAGES/iso639-5.mo
 ${PYSITELIB}/pycountry/locales/sw/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/sw/LC_MESSAGES/iso3166-3.mo
+${PYSITELIB}/pycountry/locales/ta/LC_MESSAGES/iso15924.mo
 ${PYSITELIB}/pycountry/locales/ta/LC_MESSAGES/iso3166-1.mo
+${PYSITELIB}/pycountry/locales/ta/LC_MESSAGES/iso3166-2.mo
 ${PYSITELIB}/pycountry/locales/ta/LC_MESSAGES/iso3166-3.mo
+${PYSITELIB}/pycountry/locales/ta/LC_MESSAGES/iso4217.mo
 ${PYSITELIB}/pycountry/locales/ta/LC_MESSAGES/iso639-3.mo
+${PYSITELIB}/pycountry/locales/ta/LC_MESSAGES/iso639-5.mo
 ${PYSITELIB}/pycountry/locales/te/LC_MESSAGES/iso3166-1.mo
 ${PYSITELIB}/pycountry/locales/te/LC_MESSAGES/iso3166-3.mo
 ${PYSITELIB}/pycountry/locales/tg/LC_MESSAGES/iso3166-1.mo

Index: pkgsrc/geography/py-country/distinfo
diff -u pkgsrc/geography/py-country/distinfo:1.10 pkgsrc/geography/py-country/distinfo:1.11
--- pkgsrc/geography/py-country/distinfo:1.10   Mon Feb  5 21:35:29 2024
+++ pkgsrc/geography/py-country/distinfo        Fri Jun 14 18:54:20 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2024/02/05 21:35:29 adam Exp $
+$NetBSD: distinfo,v 1.11 2024/06/14 18:54:20 adam Exp $
 
-BLAKE2s (pycountry-23.12.11.tar.gz) = fdba0cc3ceb15d6f4a6267bebd4ed22e10421287c1511909f5dd8d9dac0d26a1
-SHA512 (pycountry-23.12.11.tar.gz) = 25b5a74c0dd8115473571976a64b6fed7010f62c1b3b4c1888b9e13a7cf4f533173f51d4652d55c426adee4e0ff119bb6e3132d04dce150b9d1ca4b11366c579
-Size (pycountry-23.12.11.tar.gz) = 5927399 bytes
+BLAKE2s (pycountry-24.6.1.tar.gz) = fc44f0df0a005f24dac65e3201dab1b3ee684193e112cdff1df1c204b2c94c93
+SHA512 (pycountry-24.6.1.tar.gz) = 36d8f68b830d74259a5f9ac1c9c97c1b228b0072613229e6f579ea5af587ab1cd25f0637a2cdd1dbf2ae8225e2aa2958d25f1e6df42d577da821d85c4c49ae93
+Size (pycountry-24.6.1.tar.gz) = 6043910 bytes