From 0ecce525422b4b8e7931b397b55f7e30b5c8ee31 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 5 Sep 2021 08:33:57 +0200 Subject: dev-python/django: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/django/Manifest | 2 - dev-python/django/django-3.2.5.ebuild | 103 --------------------- .../django/files/django-3.2.3-py310-repr.patch | 92 ------------------ 3 files changed, 197 deletions(-) delete mode 100644 dev-python/django/django-3.2.5.ebuild delete mode 100644 dev-python/django/files/django-3.2.3-py310-repr.patch (limited to 'dev-python/django') diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index fe0e31a141ce..086de7c321bf 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -2,7 +2,5 @@ DIST Django-2.2.24.checksum.txt 2558 BLAKE2B 8a4b1759f0c52f9dfe6eafc2b54d2d6db8c DIST Django-2.2.24.tar.gz 9211396 BLAKE2B 7422019ad8849ae543d7b2ca7f5624b5379c832b5d19511f52df77d95acaa0a45cc61579b0e3a74671c295ffab5e1dfecd1c044e9ec042c46606f888c257e1d0 SHA512 5a3ee79500ad458bfc5220b9b68248bec59bf6d2304d58ca280111854d6a5f7e25784680e949487e8b59c1de0b329a53cf0676d2ee4bb2b88463918c4b0b6085 DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d3774073c57538b10f1beeada3128de2cb3d861684599fbf5f337b0ae4eff3a101998da30d8d961f84ac7cb3bb31c5 SHA512 07870c27034f70f335ac35b34317944947f544f63108f21134e81326b4e8f05a7cb3d382d91e7f0a846d51944032efcddca2c3bf980f626627c74c388932e4cf DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7 -DIST Django-3.2.5.checksum.txt 2543 BLAKE2B 4a07a518bdde4670dc3bf079d8d3cfa32b6580cc06f18306a2127463f3a6a2d8f2a50c4562092439c7c99ccf80dde160b061180826c94d4e1064d5064ff500fe SHA512 b073ff758843f72b6467dae7580941774de9702db02a6fab303cb696cb22c84ca961885792e8ec85545294610f34a4eb52ac3f6521c190d2c339c1957ab4156a -DIST Django-3.2.5.tar.gz 9806547 BLAKE2B d804d758f95f18aac5c44cba9bd9248efa56cba91bea5db2ac89e8c2202ac1fd088b61d6cc98eb7d6d33a95f85983b801c6cc26a3231986a8cf224a0bbeb8a7c SHA512 03d4eee650a857bed298658c68b916beb74690d16b4b28d649c52a7c2d8a61e92f53136d2de3a77fabe1dd01c0e6b3033befc6842f39c222793fb590b1020c13 DIST Django-3.2.6.checksum.txt 2551 BLAKE2B 2fae4e3daca01f285f651b76df7402a0c08cdea9a98bdc3be3f9b337732c26b2a3dcb239fc06274b6a30227394047476d454bf34fd7e8b765df047510b08620c SHA512 66b9dff471928be514198e50e62f46d14fbea9c1cfb55e9d82562271795fc3e719e0bb8c43a1f6ff6c903700b648a6a0e19e335ddc50df2a7fa539911b6d44b6 DIST Django-3.2.6.tar.gz 9821499 BLAKE2B 9f18d308bf15ef16a9fe9d84219bd7ad37833b718ff975344aae5950ef01a7a0e8ef8669936c8908e38e07fb078ce2e2d6392968177400c2357b1d3787e0ce39 SHA512 adf2d2ab3006cc5b389bed8d8e16ee8c98393b20d719c3521068e5cc5d1e679b9f660be90f827ea1cc6a41f975641c32bdb0779ee145e5e31a501ca9e06898a4 diff --git a/dev-python/django/django-3.2.5.ebuild b/dev-python/django/django-3.2.5.ebuild deleted file mode 100644 index 96f67052a297..000000000000 --- a/dev-python/django/django-3.2.5.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE='sqlite?,threads(+)' - -inherit bash-completion-r1 distutils-r1 optfeature verify-sig - -MY_P=${P^} -DESCRIPTION="High-level Python web framework" -HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/" -SRC_URI=" - https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -# admin fonts: Roboto (media-fonts/roboto) -LICENSE+=" Apache-2.0" -# admin icons, jquery, xregexp.js -LICENSE+=" MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos" -IUSE="doc sqlite test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - $(python_gen_impl_dep sqlite) - ${RDEPEND} - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pillow[webp,${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/selenium[${PYTHON_USEDEP}] - dev-python/tblib[${PYTHON_USEDEP}] - sys-devel/gettext - !!=app-crypt/openpgp-keys-django-20201201 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1-bashcomp.patch - # From https://github.com/django/django/pull/14228 - "${FILESDIR}"/${PN}-3.2.3-py310-repr.patch -) - -distutils_enable_sphinx docs --no-autodoc - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc - -src_unpack() { - if use verify-sig; then - cd "${DISTDIR}" || die - verify-sig_verify_signed_checksums \ - "${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz" - cd "${WORKDIR}" || die - fi - - 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. - PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 || - die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - newbashcomp extras/django_bash_completion ${PN}-admin - bashcomp_alias ${PN}-admin django-admin.py - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature_header "Additional Backend support can be enabled via:" - optfeature "MySQL backend support" dev-python/mysqlclient - optfeature "PostgreSQL backend support" dev-python/psycopg:2 - optfeature_header - optfeature "GEO Django" "sci-libs/gdal[geos]" - optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached - optfeature "ImageField Support" dev-python/pillow - optfeature "Password encryption" dev-python/bcrypt - optfeature "High-level abstractions for Django forms" dev-python/django-formtools -} 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 deleted file mode 100644 index 9bc32ecf176d..000000000000 --- a/dev-python/django/files/django-3.2.3-py310-repr.patch +++ /dev/null @@ -1,92 +0,0 @@ -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.""" -- cgit v1.2.3-65-gdbad