commit: 70cd8f0b94f8277ce84ea0502ce83a243d6167c9 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Feb 13 18:41:56 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Feb 13 20:15:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70cd8f0b
dev-python/django: Remove old Bug: https://bugs.gentoo.org/768240 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/django/Manifest | 8 -- dev-python/django/django-2.2.17.ebuild | 95 -------------------- dev-python/django/django-3.0.11.ebuild | 103 ---------------------- dev-python/django/django-3.1.4.ebuild | 95 -------------------- dev-python/django/django-3.1.5.ebuild | 95 -------------------- dev-python/django/files/django-gettext-0.21.patch | 39 -------- 6 files changed, 435 deletions(-) diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index 638384b6b80..dd501def0d1 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -1,14 +1,6 @@ -DIST Django-2.2.17.checksum.txt 2438 BLAKE2B 5d9454884110f1debec7fa1644b13be43b9b6b8d3f333a05df823332c94a6f4a220791bf0cc7d139baf5aac856443a4b211dd8e98d23d4cc62d1d6ce7ebd69c8 SHA512 0dc71edfe3264d3353238124dc5374aac07fb73ede167a52f16bf3b147bf351651f4197a1fe5027dca23ad144755fff6447f06d8cdf11126184cf5e291c90402 -DIST Django-2.2.17.tar.gz 8885492 BLAKE2B 30046adc54c31e0e8dac3c573da58e8536246ba6fc5675ec5ad5efc4b170331b893ffe766e7eb404b445d5b37e018e1ac9e2b8e659a5f10c4c165ec9ef5c00d1 SHA512 4ba1e12332cafaa49a087494f9e85e992a414ad153ef935fcf50f1a533ac9c7049a421140552f77b3dbf41c51a4f42aca13dc5f8f479049c21037c541a34320b DIST Django-2.2.18.checksum.txt 2556 BLAKE2B a2cbb2f10c8173bfbb29033d2e33035a04ce0a6c997a3930f4fc59951e46ea31df23a664df1a11b7d652d7efb794b55d7dadb4e0868245afbb2951f630b674c9 SHA512 f48fda050be7d88783bdbdeafc5bf8dd130eb43b7ff08bb1ac7602f5e94615cb2f02a05787dbb025df3f01d70f789d03220651b8217de5ba48cffadb0d57ba7d DIST Django-2.2.18.tar.gz 9180844 BLAKE2B 4001c89674dacaddea279e4e9484cc820a18115bda3a0f8091797fd0924ee7b9aad0e520b1bda21b539e8b140dc473154e4cd6f11a16fb706dd3ee8e7dd8679f SHA512 8c38330042244513576151a9ae64293b9838df42dcb4204713859dd8fcd81154edf42738d0bd05770c9bbe13bfdb1f73781453cf1d14fbc31149a2cb89e34b59 -DIST Django-3.0.11.checksum.txt 2438 BLAKE2B df936992a02e5a34b26e91654962507d973f8831c1eebada4cbdb578f83fba974532867b9f20828afc2467c2521e117b8dd543cde6f664d3c122a95207c50608 SHA512 a7b98d102775cc7854b0c242507d4ff8778984dc8b2e269352103249d6d1c5cea7e6eb8dbe08700b19ad4428e30c469e0e959a622ea4ce3198a75f72b2bb8871 -DIST Django-3.0.11.tar.gz 8958879 BLAKE2B 078ffde9ae186ae8add2136c303ba38a1b38525481b2272384b8a1bb3428dcf6a31991a86b2078aea6cf250808af399acac5461a33c8e1fda5d6bc552eac478f SHA512 d24e8167f3f871f24ea5e288557a49d71f9b5c398c84e8434d5d3dc224ef62775121a016ad89e997fabe88893adc3a83176211d5b9a9730ec23d37d256aa4fb0 DIST Django-3.0.12.checksum.txt 2556 BLAKE2B 9012a130029c6fe73ace78fbdd32f1653bb7a7e84c343c394acc5563b7de9b5d6ec58734fdf79f2e7657f18644dd3a12c12c4a400a1002ad74d0891738ef4137 SHA512 46e7291f4d73472a118ff3aca4f597d6abde4a4217bb95ed84fda91efd0ed63e946d9ddf35ae65ff1e898462aebc32a3a43241f261099b17667958412d5afb32 DIST Django-3.0.12.tar.gz 9255277 BLAKE2B 68be34ddad965bacca6bfcf045b5ab4072ef8a17f09acc674d2b5535b074d90c6881fd22edd89bdc82eefc90a2e7f561a041f9da066b85c13b10866f731a6106 SHA512 7f21a1a88a8c57d3b6ffa1a39e0df491e45f4e37181c4951db2a330266bf3ed8bf4e240a69a9b627dbbb090816c991b877b777e35b1c252a5ee08680eb3b0135 -DIST Django-3.1.4.checksum.txt 2466 BLAKE2B 635ddd40b542890aef29f53df0fad172e48450081f57c72042a71bb5de654b1d1f5f7ce0c588b1070a203e1d4afe3a1ed19431dd23a2a67cd510d4072c79a00f SHA512 729b771008489bbf0563002e438ef88abb2a14b2c29f307cb2db9c75450f30ac8bd4920bf0493dbec06b3640fc0d4b6817e8a054af1028ad065bd321c761a6c3 -DIST Django-3.1.4.tar.gz 9392125 BLAKE2B b583442de50c358e70a49b9ef557d43211e6faee17933a44012dbb9f0dac3ccbf0a91e01a2b8b798fff7ae05100199e9e9c94a81748b41ea13e49d12bb510617 SHA512 02cfaabb25e5f932dcbf659faba2f0afe298e4bee4f510f7adebfff181bdd13c3a0b08e8ce379bcc59326d904be8699db4ce31065d93566b93cad758365207f5 -DIST Django-3.1.5.checksum.txt 2428 BLAKE2B 69347177b3c8c592a0b9df832c8f0abebdd4f1ff420f95f63310eb41d3614b241dc8f01b71abfec12faa006a8e69310d31cd68425f57ecf7a02948e83c65e0b3 SHA512 93d3e0de057518b60d9da2c1193ec59a8601f53b5d81a09fa4f6866336fbff85b81c01711eb07544fce30fe17e6dec89e5a5d6a66a929d451bca77cfe172bf19 -DIST Django-3.1.5.tar.gz 9257571 BLAKE2B 0ec618753d922e64b2f0e75506843383568c0013a8f7528cf10e9ee49ffc7be8a3effda39c27497510728a16d276db5c620bab22b5a001a86cafdb4d4e2560ea SHA512 b8f0e034fcd282d6e4a9e42565da5d5f4750c900264bed10e72b8c1866370f75fd1bc856d22950e1d3ad03229c38559989a26ccc9f1252ea31d407410134a548 DIST Django-3.1.6.checksum.txt 2547 BLAKE2B 509254e5d24cdddfb452d922554db12a16ee1c5840d61d17f57c7b209aa71e3b8c8279efec35508cafd059836601d85bca16a33c618b466c438fc323bcbab720 SHA512 d9dd2763285ae9da7cf24bff957ed2cc78ab088fa34ad45fe176bd869fb892a0e50d2b67fb6a0fcda08f85c68602a3b1f76c265e3776d762f2ee1f96f0dd116f DIST Django-3.1.6.tar.gz 9645871 BLAKE2B 96269d5977d422e62637a956ea8b1af7abc4647350aa4c913e986a7104843d2a4d6c6425deabe2358e819692a721caa18002448b780d4384493bf9078bfbabd1 SHA512 fe5baef4aee51cc84292d1f4d3681cff8170c1307aa172b86faa15771af2c3e0b4dbb24ae671ad8ed31c53ab38ed99c64b5deb69d77fc268d8a232f3463c3221 diff --git a/dev-python/django/django-2.2.17.ebuild b/dev-python/django/django-2.2.17.ebuild deleted file mode 100644 index e06fc5f7ba7..00000000000 --- a/dev-python/django/django-2.2.17.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..8} ) -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 arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="doc sqlite test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]" -BDEPEND=" - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - 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 - ) - verify-sig? ( app-crypt/openpgp-keys-django ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.7-bashcomp.patch - "${FILESDIR}"/django-gettext-0.21.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_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() { - elog "Additional Backend support can be enabled via" - optfeature "MySQL backend support" dev-python/mysqlclient - optfeature "PostgreSQL backend support" dev-python/psycopg:2 - elog - elog "Other features can be enhanced by" - 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/django-3.0.11.ebuild b/dev-python/django/django-3.0.11.ebuild deleted file mode 100644 index 6929f595181..00000000000 --- a/dev-python/django/django-3.0.11.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 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) -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 arm64 ~ppc ~ppc64 x86" -IUSE="doc sqlite test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/asgiref[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]" -BDEPEND=" - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - 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 - ) - verify-sig? ( app-crypt/openpgp-keys-django ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.6-bashcomp.patch - "${FILESDIR}"/django-gettext-0.21.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 -} - -src_prepare() { - # do not bind to a specific version - # https://bugs.gentoo.org/750695 - sed -i -e 's:asgiref ~= 3.2:asgiref:' setup.py || die - distutils-r1_src_prepare -} - -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() { - elog "Additional Backend support can be enabled via" - optfeature "MySQL backend support" dev-python/mysqlclient - optfeature "PostgreSQL backend support" dev-python/psycopg:2 - elog - elog "Other features can be enhanced by" - 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/django-3.1.4.ebuild b/dev-python/django/django-3.1.4.ebuild deleted file mode 100644 index 3dbc4762cd6..00000000000 --- a/dev-python/django/django-3.1.4.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) -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 x86 ~x64-macos" -IUSE="doc sqlite test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/asgiref[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]" -BDEPEND=" - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - 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 - ) - verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1-bashcomp.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_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() { - elog "Additional Backend support can be enabled via" - optfeature "MySQL backend support" dev-python/mysqlclient - optfeature "PostgreSQL backend support" dev-python/psycopg:2 - elog - elog "Other features can be enhanced by" - 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/django-3.1.5.ebuild b/dev-python/django/django-3.1.5.ebuild deleted file mode 100644 index e6482b2c0bd..00000000000 --- a/dev-python/django/django-3.1.5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) -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 ~sparc ~x86 ~x64-macos" -IUSE="doc sqlite test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/asgiref[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]" -BDEPEND=" - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - 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 - ) - verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1-bashcomp.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_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() { - elog "Additional Backend support can be enabled via" - optfeature "MySQL backend support" dev-python/mysqlclient - optfeature "PostgreSQL backend support" dev-python/psycopg:2 - elog - elog "Other features can be enhanced by" - 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-gettext-0.21.patch b/dev-python/django/files/django-gettext-0.21.patch deleted file mode 100644 index 5d3edfea4a1..00000000000 --- a/dev-python/django/files/django-gettext-0.21.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 07a30f561661efae1691ff45d10ec6014b395b58 Mon Sep 17 00:00:00 2001 -From: Max Smolens <[email protected]> -Date: Tue, 6 Oct 2020 17:58:52 -0400 -Subject: [PATCH] Fixed #31850 -- Fixed - BasicExtractorTests.test_extraction_warning with xgettext 0.21+. - -"format string with unnamed arguments cannot be properly localized" -warning is not raised in xgettext 0.21+. - -This patch uses a message that causes an xgettext warning regardless of -the version. ---- - AUTHORS | 1 + - tests/i18n/commands/code.sample | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/AUTHORS b/AUTHORS -index b10852f407a4..9253740857de 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -622,6 +622,7 @@ answer newbie questions, and generally made Django that much better: - [email protected] - Max Burstein <http://maxburstein.com> - Max Derkachev <[email protected]> -+ Max Smolens <[email protected]> - Maxime Lorant <[email protected]> - Maxime Turcotte <[email protected]> - Maximilian Merz <[email protected]> -diff --git a/tests/i18n/commands/code.sample b/tests/i18n/commands/code.sample -index a5f1520ecba5..2c305a3a1dcf 100644 ---- a/tests/i18n/commands/code.sample -+++ b/tests/i18n/commands/code.sample -@@ -1,4 +1,4 @@ - from django.utils.translation import gettext - --# This will generate an xgettext warning --my_string = gettext("This string contain two placeholders: %s and %s" % ('a', 'b')) -+# This will generate an xgettext "Empty msgid" warning. -+my_string = gettext('')
