commit: 0654bb9565a5d02c2234e0f982084370bf869f69
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 20:05:24 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 21:15:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0654bb95
dev-python/django: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/django/Manifest | 2 -
dev-python/django/django-3.2.6.ebuild | 103 ---------------------
.../django/files/django-3.2.6-argparse-py310.patch | 52 -----------
3 files changed, 157 deletions(-)
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index aa28f06341b..e5f619107f5 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.6.checksum.txt 2551 BLAKE2B
2fae4e3daca01f285f651b76df7402a0c08cdea9a98bdc3be3f9b337732c26b2a3dcb239fc06274b6a30227394047476d454bf34fd7e8b765df047510b08620c
SHA512
66b9dff471928be514198e50e62f46d14fbea9c1cfb55e9d82562271795fc3e719e0bb8c43a1f6ff6c903700b648a6a0e19e335ddc50df2a7fa539911b6d44b6
-DIST Django-3.2.6.tar.gz 9821499 BLAKE2B
9f18d308bf15ef16a9fe9d84219bd7ad37833b718ff975344aae5950ef01a7a0e8ef8669936c8908e38e07fb078ce2e2d6392968177400c2357b1d3787e0ce39
SHA512
adf2d2ab3006cc5b389bed8d8e16ee8c98393b20d719c3521068e5cc5d1e679b9f660be90f827ea1cc6a41f975641c32bdb0779ee145e5e31a501ca9e06898a4
DIST Django-3.2.8.checksum.txt 2552 BLAKE2B
e3bbf05bab72cfd71521451620706eb2b66d2f16791cd7897b2606083af91b62af6c6ea1e9f2b2a1437e3ffc1e1688149f9084d134ac6fc233f6285418bdbe5c
SHA512
62cef4cc4c9de4be5db763e35957f2e71e9ca9fc5335a35bc51a1e337a91027236f41b84dd1f9eb513cb769174d9375c0a7b52cfc645331a3927c5498849eb56
DIST Django-3.2.8.tar.gz 9820955 BLAKE2B
5b53c1033babda046c3e3ff8421465d5bf31e92c5c65e6ebf7d4a401a5f85017625efbf227c718877d58f80f9153fc205b817aeb030d0f322c26b10394e71287
SHA512
0d1d745fc7ebc20a2c3c1d18e270210ec57d605aafafb2bc2bee4229727469dfea6fbd510073ee6509b389eff2a7bdb75765aecafc4506d4489c2ce37a97bfbe
diff --git a/dev-python/django/django-3.2.6.ebuild
b/dev-python/django/django-3.2.6.ebuild
deleted file mode 100644
index d2d43152401..00000000000
--- a/dev-python/django/django-3.2.6.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
- !!<dev-python/ipython-7.21.0-r1
- !!=dev-python/ipython-7.22.0-r0
- )
- verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1-bashcomp.patch
- # https://github.com/django/django/pull/14732
- "${FILESDIR}"/${P}-argparse-py310.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.6-argparse-py310.patch
b/dev-python/django/files/django-3.2.6-argparse-py310.patch
deleted file mode 100644
index 3702a4c58c7..00000000000
--- a/dev-python/django/files/django-3.2.6-argparse-py310.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From dc7d30c03ff72917584952e70b3b25c9a0c59033 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org>
-Date: Tue, 3 Aug 2021 10:04:22 +0200
-Subject: [PATCH] Refs #32074 -- Update expected argparse error in invalid
- choice test
-
-Python 3.10.0rc1 changed the error messages issued by argparse on
-invalid choice to include the argument name. Update the expected test
-output to account for that.
----
- django/utils/version.py | 1 +
- tests/user_commands/tests.py | 5 +++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/django/utils/version.py b/django/utils/version.py
-index 4b26586b36..54b10e89d7 100644
---- a/django/utils/version.py
-+++ b/django/utils/version.py
-@@ -13,6 +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):
-diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
-index 9262e2717a..9da0977c38 100644
---- a/tests/user_commands/tests.py
-+++ b/tests/user_commands/tests.py
-@@ -17,7 +17,7 @@ from django.test import SimpleTestCase, override_settings
- from django.test.utils import captured_stderr, extend_sys_path,
ignore_warnings
- from django.utils import translation
- from django.utils.deprecation import RemovedInDjango41Warning
--from django.utils.version import PY37
-+from django.utils.version import PY37, PY310
-
- from .management.commands import dance
-
-@@ -334,7 +334,8 @@ class CommandTests(SimpleTestCase):
- self.assertIn('bar', out.getvalue())
-
- def test_subparser_invalid_option(self):
-- msg = "Error: invalid choice: 'test' (choose from 'foo')"
-+ msg = "Error: %sinvalid choice: 'test' (choose from 'foo')" % (
-+ 'argument {foo}: ' if PY310 else '')
- with self.assertRaisesMessage(CommandError, msg):
- management.call_command('subparser', 'test', 12)
- if PY37:
---
-2.32.0
-
