On 2020/01/21 19:55, Paco Esteban wrote: > Hi ports@, > > Here's an update for devel/py-country from 18.12.8 to 19.8.18. > This is part of a dependency rabbit hole I fell into that may or may not > end up well, but this is done already so here it is. > > All tests pass for me on amd64. I checked consumers, these are the > results: > > * multimedia/streamlink: all tests pass > * www/py-formencode: > py2 fails 2 tests with a DNS timeout > py3 fails tests because it cannot find `dnspython3`. I think this is > a missing dependency and PRIVSEP is making it apparent.
There used to be separate dnspython3 and dnspython, but py3 support has been rolled into the main dnspython now. formencode is old (last upstream commit ~4 years ago) and I'm not entirely surprised about tests failing. I wouldn't worry about this though, the changes since 18.12.8 are unlikely to break things. (I see the version numbers are just based on dates rather than major/minor). > diff f9926d52c465ed7320e905f705e846cc22b08451 > 81f663d35cd2e7399bb557c4bd32c15049193b14 > blob - 0bfef69066a3a034469c33a214ad6fe536805ac2 > blob + 540b26f5f77c3aedb432d321038461bd5cee2428 > --- devel/py-country/Makefile > +++ devel/py-country/Makefile > @@ -2,10 +2,9 @@ > > COMMENT = country, language, currency and scripts definitions > > -MODPY_EGG_VERSION = 18.12.8 > +MODPY_EGG_VERSION = 19.8.18 19.7.15 (2019-07-15) [...] - Drop support for Python 2. py2 still works for now, but perhaps we should add a comment to the port Makefile mentioning this though so that people doing future updates make sure they test there .. > DISTNAME = pycountry-${MODPY_EGG_VERSION} > PKGNAME = ${DISTNAME:S/py/py-/} > -REVISION = 1 > > CATEGORIES = devel > > blob - b4745cf86b0708b398dfbe582954080e3e84e5f1 > blob + 2a34981920b88e5ae5addba13ff1b0e034576662 > --- devel/py-country/distinfo > +++ devel/py-country/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (pycountry-18.12.8.tar.gz) = > jsQCCysVzUEIk9Vzgg1C7hL+UDZTMuWMCXXJU7YKFt4= > -SIZE (pycountry-18.12.8.tar.gz) = 10026953 > +SHA256 (pycountry-19.8.18.tar.gz) = > PFeqQK3PKT1Zvrr/vmDYw5l2+6eNhGoBjcDC7Jxss8s= > +SIZE (pycountry-19.8.18.tar.gz) = 10003160 > blob - 031dc25d0da2814e24f88a0718ed0a0a7194a40d > blob + c778d79fc708ac37809fb11369e635cc9292160f > --- devel/py-country/pkg/PLIST > +++ devel/py-country/pkg/PLIST > @@ -1,4 +1,6 @@ > @comment $OpenBSD: PLIST,v 1.8 2019/02/17 20:22:22 sthen Exp $ > +lib/python${MODPY_VERSION}/ > +lib/python${MODPY_VERSION}/site-packages/ I'm not sure how these lines were added, the directories come from a dependency though and don't need listing. update-plist removes them here .. > lib/python${MODPY_VERSION}/site-packages/pycountry/ > > lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ > > lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO > @@ -17,6 +19,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/dat > lib/python${MODPY_VERSION}/site-packages/pycountry/databases/iso3166-3.json > lib/python${MODPY_VERSION}/site-packages/pycountry/databases/iso4217.json > lib/python${MODPY_VERSION}/site-packages/pycountry/databases/iso639-3.json > +lib/python${MODPY_VERSION}/site-packages/pycountry/databases/iso639-5.json > lib/python${MODPY_VERSION}/site-packages/pycountry/db.py > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ab/ > @@ -54,6 +57,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ar/LC_MESSAGES/iso3166-1.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ar/LC_MESSAGES/iso3166-3.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ar/LC_MESSAGES/iso3166.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ar/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ar/LC_MESSAGES/iso639-3.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ar/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/as/ > @@ -94,6 +98,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/be/LC_MESSAGES/iso3166-3.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/be/LC_MESSAGES/iso3166.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/be/LC_MESSAGES/iso4217.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/be/LC_MESSAGES/iso639-5.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/bg/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/bg/LC_MESSAGES/ > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/bg/LC_MESSAGES/iso15924.mo > @@ -211,6 +216,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/da/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/da/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/da/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/da/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/da/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/de/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/de/LC_MESSAGES/ > @@ -222,6 +228,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/de/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/de/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/de/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/de/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/de/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/dv/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/dv/LC_MESSAGES/ > @@ -244,6 +251,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/el/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/el/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/el/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/el/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/el/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/en/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/en/LC_MESSAGES/ > @@ -279,6 +287,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/et/LC_MESSAGES/iso3166.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/et/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/et/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/et/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/et/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/eu/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/eu/LC_MESSAGES/ > @@ -326,6 +335,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/fr/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/fr/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/fr/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/fr/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/fr/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/frp/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/frp/LC_MESSAGES/ > @@ -387,6 +397,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/he/LC_MESSAGES/ > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/he/LC_MESSAGES/iso15924.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/he/LC_MESSAGES/iso3166-1.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/he/LC_MESSAGES/iso3166-2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/he/LC_MESSAGES/iso3166-3.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/he/LC_MESSAGES/iso3166.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/he/LC_MESSAGES/iso639-3.mo > @@ -419,6 +430,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/hu/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/hu/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/hu/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/hu/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/hu/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/hy/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/hy/LC_MESSAGES/ > @@ -441,6 +453,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/id/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/id/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/id/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/id/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/id/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/io/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/io/LC_MESSAGES/ > @@ -454,6 +467,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/is/LC_MESSAGES/iso3166.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/is/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/is/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/is/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/is/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/it/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/it/LC_MESSAGES/ > @@ -465,6 +479,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/it/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/it/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/it/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/it/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/it/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/iu/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/iu/LC_MESSAGES/ > @@ -645,6 +660,10 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nb/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nb/LC_MESSAGES/iso639-3.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nb/LC_MESSAGES/iso639_3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nb_NO/ > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nb_NO/LC_MESSAGES/ > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nb_NO/LC_MESSAGES/iso639-5.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ne/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ne/LC_MESSAGES/ > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ne/LC_MESSAGES/iso3166-1.mo > @@ -660,6 +679,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nl/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nl/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nl/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nl/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nl/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nn/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/nn/LC_MESSAGES/ > @@ -723,6 +743,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/pl/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/pl/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/pl/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/pl/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/pl/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ps/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ps/LC_MESSAGES/ > @@ -785,6 +806,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sc/LC_MESSAGES/iso3166-3.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sc/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sc/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sc/LC_MESSAGES/iso639-5.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sd/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sd/LC_MESSAGES/ > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sd/LC_MESSAGES/iso3166-1.mo > @@ -838,6 +860,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr@latin/ > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr@latin/LC_MESSAGES/ > @@ -849,6 +872,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr@latin/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr@latin/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr@latin/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr@latin/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sr@latin/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/ > @@ -860,6 +884,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sw/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sw/LC_MESSAGES/ > @@ -956,6 +981,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso3166_2.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso4217.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso639-3.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso639-5.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso639_3.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ur/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ur/LC_MESSAGES/ > @@ -1030,6 +1056,9 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_HK/LC_MESSAGES/iso3166-3.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_HK/LC_MESSAGES/iso3166.mo > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_HK/LC_MESSAGES/iso4217.mo > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_Hant/ > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_Hant/LC_MESSAGES/ > +lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_Hant/LC_MESSAGES/iso639-5.mo > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_TW/ > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_TW/LC_MESSAGES/ > > lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_TW/LC_MESSAGES/iso15924.mo > > > -- > Paco Esteban. > 5818130B8A6DBC03 >