From nobody Fri Aug 19 05:15:26 2022 X-Original-To: dev-commits-ports-main@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 4M891q0PZlz4ZTP3; Fri, 19 Aug 2022 05:15:27 +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 4M891q00q6z3RXL; Fri, 19 Aug 2022 05:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660886127; 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=JFpcvJV1q2j5kWHSx+jTFNW+FJh4LzgdnxEHhYca/L0=; b=cxE2We7q3OkDL8DdKwhP39bGrRs176KVh/4H4OeFjc+6PKJcPwTqoRcIVNnB68LDu1LbLv EmlL8w29btYOkZfPechjzsc+EtqNQRndp+bHWsoysK+dY3ErOkhA9Rr1b28UebuI93N/85 sQCN6/3t2II20fIsOAhbRCDJcrz516LPAJBxELRquny9+aBfVEwwuNWQ87uV2pO3PDXYYL uLvStuDRIGXbsdxt6n3jzRV9xOEPQMStq4iCcUF4bM0wSVzi6nk++OFT03jh0moJQFQSZ1 6SYwM52ZFWbSwYfpzIJEVlmSSaDKW9202AMcQUZehOB3ak+pLwQo37tJvr/Oqw== 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 4M891p5zLzzgts; Fri, 19 Aug 2022 05:15:26 +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 27J5FQrM020169; Fri, 19 Aug 2022 05:15:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27J5FQkY020168; Fri, 19 Aug 2022 05:15:26 GMT (envelope-from git) Date: Fri, 19 Aug 2022 05:15:26 GMT Message-Id: <202208190515.27J5FQkY020168@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 0bd37e7de4d0 - main - www/py-django-timezone-field: Fix regression with newer pytz releases List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 0bd37e7de4d022d9540e1e239033c756cc671174 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660886127; 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=JFpcvJV1q2j5kWHSx+jTFNW+FJh4LzgdnxEHhYca/L0=; b=BISn6H3zDkAxI+15D+CGHHEUSiTSg96XhZbOoJVnTFe0pH1s2FAmXKV+JZQ45zE7TvrrMV FYLvkip/xr9NjychGbWQfMpfTdRcSoW5u8oWfbkUDlezXX8SGVVkWss4U1lgYXD3gvMSIe jE8MlhXYjYwJqzhrFeJfpUPnJbBVWoVt8WniJgQkdRpzyGYhLgBkJaU1ZSX9Mcmezz7vsy VSnAv8T4SuOia+pmhnfoVnVRU9y5MI8Uke7nZMV5duO1gqLDJmkJ90ZuzE1eBdm7svtxdY r/FYfH1DmRssYmgMe/mkA6EV7xkpap4SDTMUjtL51oOZ+t06MKRWh1Tl8GIW0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660886127; a=rsa-sha256; cv=none; b=EiezNZnqHrGdAP9kGW+WPq8lzLgH1HU3cunQMb+qRzykzCADJfZHFkUFGM5IGYhdXEehEe Muf/9LKPRxOlBfyc+YM3NA1UIZlsvpiWEnkM7Q0tNU7WchAYj/N+sGSJ+MqWYAPXA1J9E0 7LY/OxHSkDn/m8OFkE9txAvmhx7wtYwLdWUaLR8OT4gdcUPbqqPNmkthXHm4gOGIqhRtua gaMUhTtWLQXT05OtsErsk3LzIISdoNPpYkyQfvl0GT9Fl19eTgxmCvobxn/UG8B8PBsZfw rXDXt+xv+rZtnedMKeBDI/YPSb+J5auhMrb0KzzyPe5gVIqgdnURosM1RQ271Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bd37e7de4d022d9540e1e239033c756cc671174 commit 0bd37e7de4d022d9540e1e239033c756cc671174 Author: Kai Knoblich AuthorDate: 2022-08-19 05:03:35 +0000 Commit: Kai Knoblich CommitDate: 2022-08-19 05:03:35 +0000 www/py-django-timezone-field: Fix regression with newer pytz releases * Backport a PR which fixes the "ZoneInfoNotFoundError" exception when populating and comparing timezones against pytz which don't yet exist in zoneinfo. MFH: 2022Q3 --- www/py-django-timezone-field/Makefile | 2 +- .../files/patch-timezone__field_fields.py | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/www/py-django-timezone-field/Makefile b/www/py-django-timezone-field/Makefile index 450ed16fa1b6..27af50f30e22 100644 --- a/www/py-django-timezone-field/Makefile +++ b/www/py-django-timezone-field/Makefile @@ -1,6 +1,6 @@ PORTNAME= django-timezone-field DISTVERSION= 5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-django-timezone-field/files/patch-timezone__field_fields.py b/www/py-django-timezone-field/files/patch-timezone__field_fields.py new file mode 100644 index 000000000000..72b10b78da49 --- /dev/null +++ b/www/py-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