From nobody Fri Aug 19 05:25:56 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M89Fw4jRjz4ZVdc; Fri, 19 Aug 2022 05:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M89Fw4JN3z3SSW; Fri, 19 Aug 2022 05:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660886756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rd5em9DfXEhPoJwOwpkkIxmPUIF2BfrZRj/unu2vQIc=; b=ObJuOyV0No8REuxGRM6Tz5KTukM5fNZaEGz8McZNAO6DZqBahiUC3Au8Hyc70lCCeltDme sFayZP7wZDBm8+XN3VBCeTkOhYeHYICszX3yaBM93BknxYJZhm3/IAkMTRSwoUJ6YAanx6 CGPk1O9n4egriN7nzif50WsRM/tL5J7YlRRFPnANfRyyibTNW8JHMKHmV78Z7vvw++2u7u NRPpURTABHaNQ6Q4GRCDxgG4D0tDF/swHi+vB+RJGxTxFa268zNxHSzVV2oHqSAy7WVB+n hN5sgpxW+DdTF0UDeOyKTnbxsipKbQlYE5lmi59EUZEMn2+iOZsKj1xYhsr3yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M89Fw3NDQzhS3; Fri, 19 Aug 2022 05:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27J5Pumh034282; Fri, 19 Aug 2022 05:25:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27J5Pug7034281; Fri, 19 Aug 2022 05:25:56 GMT (envelope-from git) Date: Fri, 19 Aug 2022 05:25:56 GMT Message-Id: <202208190525.27J5Pug7034281@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kai Knoblich Subject: git: 52594f584b7c - 2022Q3 - www/py-dj40-django-timezone-field: Fix regression with newer pytz List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 52594f584b7ca0ad649d618e3d54150b8c68b86c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660886756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rd5em9DfXEhPoJwOwpkkIxmPUIF2BfrZRj/unu2vQIc=; b=hYBaO2UBBNsxMNGvPt5dulIZVYaOO8mEPk58C1Mr2PwG4vcAjfmel0OPuBXKHWYICHrOX9 mfV5Yn05EeHWdhsxIfAnCAtdgv2eL93QdpkgEz/8DTZtX7UKGBnBuYnACpOTGc9JVbSQlf JyQUmcYQjPyOgFGboT+zhNGZKcZ5wyPKI2PS1nzi+70+2isgF2imFYQjEWwKrexXkQ4+k1 E9bN/wdZ4MjUEGVKDcsdjGAUMbqkwKt1et5t5h4fmgH0AXmQlvjzR2cgr0nSJAsMFHx4VV MignHUPypR69G+W2onbANu2RW4gmaxTAHllE3HOtGMzAK8Tpe1sET2oLw8QB0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660886756; a=rsa-sha256; cv=none; b=OgvkHorgpcHOETVxS/rUWcRs54ufLFwsqvOsjlx4o2qVoMZ/OpPMkW02Mqx1h3IuT+6dfi 8dwQ15CSDv3s6qyR/JYLoT156uoPO0UB7x4RFdrOceppn5YANETYDyzimE4Pl5x6/FXFR9 6i/W3MjDv7NK6iwj2wpveWqsIWn82vRdDKPKI+Bk4HpyKFjjQvBQ4ZCb4QeIJktVlTGOOK J2cFUggeQ0K4n/EV4dYFEpDkX7RiCVQFyyB7cjYAEjSoxrZNsIak/V3FwAlDwkqmiaZFff oyYvdd65xX/zvsnZQ/wDqhQDe5ZR+ZFgo42NH+ziejKGVdBZsCyNozalGVU+Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=52594f584b7ca0ad649d618e3d54150b8c68b86c commit 52594f584b7ca0ad649d618e3d54150b8c68b86c Author: Kai Knoblich AuthorDate: 2022-08-19 05:04:56 +0000 Commit: Kai Knoblich CommitDate: 2022-08-19 05:22:34 +0000 www/py-dj40-django-timezone-field: Fix regression with newer pytz * Backport a PR which fixes the "ZoneInfoNotFoundError" exception whe populating and comparing timezones against pytz which don't yet exist in zoneinfo. MFH: 2022Q3 (cherry picked from commit 66b2b44abd3491418e2ca1efc64796375745cfc8) --- www/py-dj40-django-timezone-field/Makefile | 1 + .../files/patch-timezone__field_fields.py | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/www/py-dj40-django-timezone-field/Makefile b/www/py-dj40-django-timezone-field/Makefile index e95f9ad5da48..68ffb0453cae 100644 --- a/www/py-dj40-django-timezone-field/Makefile +++ b/www/py-dj40-django-timezone-field/Makefile @@ -1,5 +1,6 @@ PORTNAME= django-timezone-field DISTVERSION= 5.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj40- diff --git a/www/py-dj40-django-timezone-field/files/patch-timezone__field_fields.py b/www/py-dj40-django-timezone-field/files/patch-timezone__field_fields.py new file mode 100644 index 000000000000..72b10b78da49 --- /dev/null +++ b/www/py-dj40-django-timezone-field/files/patch-timezone__field_fields.py @@ -0,0 +1,27 @@ +From 0257f2e9c7c488e8a859ee924c93d9f38afa4dc7 Mon Sep 17 00:00:00 2001 +From: jeremystretch +Date: Fri, 12 Aug 2022 10:03:27 -0400 +Subject: [PATCH] Fixes #94: Catch ZoneInfoNotFoundError exception when + populating timezones + +Obtained from: + +https://github.com/mfogel/django-timezone-field/commit/0257f2e9c7c488e8a859ee924c93d9f38afa4dc7 + +--- timezone_field/fields.py.orig 2022-02-09 04:42:10 UTC ++++ timezone_field/fields.py +@@ -38,7 +38,13 @@ class TimeZoneField(models.Field): + # existing migration files will need to be accomodated. + default_max_length = 63 + default_pytz_tzs = [pytz.timezone(tz) for tz in pytz.common_timezones] +- default_zoneinfo_tzs = [ZoneInfo(tz) for tz in pytz.common_timezones] ++ default_zoneinfo_tzs = [] ++ for tz in pytz.common_timezones: ++ try: ++ default_zoneinfo_tzs.append(ZoneInfo(tz)) ++ except ZoneInfoNotFoundError: ++ # ZoneInfo does not yet exist for this timezone ++ pass + + def __init__(self, *args, **kwargs): + # allow some use of positional args up until the args we customize