From nobody Fri Aug 19 05:15:27 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 4M891r1DgYz4ZTD6; Fri, 19 Aug 2022 05:15:28 +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 4M891r0rKKz3Rd1; Fri, 19 Aug 2022 05:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660886128; 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=12ZW/sgqXNVOrsEXnI0uMGKzdSkmqv4uLAaIBvTqyBQ=; b=V9leKCGyxhYGY8wbHsMc/iUF6TISiQLVsuQRPHWNudegRMuTCYQMqiGUQvwTqRx/gwRq6h wNJg2X4hQ9Dhdwif+DRct6vjGCYG9imG1ujtTl1QMgLQNHZhyStw2EqPsz3OTFOccPG0g7 Y3A+zne6aum7iJovZ59deNQC3I1F07V1WLS+JcnBR7tmPLR/+yTr9uL8PEaTRHjvzlJPYG w+uQrRQrKQm7zADeC2uDOEIKNXjn/WFM2sjCd0bHCdoLABFXbCR8d2kg07bL2E4oXFHAtN 3SorYYMU0dBYSEfc6Dddu0YcVVpU6Tm26mPHkkshv7PEf77Ih1BOogXLNMLnLQ== 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 4M891q72v6zhKR; Fri, 19 Aug 2022 05:15:27 +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 27J5FRab020193; Fri, 19 Aug 2022 05:15:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27J5FRB0020192; Fri, 19 Aug 2022 05:15:27 GMT (envelope-from git) Date: Fri, 19 Aug 2022 05:15:27 GMT Message-Id: <202208190515.27J5FRB0020192@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: 66b2b44abd34 - main - www/py-dj40-django-timezone-field: Fix regression with newer pytz 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: 66b2b44abd3491418e2ca1efc64796375745cfc8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660886128; 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=12ZW/sgqXNVOrsEXnI0uMGKzdSkmqv4uLAaIBvTqyBQ=; b=bCuBgyBFKXZUOHrBe6UYzCuxOvy8xXVNDwY148a7qR3j4FEiePs7PkptmSYeAfHQC89ehb o0rLlyGCqrHjb+dLHdgxnMwgzXDO9mKiAwi5Is60HoAad9WEHbioUPprPtyQNZmlSh+ad+ oalnWYsQtZtvaw69OcJ6fDLBk+HjRQsGlVhg+sci81BfyLv7D1HwjITQQ1wRxeOwi5JRWr FCUGdWCK6HlPpkClXHvQBFzOtNzgil4tY9VkUn6Da0GyyFL0fQ42lgWot4GAfP7cv7XGUR qIlF9ixTKvpeB7sxPLHNR15Ur10AGlp/VWe5rmHBDAsfKhTjGRlj19/23MYU5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660886128; a=rsa-sha256; cv=none; b=FJyQdSpK6zK6sy0BxXWGVlQViSqV8EhKNL0H09yXW9EQ1Z9C1pnNjH9rf430xLnUZKocID 5cQx6eD3ypfiRZ4+xkqkFHOLM7CgPWhGqcNOXui+Cvss+b9RhYxCVBfYJ3eyEgQ1e4w2D3 rfl4felghBOHYGuk9+riTfgCbQH4FiqlKrZTnI1Cp8j9+gk6qq7ZQ/KevIOqf7cMHOWeJu xT/+Lbw+2XHdhvQxBj1lPvpekdUFX61Duvbcx4lEdM9kpQ+m85WhHmqrYb/Q3zofnuc7if EXfGiPOSv6g2kIw2OuQf+DfoYCKdgLEkwc5kVhuq3Du9dfrHlnx7krQNcv09jw== 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=66b2b44abd3491418e2ca1efc64796375745cfc8 commit 66b2b44abd3491418e2ca1efc64796375745cfc8 Author: Kai Knoblich AuthorDate: 2022-08-19 05:04:56 +0000 Commit: Kai Knoblich CommitDate: 2022-08-19 05:04:56 +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 --- 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