From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8AB491382C5 for ; Tue, 1 Jun 2021 20:35:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D493FE083B; Tue, 1 Jun 2021 20:35:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF92DE083B for ; Tue, 1 Jun 2021 20:35:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1EE4340F14 for ; Tue, 1 Jun 2021 20:35:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17F5079E for ; Tue, 1 Jun 2021 20:35:41 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1622579732.e586f438da0e7d5bb4b28977d9c5d879aa6fb84d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/, dev-python/django/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/django/django-3.2.3-r1.ebuild dev-python/django/django-3.2.3.ebuild dev-python/django/files/django-3.2.3-py310-repr.patch X-VCS-Directories: dev-python/django/files/ dev-python/django/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e586f438da0e7d5bb4b28977d9c5d879aa6fb84d X-VCS-Branch: master Date: Tue, 1 Jun 2021 20:35:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7d7804c4-6709-474e-817f-525c2668528d X-Archives-Hash: c23526762407de8b0e134092cb52d399 commit: e586f438da0e7d5bb4b28977d9c5d879aa6fb84d Author: Ekaterina Vaartis kotobank ch> AuthorDate: Sun May 16 00:11:41 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jun 1 20:35:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e586f438 dev-python/django: Bump 3.2.3 to r1 and python 3.10 Signed-off-by: Ekaterina Vaartis kotobank.ch> Signed-off-by: Michał Górny gentoo.org> ...{django-3.2.3.ebuild => django-3.2.3-r1.ebuild} | 11 ++- .../django/files/django-3.2.3-py310-repr.patch | 92 ++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dev-python/django/django-3.2.3.ebuild b/dev-python/django/django-3.2.3-r1.ebuild similarity index 90% rename from dev-python/django/django-3.2.3.ebuild rename to dev-python/django/django-3.2.3-r1.ebuild index 87dacd55b40..310cc821be3 100644 --- a/dev-python/django/django-3.2.3.ebuild +++ b/dev-python/django/django-3.2.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) PYTHON_REQ_USE='sqlite?,threads(+)' inherit bash-completion-r1 distutils-r1 optfeature verify-sig @@ -50,6 +50,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1-bashcomp.patch + # From https://github.com/django/django/pull/14228 + "${FILESDIR}"/${P}-py310-repr.patch ) distutils_enable_sphinx docs --no-autodoc @@ -67,6 +69,13 @@ src_unpack() { default } +python_prepare_all() { + # Fails because of warnings + sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py + + distutils-r1_python_prepare_all +} + python_test() { # Tests have non-standard assumptions about PYTHONPATH, # and don't work with ${BUILD_DIR}/lib. diff --git a/dev-python/django/files/django-3.2.3-py310-repr.patch b/dev-python/django/files/django-3.2.3-py310-repr.patch new file mode 100644 index 00000000000..9bc32ecf176 --- /dev/null +++ b/dev-python/django/files/django-3.2.3-py310-repr.patch @@ -0,0 +1,92 @@ +diff --git a/django/db/models/constraints.py b/django/db/models/constraints.py +index b073df17636a..6dfc42942f79 100644 +--- a/django/db/models/constraints.py ++++ b/django/db/models/constraints.py +@@ -4,6 +4,7 @@ + from django.db.models.indexes import IndexExpression + from django.db.models.query_utils import Q + from django.db.models.sql.query import Query ++from django.utils.version import PY310 + + __all__ = ['CheckConstraint', 'Deferrable', 'UniqueConstraint'] + +@@ -85,6 +86,11 @@ class Deferrable(Enum): + DEFERRED = 'deferred' + IMMEDIATE = 'immediate' + ++ # A similar format is used in Python 3.10+. ++ if not PY310: ++ def __repr__(self): ++ return '%s.%s' % (self.__class__.__qualname__, self._name_) ++ + + class UniqueConstraint(BaseConstraint): + def __init__( +@@ -218,7 +224,7 @@ def __repr__(self): + '' if not self.expressions else ' expressions=%s' % repr(self.expressions), + ' name=%s' % repr(self.name), + '' if self.condition is None else ' condition=%s' % self.condition, +- '' if self.deferrable is None else ' deferrable=%s' % self.deferrable, ++ '' if self.deferrable is None else ' deferrable=%r' % self.deferrable, + '' if not self.include else ' include=%s' % repr(self.include), + '' if not self.opclasses else ' opclasses=%s' % repr(self.opclasses), + ) +diff --git a/django/db/models/enums.py b/django/db/models/enums.py +index 7082a397c237..dd9088597d4d 100644 +--- a/django/db/models/enums.py ++++ b/django/db/models/enums.py +@@ -2,6 +2,7 @@ + from types import DynamicClassAttribute + + from django.utils.functional import Promise ++from django.utils.version import PY310 + + __all__ = ['Choices', 'IntegerChoices', 'TextChoices'] + +@@ -74,6 +75,11 @@ def __str__(self): + """ + return str(self.value) + ++ # A similar format is used in Python 3.10+. ++ if not PY310: ++ def __repr__(self): ++ return '%s.%s' % (self.__class__.__qualname__, self._name_) ++ + + class IntegerChoices(int, Choices): + """Class for creating enumerated integer choices.""" +diff --git a/tests/model_enums/tests.py b/tests/model_enums/tests.py +index 78f8b146be92..cda835010d7e 100644 +--- a/tests/model_enums/tests.py ++++ b/tests/model_enums/tests.py +@@ -48,7 +48,7 @@ def test_integerchoices(self): + self.assertEqual(Suit.values, [1, 2, 3, 4]) + self.assertEqual(Suit.names, ['DIAMOND', 'SPADE', 'HEART', 'CLUB']) + +- self.assertEqual(repr(Suit.DIAMOND), '') ++ self.assertEqual(repr(Suit.DIAMOND), 'Suit.DIAMOND') + self.assertEqual(Suit.DIAMOND.label, 'Diamond') + self.assertEqual(Suit.DIAMOND.value, 1) + self.assertEqual(Suit['DIAMOND'], Suit.DIAMOND) +@@ -89,7 +89,7 @@ def test_textchoices(self): + self.assertEqual(YearInSchool.values, ['FR', 'SO', 'JR', 'SR', 'GR']) + self.assertEqual(YearInSchool.names, ['FRESHMAN', 'SOPHOMORE', 'JUNIOR', 'SENIOR', 'GRADUATE']) + +- self.assertEqual(repr(YearInSchool.FRESHMAN), "") ++ self.assertEqual(repr(YearInSchool.FRESHMAN), 'YearInSchool.FRESHMAN') + self.assertEqual(YearInSchool.FRESHMAN.label, 'Freshman') + self.assertEqual(YearInSchool.FRESHMAN.value, 'FR') + self.assertEqual(YearInSchool['FRESHMAN'], YearInSchool.FRESHMAN) +diff --git a/django/utils/version.py b/django/utils/version.py +index 4b26586b36..b84ca7db27 100644 +--- a/django/utils/version.py ++++ b/django/utils/version.py +@@ -13,7 +13,7 @@ PY36 = sys.version_info >= (3, 6) + PY37 = sys.version_info >= (3, 7) + PY38 = sys.version_info >= (3, 8) + PY39 = sys.version_info >= (3, 9) +- ++PY310 = sys.version_info >= (3, 10) + + def get_version(version=None): + """Return a PEP 440-compliant version number from VERSION."""