From nobody Fri Aug 19 05:25:55 2022 X-Original-To: dev-commits-ports-all@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 4M89Fv4R8Vz4ZVY1; Fri, 19 Aug 2022 05:25:55 +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 4M89Fv3RP5z3S7f; Fri, 19 Aug 2022 05:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660886755; 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=4Sb9iI5LSTh8fXEwQqdyrlzYdiUVnpSw6YhbZOgdmfo=; b=mkq3sfV8X5PsMSxmi9Fd9T7jLegTbN/s8A2yd2r3kGncMeFbOijC9sUbaz7V5KLvWmbBMl muymzlAN2d0hLbqfrn4l34IURQV+7F5rsJPdF0yr4Mc1NRDA9x1zilYM13SAjMyU3Cn7+w RsPrvToPBMFBMHf42837GUJ0QT39UcdIGdKN8r66SndDtec9t/FlpVhsySOE4nLDM8GP8U 2KqdirhHX7MoV+Te5JdL+6XXoMRNDxJKngOc3806EdJb78wlPHfAiZKnK5TDoOtp2tKL0C 8ANvBQ4bh+EdoiHwKAx4nBWriw0x5c6dMZiZMLazrDcfFQXeZlKTYUNpjsF3Lg== 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 4M89Fv2Xs5zhLQ; Fri, 19 Aug 2022 05:25:55 +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 27J5Pt3B034258; Fri, 19 Aug 2022 05:25:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27J5PtP2034257; Fri, 19 Aug 2022 05:25:55 GMT (envelope-from git) Date: Fri, 19 Aug 2022 05:25:55 GMT Message-Id: <202208190525.27J5PtP2034257@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: 154934672156 - 2022Q3 - www/py-django-timezone-field: Fix regression with newer pytz releases List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 154934672156ddc24d5b70c32aef6021fbe21f74 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660886755; 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=4Sb9iI5LSTh8fXEwQqdyrlzYdiUVnpSw6YhbZOgdmfo=; b=mJi2OEsar78cyJ7CjcD5XOFRK4/GNHzT01saa6ld22w3vZ33FgzHl4KTw+aiuKp2O/3r1D s7kxC8NZFulapwtHxYv3PlQM7x3Nv3jA97RWEFkCfpIdI5WdC1xjTSwqjIaW3JmGKc1BM5 TRA0fQvsENwJG1ShhwwMRA0KVCaWMYuTdTizC33q0c1sJOK/PkFSYdAFdQPcARV6hWb6E8 5Udmyxq3XUZOBYv4xCLbIlOszPpCX+N0Qrl/k7Ns4MYLgxhJ8YUjnnkr8Z1+1KaUpadZ68 x0iVGLypDGvPMhuAOeJ1fpupAkYx4YgSB/YDf7CZv/lv3ggfELW0FQO297uqQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660886755; a=rsa-sha256; cv=none; b=LDJEcBr0RFqTT7V4ZKjTOeGjdFil+OaNYYrfHSv66veKtm4woUucf2wQDdNPuqRzFoq797 RO20vUqZIH/jfP+oINGjFH/De8NYGEnueNyFW20YqQyErq88UyK9CS/Dn88/ORjA5pS86u COTMNWdXMjA8pV3JyaY4sMWF78m1GUJmviEoXYEawa6xs/Q1+I78eKalrNUnkc/iOrJKim KDZhFmxEC0EX16OrBIXSi5BX2bUT51xzViQKthEQ7jP2CLlay30Ga79/E5OYLUuMmAvaDd 33YKTpVBos3xLAlfP8vF29QCSB2ILsnsr34Eg/0pLbgVCl+iujACJEKmNYK1EQ== 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=154934672156ddc24d5b70c32aef6021fbe21f74 commit 154934672156ddc24d5b70c32aef6021fbe21f74 Author: Kai Knoblich AuthorDate: 2022-08-19 05:03:35 +0000 Commit: Kai Knoblich CommitDate: 2022-08-19 05:22:21 +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 (cherry picked from commit 0bd37e7de4d022d9540e1e239033c756cc671174) --- 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