From 7dfa73123ca5218ae5f5cf878a90db9ea9a25321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 4 May 2023 17:28:36 +0100 Subject: gentoo auto-resync : 04:05:2023 - 17:28:36 --- dev-python/django/Manifest | 23 +-- dev-python/django/django-3.2.18-r1.ebuild | 110 ----------- dev-python/django/django-3.2.18.ebuild | 109 ----------- dev-python/django/django-3.2.19.ebuild | 2 - dev-python/django/django-4.0.10.ebuild | 110 ----------- dev-python/django/django-4.1.7.ebuild | 103 ---------- dev-python/django/django-4.1.8.ebuild | 104 ----------- dev-python/django/django-4.2.ebuild | 101 ---------- dev-python/django/files/django-3.2.18-py311.patch | 153 --------------- dev-python/django/files/django-3.2.19-py311.patch | 153 +++++++++++++++ dev-python/django/files/django-4.0.5-py311.patch | 218 ---------------------- dev-python/django/files/django-4.1.8-py311.patch | 28 --- 12 files changed, 155 insertions(+), 1059 deletions(-) delete mode 100644 dev-python/django/django-3.2.18-r1.ebuild delete mode 100644 dev-python/django/django-3.2.18.ebuild delete mode 100644 dev-python/django/django-4.0.10.ebuild delete mode 100644 dev-python/django/django-4.1.7.ebuild delete mode 100644 dev-python/django/django-4.1.8.ebuild delete mode 100644 dev-python/django/django-4.2.ebuild delete mode 100644 dev-python/django/files/django-3.2.18-py311.patch delete mode 100644 dev-python/django/files/django-4.0.5-py311.patch delete mode 100644 dev-python/django/files/django-4.1.8-py311.patch (limited to 'dev-python/django') diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index 0a965d673c5d..dc905bfa3303 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -1,32 +1,13 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c -AUX django-3.2.18-py311.patch 6716 BLAKE2B 6937c7dad0b4435906923cf08c47198d1d2046efbdc98dbcd914e66a6d72ea1d80393df71632e97f4f8aa3fdbc0e9cd63f4036dfc21833d9ce62de49986f76b9 SHA512 fb8c57bc1bcac563a6572ba54c2cb8ee98e6290ac44d75a380c841c048021e464aa85e60a41652d58094e21ec5b4ec4d677bbf9ce686fcbf1ea3e0999fe92c13 -AUX django-3.2.19-py311.patch 1060 BLAKE2B db6e57cca3dcf95848e2f331f67815591f92b11d4ea93c3b2ff6f5e3e1902a6bbcf5be587f3f13ac62bc60a4f886df9b0adcf13251097475e9f24b946cbc9866 SHA512 e13325706e10a16aba0d76682c862f3eba68c00e68e97656c93cf5ec5e8474200066a32aa3fd91503c4193f4052d16d9e76ed2b9cdd3db5ddb3bb3afc7982ee8 +AUX django-3.2.19-py311.patch 7776 BLAKE2B 387f602318cbf9cdc7edfb2c63a2fe05d3559c3773defae5a5aaf30aef5fe46aadd5c764273d4b7af59132a57caf28cc0463c70eac680105103ba824009eba16 SHA512 5d94f45e92d8ac020aeda1c682e9c5cc60f4c82920dcdf46ef777e76c880e6ca81ec70daabd09cde4ce769fbbc13ac63d1a3763d7eeeeff53102bc31890166ca AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e -AUX django-4.0.5-py311.patch 9279 BLAKE2B 3082f4f9da3f127807402a55655b059019787143dd8c2cb14b1a27d2fbf66464179c2f08381284340fccb4e6bc1c25a1e36291a0dd8cbd83c754ee1f78d220b8 SHA512 d48f29fa5fe9e434a4220825d1592a03a0667d956db4e6c4119e74f91524b8d02b295a5a600516a993adc2dd3e1f5ca4bde83acd8a6a8e0838382116d2703a28 -AUX django-4.1.8-py311.patch 1120 BLAKE2B 09793426aa8a7ff0273ae0267e4c74c58fe05e51200c0fe283242e53e2af789280d4860d8d88008d819863320352b546bcd52b6abd52034409e2da14cec57910 SHA512 03ae3e631819a12ecb2bc6db2a548ed7197da70698aecf361fea41ed485ce7300d4d8679478da9f49a32ff7065aae5c532e18d37773928e7a7553c7b5d1531dc -DIST Django-3.2.18.checksum.txt 2563 BLAKE2B 8deb25cdc9f3a859b68925b7c8615bf3bf955f0c5db7558818fc9177c2a5d5f588b848bb15094d5f2d1f9a92693204ddc753ef25411d328e8c7f755f93184b54 SHA512 b5fb24a525c10bbb1f82074b9637e4ddd68ec8bd80c3676f326f4be41a81643cb539c13123447895f6a3639d8938f70f009de31752eb5753ca1dc3dd162d9f92 -DIST Django-3.2.18.tar.gz 9848949 BLAKE2B cf42d306d506addb43f725d5896be7bba41e37633fab0173d9e0bc76894b7c5a26fa945edb85e33f7b356d1d36b3ea9e7c85b5ec6efda5541639bc425230e8ff SHA512 dbcf8daa4edf3666bfcb366b09e1c3de12a4176770ab2e6cd22b459ff77aa4cdbd72c445f53e7b23a907f663dc37b07c15d5d0d67e63fdec98eb4832dcc57d6d DIST Django-3.2.19.checksum.txt 2558 BLAKE2B dafc8f9b47686b96aca4e3c48fd7bac91ce26f5439439f5799cdbfd892120797cdf99dcf99ede62bc825f4e2475691b6235c9fd077da1cc3b2a946933798f207 SHA512 4d1596e83a064b02abf0c00ec7f9f134be1cb9a77e61016b5a3370b5c286ebb667c1a29b678a403b98f6d8b5488dd16c50297db7026d46e913d2793996aa1171 DIST Django-3.2.19.tar.gz 9832772 BLAKE2B 3b18fe5edf258b71111bbd34d55c5006d4f399155841549e02d4e256a2710bd1c22408d6cb1edea041aaf3239c709d4c51695e5a42a5440339714f0e6c3d4824 SHA512 25a611b4479718b866b9f7b9247d6ada1f20c9118d17735f07fe3ae2e7092bee3655c1733c5c244b2e7f5ab04f6d5cc7fab94ca33d2426e281581554a64582dc -DIST Django-4.0.10.checksum.txt 2563 BLAKE2B 1ec93751204e80d75f5f4f15086cfd9aabe65e392359f82edb234f2b86802bd1078e00575379c1956dfca8e6c60ddc6209079ae7e99450aa000b22c3312a89f4 SHA512 67b335f184ce02395efba3a4bec7d8087735ef8816eda70867faf9c02242c11c95f30fc36db6abd30996098dd567ef53f6dd467567c5405f34cb2bff7cd2a23c -DIST Django-4.0.10.tar.gz 10430363 BLAKE2B d36aefd5d00023e5c4e34dda2b283e9a82d9e3b82576ce00cef7d9b75837ffdbf56327ad21ccefb02b79e8db93f12cf850541f4cb1d01b3dd28bdea0c73cb9d6 SHA512 04d1b207af21067c22c120486ff57ea602b3436adf1871f691735825afb30c3ed62f1cbc98d92fa70e9a818bcf50db70d949ab0c460f48f6027b75df9eba56c7 -DIST Django-4.1.7.checksum.txt 2554 BLAKE2B 5a82eca5edb5b5d90c629c6d42414725b32ed55fc137cfb3fc9c5bfd392dc0fcc3f6b99eea64a16a88002a521bf910464a6fe11d9079d68e056acded3432be38 SHA512 4244abf4e81aec1f8daa7815f57483963e94cf67571f0c2f6ab67507515c7f6f72f86412a17c8e1e73170e1ed7d3d4503c5adba36c66d0b8f015350c81348116 -DIST Django-4.1.7.tar.gz 10520415 BLAKE2B 88b66fea737f6fb1661a6987b9d6cecb84d58d675655a0ea5bed60ee28252edd11d8025498b7bc854b9c0c4814148bdc3bcdf59014dd040b5c424c3cd1711e46 SHA512 e34b0b05209297164d6cb84e7edf4740a2d638496c3107c06c0e773db292e9b02e6abbd8c3da347addaf17d9c9a56ef4873eb9edc5f1164e3d13d7f3ef083844 -DIST Django-4.1.8.checksum.txt 2550 BLAKE2B 9a4b37655a75ed1e18fd4219b7480afbcc4bde7aaef0ca4865451714cc4bcd123fc7bd69bbbe70bdab375a64bc12b3b6410f24dca0eecdcbb3b2a4d4df2611ec SHA512 415a0c9173d9e96e5360e6bf27b33c699eb952654bde3a1cd8229ac1c5b5b5ac131d3c1b168fe945f525de63e08c2ad9097e1a9eeadcc2b76a96b999acb5feda -DIST Django-4.1.8.tar.gz 10511976 BLAKE2B f269fb4d0047913fd0842daa67839d736b0d1b141081590beb2ffa2d0c535f992dab3820a9c5784caf2bb1ba1a7237b395a87d059ef2e4600341afb17bdafee2 SHA512 73910394a83e84522a41e98958701fab85ca71ed426c3cac549d1bd5eb2740106da9d2e3fba1ad8defaa2c7130c24e278558dd93e84afe8a66aa81686755ebc9 DIST Django-4.1.9.checksum.txt 2548 BLAKE2B 13f0594922dce5c2f680b2c2c03955c1772161204f96ec48744b56d8388c35790fec9c1dcd6b91dc2585a07137e05b1952e3f2a8524112d5a2de4cd1590a247b SHA512 d80687c1986cdec1facb040f35380b34618b493abbedbaea9326814e64a200118c6ed74d7a1c48c794de8d30de7a87381ffc4df6024153a0380f840fa5caaf7d DIST Django-4.1.9.tar.gz 10514944 BLAKE2B d54350ee09f1460156d98d597075a63a5a64bc1198805eadffd337b1af8423332f874fca2327f4aa18aa3dd3ad362b687b14ceb2ca1b7d55b910b8a2030c182c SHA512 75f6f25e84b48f066b7e7e2ee47eb5af60a63d206d83aa32f366ec5685b202a97537daaf98afbbc1c3214f6df7b88630f0d2849f4c78827e2de1141c9bd0b317 DIST Django-4.2.1.checksum.txt 2548 BLAKE2B 4d20462ad292d01544a60f9fac13a52204763555ce317ddde161613edd58641b0ba2e8313e5683de9cdf555b2d11d5d2942da4142844572ad928f1e49488be94 SHA512 aeb69a20e331416749712fc2738e9bf9798a7333f45d680149aaad65b88bcc5a76f6f8692eff43a9a74c33137ac4a135fd59f00f8400e20377025d4b7e3acd02 DIST Django-4.2.1.tar.gz 10420051 BLAKE2B 7d657155f45bea0bfce964e74222edd742b2f4db1d23b91baac1021aebceef5d8e553767e1da32507832047e8d62e525783ddeed31f86f80ad7ea9a4962b5c6c SHA512 eaa3f633f380e9a215e52bd40c2f7c7aed9f0a6122f5c9c07d954904dcb8ccc9ae8ed2e988742e2b1b3b32e626cf754ab4e0d2b4ed06f3b81ef7a38f0bd047ee -DIST Django-4.2.checksum.txt 2530 BLAKE2B 06ebf87ce44d32fd2491d600cbf4a74b32426dadc0096fe3a34933ba55ddcfed082e85021c9c4e525122e6be8aa3ff6a2bb282fa24fb29a732ea744d4fa1dd1a SHA512 6078fe14d8b356477bd163eca67ca9038b24f78b706bdd8fc2c4ebdbda5024c5014b333a820910dbfb075ff944b78789f7c745eec3a2724898b7b2620f40a6dd -DIST Django-4.2.tar.gz 10415665 BLAKE2B 05faa1476f9bbbea93f33c0f35914b0893006ebbdfac98e347f886db0a39b263046dc149cbf41eeee982ef46138b835379f8384b5f8eb7ef77e16d338307830e SHA512 22a61943eb99cae81a99d84795155d5fecf5e1ec5d76be145b86d5ae1d4fb6a71be8bb62e58b935dedc846c8fd3f1e6fe68cbcc7fa1603a3c4753e69d61b7af4 -EBUILD django-3.2.18-r1.ebuild 3109 BLAKE2B 8967ad33dff40ddd1612b05961e6645209ccd32d54ccabc54b742e2d3fa433b75c4db8be2f5a45ad2871ff3b9e5a6456ff04ba3c4dd5c48273bf7638bf03e4ea SHA512 2d4ceadad34853196663694f33afd6ec317892f55247d5c448a53e37ecbabe02094d1041d64b4814ead805646c12477a1cb4bc9634344bbda38e5d225bc37af0 -EBUILD django-3.2.18.ebuild 3064 BLAKE2B 9870d944334ad12adc96f2701d6e72edcd684312f6dea6eeb10bc7e5f78278f819fd053e7ba5de8cf35998e962b2a05f4529b6177818336afc7825b9cd393a0b SHA512 0ca7d17d5b52120f9589a0b9e9802749603b2cdcf58a5697c55341e63a626bf95810daaf2e4ac4821113d39fbd4a0cba9657969f5d740d91080a2fe4d1aeff05 -EBUILD django-3.2.19.ebuild 3132 BLAKE2B 2fede9182113a310c1dba6bb50da568b8375f98e3c312f44cbb27a28762c90cdccb6188bb5cfc992eb3fe49f72b37929e1e565d82d1bb98a82d8b20688b480ec SHA512 9294929e4d603cb7d19a70f1d6d49fbb56bf9c6f276f9815988ae042915203c4d4a05981c1557e97a2b45955850b24c69db6f32c9fbba0427bf00d3c581cf32d -EBUILD django-4.0.10.ebuild 3028 BLAKE2B 062bd71385c3ea131706367b812f5102e1e8f82dcbd0b51f07b4a4ebf900cdb5c77451ea22ef79703831276f2f6b4dd71aac6817c59b78e90aae2c362fd0efce SHA512 02870c3cb88491fabd91553acf07f95afd3a2d133603de01320c5607337ed5466ab6efa3459ef2cae3d9d7736e39f70d1a449ebf7d9eaafcdd499f36c30f9ad4 -EBUILD django-4.1.7.ebuild 2881 BLAKE2B 27dcb7fcad3b27c80714598b17dbc1b32f1ec13494f070cd44922ce72739ade4b2345594bae780eec5dc97dd8e2c58755ebe582aa4b5145e5556ffd6ce2df903 SHA512 1e0a4eacd93b27b2812ab210911b2f94d3e21f7f0ae987c107e56deb1df9ed4caefc071a5a10bf5f39e66550e70ac8bfc1ee5024cbf1653b0954a9fbb1c6d51d -EBUILD django-4.1.8.ebuild 2924 BLAKE2B 1e0506ce1b22fc5c79139cb68820e764be32a7be2d677a271d452a0ad32c13742bea1f3691fc11319faa713b4be38e142218a95e3d92fc25eb88e2b99e03c7b9 SHA512 bdd1411e48e79448f6d61243bc890aa7b488b931d17d7e31c673eeb850e8ac32c087edfed0556b31e53397ba949623afff733ce61c3ab6a838d25f2740f0a387 +EBUILD django-3.2.19.ebuild 3037 BLAKE2B bcfa08f5ea3d9339d97cd67d620b1e8b023f0a8b246c76957670ddc7191f543745e59483c04799804db08def83fdb610dabaeb7b82cfdd53679cb37bf24926da SHA512 c1dceb8e6696eba044cae59a653a27e89ae341b5d995d1a489ce8ed9a41c5cdf315dfbf1cf7b0e151135f476931b5b84e5a4a5a5c7ce32661bd2a2b923c9f863 EBUILD django-4.1.9.ebuild 2813 BLAKE2B 779d753e3e8895d80f71ba9faed0d6d2506164bab2638d1bc17abe2b55e73a04cb3164a8bb6e00f0bd6d75014891aa7052c1e6b0055cd615e1eeeb5e3c7c407b SHA512 d14ee12f776505861becdcc4810403d020b7c485bf47fa00280d80110486926030b44f6aba0aec827e1f1fa0b85df90d0778e20b63f41850a065231f3742201b EBUILD django-4.2.1.ebuild 2730 BLAKE2B 24b453e9d70265cddf0f942f3a6d52ac61b0b16b432b41f142a25bbaae1e9fac3e59b47a210578bd26c22d09782d7ed12f8bde8c196cbe206ee960573624a9e8 SHA512 674a5f42a6ea7ffc48a15d13a710668c17a8d815b559ff226e5e969881fd466f53ed9111c7e16783d9efc946d7aedf2cd134dd0bcfa4c6e4f1831ecf05527b3d -EBUILD django-4.2.ebuild 2841 BLAKE2B 946d2d4c35075431124f7a287101d0598e975b95bc7840de33b56593841b7550bdbd124db93dc5e16f7d3b7d9035d400a6934e5a2c69c882d04df858a726989a SHA512 10fac20179993356010da23cbd0285bc977cfd6b9d0cb430a103e733f20b6e17a9c4557fcea085a692894983bba1dce8064857a743f6f671b797e904a30f9388 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7 diff --git a/dev-python/django/django-3.2.18-r1.ebuild b/dev-python/django/django-3.2.18-r1.ebuild deleted file mode 100644 index bc404dde5670..000000000000 --- a/dev-python/django/django-3.2.18-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='sqlite?,threads(+)' - -inherit bash-completion-r1 distutils-r1 optfeature verify-sig - -DESCRIPTION="High-level Python web framework" -HOMEPAGE=" - https://www.djangoproject.com/ - https://github.com/django/django/ - https://pypi.org/project/Django/ -" -SRC_URI=" - https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt ) -" -S="${WORKDIR}/${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 - !!=sec-keys/openpgp-keys-django-20201201 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1-bashcomp.patch - "${FILESDIR}"/django-3.2.18-py311.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 \ - "${P^}.checksum.txt" sha256 "${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 || die - # TODO: this suddenly started failing - sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die - - 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/django-3.2.18.ebuild b/dev-python/django/django-3.2.18.ebuild deleted file mode 100644 index 68c7e2f40c5e..000000000000 --- a/dev-python/django/django-3.2.18.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE='sqlite?,threads(+)' - -inherit bash-completion-r1 distutils-r1 optfeature verify-sig - -DESCRIPTION="High-level Python web framework" -HOMEPAGE=" - https://www.djangoproject.com/ - https://github.com/django/django/ - https://pypi.org/project/Django/ -" -SRC_URI=" - https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt ) -" -S="${WORKDIR}/${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 - !!=sec-keys/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 \ - "${P^}.checksum.txt" sha256 "${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 || die - # TODO: this suddenly started failing - sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die - - 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/django-3.2.19.ebuild b/dev-python/django/django-3.2.19.ebuild index 9dd406113de8..897c8b62a8a4 100644 --- a/dev-python/django/django-3.2.19.ebuild +++ b/dev-python/django/django-3.2.19.ebuild @@ -54,8 +54,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1-bashcomp.patch - # TODO: merge these two when older versions are gone - "${FILESDIR}"/django-3.2.18-py311.patch "${FILESDIR}"/django-3.2.19-py311.patch ) diff --git a/dev-python/django/django-4.0.10.ebuild b/dev-python/django/django-4.0.10.ebuild deleted file mode 100644 index 9ed143fa88f6..000000000000 --- a/dev-python/django/django-4.0.10.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='sqlite?,threads(+)' - -inherit bash-completion-r1 distutils-r1 optfeature verify-sig - -DESCRIPTION="High-level Python web framework" -HOMEPAGE=" - https://www.djangoproject.com/ - https://github.com/django/django/ - https://pypi.org/project/Django/ -" -SRC_URI=" - https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt ) -" -S="${WORKDIR}/${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.4.1[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/backports-zoneinfo[${PYTHON_USEDEP}] - ' 3.8) -" -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 - !!=sec-keys/openpgp-keys-django-20201201 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0-bashcomp.patch - "${FILESDIR}"/django-4.0.5-py311.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 \ - "${P^}.checksum.txt" sha256 "${P^}.tar.gz" - cd "${WORKDIR}" || die - fi - - default -} - -src_prepare() { - # TODO: this suddenly started failing - sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.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() { - 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/django-4.1.7.ebuild b/dev-python/django/django-4.1.7.ebuild deleted file mode 100644 index 1c318d232ec1..000000000000 --- a/dev-python/django/django-4.1.7.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='sqlite?,threads(+)' - -inherit bash-completion-r1 distutils-r1 optfeature verify-sig - -DESCRIPTION="High-level Python web framework" -HOMEPAGE=" - https://www.djangoproject.com/ - https://github.com/django/django/ - https://pypi.org/project/Django/ -" -SRC_URI=" - https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt ) -" -S="${WORKDIR}/${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 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos" -IUSE="doc sqlite test" -RESTRICT="!test? ( test )" - -RDEPEND=" - =dev-python/asgiref-3.5.2[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/backports-zoneinfo[${PYTHON_USEDEP}] - ' 3.8) -" -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 - !!=sec-keys/openpgp-keys-django-20201201 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0-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 \ - "${P^}.checksum.txt" sha256 "${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() { - 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/django-4.1.8.ebuild b/dev-python/django/django-4.1.8.ebuild deleted file mode 100644 index 0bde99238c4f..000000000000 --- a/dev-python/django/django-4.1.8.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='sqlite?,threads(+)' - -inherit bash-completion-r1 distutils-r1 optfeature verify-sig - -DESCRIPTION="High-level Python web framework" -HOMEPAGE=" - https://www.djangoproject.com/ - https://github.com/django/django/ - https://pypi.org/project/Django/ -" -SRC_URI=" - https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt ) -" -S="${WORKDIR}/${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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" -IUSE="doc sqlite test" -RESTRICT="!test? ( test )" - -RDEPEND=" - =dev-python/asgiref-3.5.2[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/backports-zoneinfo[${PYTHON_USEDEP}] - ' 3.8) -" -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 - !!=sec-keys/openpgp-keys-django-20201201 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0-bashcomp.patch - "${FILESDIR}"/${PN}-4.1.8-py311.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 \ - "${P^}.checksum.txt" sha256 "${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() { - 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/django-4.2.ebuild b/dev-python/django/django-4.2.ebuild deleted file mode 100644 index a5153c56732e..000000000000 --- a/dev-python/django/django-4.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='sqlite?,threads(+)' - -inherit bash-completion-r1 distutils-r1 optfeature verify-sig - -DESCRIPTION="High-level Python web framework" -HOMEPAGE=" - https://www.djangoproject.com/ - https://github.com/django/django/ - https://pypi.org/project/Django/ -" -SRC_URI=" - https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt ) -" -S="${WORKDIR}/${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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" -IUSE="doc sqlite test" -RESTRICT="!test? ( test )" - -RDEPEND=" - =dev-python/asgiref-3.6.0[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.3.1[${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 - !!=sec-keys/openpgp-keys-django-20201201 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0-bashcomp.patch - "${FILESDIR}"/${PN}-4.1.8-py311.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 \ - "${P^}.checksum.txt" sha256 "${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() { - 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.18-py311.patch b/dev-python/django/files/django-3.2.18-py311.patch deleted file mode 100644 index 2cebb8cc817b..000000000000 --- a/dev-python/django/files/django-3.2.18-py311.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 2882cf6f184c7578219e2b5266623e82c0e9b8a2 Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak -Date: Thu, 7 Apr 2022 07:02:21 +0200 -Subject: [PATCH] Refs #33173 -- Fixed test_runner/test_utils tests on Python - 3.11+. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Python 3.11 uses fully qualified test name in unittest output. See -https://github.com/python/cpython/commit/755be9b1505af591b9f2ee424a6525b6c2b65ce9 - -(rebased by Michał Górny) ---- - django/utils/version.py | 1 + - tests/test_runner/test_debug_sql.py | 30 ++++++++++++++++++----------- - tests/test_runner/test_parallel.py | 11 ++++++++--- - tests/test_utils/tests.py | 9 +++++++-- - 4 files changed, 35 insertions(+), 16 deletions(-) - -diff --git a/django/utils/version.py b/django/utils/version.py -index 74c327525e..0c2bfc626e 100644 ---- a/django/utils/version.py -+++ b/django/utils/version.py -@@ -15,6 +15,7 @@ PY37 = sys.version_info >= (3, 7) - PY38 = sys.version_info >= (3, 8) - PY39 = sys.version_info >= (3, 9) - PY310 = sys.version_info >= (3, 10) -+PY311 = sys.version_info >= (3, 11) - - - def get_version(version=None): -diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py -index 0e8e4207d6..2b5fed7a76 100644 ---- a/tests/test_runner/test_debug_sql.py -+++ b/tests/test_runner/test_debug_sql.py -@@ -4,6 +4,7 @@ from io import StringIO - from django.db import connection - from django.test import TestCase - from django.test.runner import DiscoverRunner -+from django.utils.version import PY311 - - from .models import Person - -@@ -100,20 +101,27 @@ class TestDebugSQL(unittest.TestCase): - '''"test_runner_person"."first_name" = 'subtest-fail';'''), - ] - -+ # Python 3.11 uses fully qualified test name in the output. -+ method_name = ".runTest" if PY311 else "" -+ test_class_path = "test_runner.test_debug_sql.TestDebugSQL" - verbose_expected_outputs = [ -- 'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingTest) ... FAIL', -- 'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorTest) ... ERROR', -- 'runTest (test_runner.test_debug_sql.TestDebugSQL.PassingTest) ... ok', -+ f"runTest ({test_class_path}.FailingTest{method_name}) ... FAIL", -+ f"runTest ({test_class_path}.ErrorTest{method_name}) ... ERROR", -+ f"runTest ({test_class_path}.PassingTest{method_name}) ... ok", - # If there are errors/failures in subtests but not in test itself, - # the status is not written. That behavior comes from Python. -- 'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingSubTest) ...', -- 'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorSubTest) ...', -- ('''SELECT COUNT(*) AS "__count" ''' -- '''FROM "test_runner_person" WHERE ''' -- '''"test_runner_person"."first_name" = 'pass';'''), -- ('''SELECT COUNT(*) AS "__count" ''' -- '''FROM "test_runner_person" WHERE ''' -- '''"test_runner_person"."first_name" = 'subtest-pass';'''), -+ f"runTest ({test_class_path}.FailingSubTest{method_name}) ...", -+ f"runTest ({test_class_path}.ErrorSubTest{method_name}) ...", -+ ( -+ """SELECT COUNT(*) AS "__count" """ -+ """FROM "test_runner_person" WHERE """ -+ """"test_runner_person"."first_name" = 'pass';""" -+ ), -+ ( -+ """SELECT COUNT(*) AS "__count" """ -+ """FROM "test_runner_person" WHERE """ -+ """"test_runner_person"."first_name" = 'subtest-pass';""" -+ ), - ] - - def test_setupclass_exception(self): -diff --git a/tests/test_runner/test_parallel.py b/tests/test_runner/test_parallel.py -index c1a89bd0f0..0f1adcf208 100644 ---- a/tests/test_runner/test_parallel.py -+++ b/tests/test_runner/test_parallel.py -@@ -2,7 +2,7 @@ import unittest - - from django.test import SimpleTestCase - from django.test.runner import RemoteTestResult --from django.utils.version import PY37 -+from django.utils.version import PY37, PY311 - - try: - import tblib -@@ -78,8 +78,13 @@ class RemoteTestResultTest(SimpleTestCase): - self.assertEqual(len(events), 4) - - event = events[1] -- self.assertEqual(event[0], 'addSubTest') -- self.assertEqual(str(event[2]), 'dummy_test (test_runner.test_parallel.SampleFailingSubtest) (index=0)') -+ self.assertEqual(event[0], "addSubTest") -+ self.assertEqual( -+ str(event[2]), -+ "dummy_test (test_runner.test_parallel.SampleFailingSubtest%s) (index=0)" -+ # Python 3.11 uses fully qualified test name in the output. -+ % (".dummy_test" if PY311 else ""), -+ ) - trailing_comma = '' if PY37 else ',' - self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1'%s)" % trailing_comma) - -diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py -index 9255315e98..8f72057afe 100644 ---- a/tests/test_utils/tests.py -+++ b/tests/test_utils/tests.py -@@ -26,6 +26,7 @@ from django.test.utils import ( - ) - from django.urls import NoReverseMatch, path, reverse, reverse_lazy - from django.utils.deprecation import RemovedInDjango41Warning -+from django.utils.version import PY311 - - from .models import Car, Person, PossessedCar - from .views import empty_response -@@ -78,9 +79,11 @@ class SkippingTestCase(SimpleTestCase): - SkipTestCase('test_foo').test_foo, - ValueError, - "skipUnlessDBFeature cannot be used on test_foo (test_utils.tests." -- "SkippingTestCase.test_skip_unless_db_feature..SkipTestCase) " -+ "SkippingTestCase.test_skip_unless_db_feature..SkipTestCase%s) " - "as SkippingTestCase.test_skip_unless_db_feature..SkipTestCase " - "doesn't allow queries against the 'default' database." -+ # Python 3.11 uses fully qualified test name in the output. -+ % (".test_foo" if PY311 else ""), - ) - - def test_skip_if_db_feature(self): -@@ -122,9 +125,11 @@ class SkippingTestCase(SimpleTestCase): - SkipTestCase('test_foo').test_foo, - ValueError, - "skipIfDBFeature cannot be used on test_foo (test_utils.tests." -- "SkippingTestCase.test_skip_if_db_feature..SkipTestCase) " -+ "SkippingTestCase.test_skip_if_db_feature..SkipTestCase%s) " - "as SkippingTestCase.test_skip_if_db_feature..SkipTestCase " - "doesn't allow queries against the 'default' database." -+ # Python 3.11 uses fully qualified test name in the output. -+ % (".test_foo" if PY311 else ""), - ) - - --- -2.40.0 - diff --git a/dev-python/django/files/django-3.2.19-py311.patch b/dev-python/django/files/django-3.2.19-py311.patch index 82cdb44aaad3..976537289ff3 100644 --- a/dev-python/django/files/django-3.2.19-py311.patch +++ b/dev-python/django/files/django-3.2.19-py311.patch @@ -1,3 +1,156 @@ +From 2882cf6f184c7578219e2b5266623e82c0e9b8a2 Mon Sep 17 00:00:00 2001 +From: Mariusz Felisiak +Date: Thu, 7 Apr 2022 07:02:21 +0200 +Subject: [PATCH] Refs #33173 -- Fixed test_runner/test_utils tests on Python + 3.11+. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Python 3.11 uses fully qualified test name in unittest output. See +https://github.com/python/cpython/commit/755be9b1505af591b9f2ee424a6525b6c2b65ce9 + +(rebased by Michał Górny) +--- + django/utils/version.py | 1 + + tests/test_runner/test_debug_sql.py | 30 ++++++++++++++++++----------- + tests/test_runner/test_parallel.py | 11 ++++++++--- + tests/test_utils/tests.py | 9 +++++++-- + 4 files changed, 35 insertions(+), 16 deletions(-) + +diff --git a/django/utils/version.py b/django/utils/version.py +index 74c327525e..0c2bfc626e 100644 +--- a/django/utils/version.py ++++ b/django/utils/version.py +@@ -15,6 +15,7 @@ PY37 = sys.version_info >= (3, 7) + PY38 = sys.version_info >= (3, 8) + PY39 = sys.version_info >= (3, 9) + PY310 = sys.version_info >= (3, 10) ++PY311 = sys.version_info >= (3, 11) + + + def get_version(version=None): +diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py +index 0e8e4207d6..2b5fed7a76 100644 +--- a/tests/test_runner/test_debug_sql.py ++++ b/tests/test_runner/test_debug_sql.py +@@ -4,6 +4,7 @@ from io import StringIO + from django.db import connection + from django.test import TestCase + from django.test.runner import DiscoverRunner ++from django.utils.version import PY311 + + from .models import Person + +@@ -100,20 +101,27 @@ class TestDebugSQL(unittest.TestCase): + '''"test_runner_person"."first_name" = 'subtest-fail';'''), + ] + ++ # Python 3.11 uses fully qualified test name in the output. ++ method_name = ".runTest" if PY311 else "" ++ test_class_path = "test_runner.test_debug_sql.TestDebugSQL" + verbose_expected_outputs = [ +- 'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingTest) ... FAIL', +- 'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorTest) ... ERROR', +- 'runTest (test_runner.test_debug_sql.TestDebugSQL.PassingTest) ... ok', ++ f"runTest ({test_class_path}.FailingTest{method_name}) ... FAIL", ++ f"runTest ({test_class_path}.ErrorTest{method_name}) ... ERROR", ++ f"runTest ({test_class_path}.PassingTest{method_name}) ... ok", + # If there are errors/failures in subtests but not in test itself, + # the status is not written. That behavior comes from Python. +- 'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingSubTest) ...', +- 'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorSubTest) ...', +- ('''SELECT COUNT(*) AS "__count" ''' +- '''FROM "test_runner_person" WHERE ''' +- '''"test_runner_person"."first_name" = 'pass';'''), +- ('''SELECT COUNT(*) AS "__count" ''' +- '''FROM "test_runner_person" WHERE ''' +- '''"test_runner_person"."first_name" = 'subtest-pass';'''), ++ f"runTest ({test_class_path}.FailingSubTest{method_name}) ...", ++ f"runTest ({test_class_path}.ErrorSubTest{method_name}) ...", ++ ( ++ """SELECT COUNT(*) AS "__count" """ ++ """FROM "test_runner_person" WHERE """ ++ """"test_runner_person"."first_name" = 'pass';""" ++ ), ++ ( ++ """SELECT COUNT(*) AS "__count" """ ++ """FROM "test_runner_person" WHERE """ ++ """"test_runner_person"."first_name" = 'subtest-pass';""" ++ ), + ] + + def test_setupclass_exception(self): +diff --git a/tests/test_runner/test_parallel.py b/tests/test_runner/test_parallel.py +index c1a89bd0f0..0f1adcf208 100644 +--- a/tests/test_runner/test_parallel.py ++++ b/tests/test_runner/test_parallel.py +@@ -2,7 +2,7 @@ import unittest + + from django.test import SimpleTestCase + from django.test.runner import RemoteTestResult +-from django.utils.version import PY37 ++from django.utils.version import PY37, PY311 + + try: + import tblib +@@ -78,8 +78,13 @@ class RemoteTestResultTest(SimpleTestCase): + self.assertEqual(len(events), 4) + + event = events[1] +- self.assertEqual(event[0], 'addSubTest') +- self.assertEqual(str(event[2]), 'dummy_test (test_runner.test_parallel.SampleFailingSubtest) (index=0)') ++ self.assertEqual(event[0], "addSubTest") ++ self.assertEqual( ++ str(event[2]), ++ "dummy_test (test_runner.test_parallel.SampleFailingSubtest%s) (index=0)" ++ # Python 3.11 uses fully qualified test name in the output. ++ % (".dummy_test" if PY311 else ""), ++ ) + trailing_comma = '' if PY37 else ',' + self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1'%s)" % trailing_comma) + +diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py +index 9255315e98..8f72057afe 100644 +--- a/tests/test_utils/tests.py ++++ b/tests/test_utils/tests.py +@@ -26,6 +26,7 @@ from django.test.utils import ( + ) + from django.urls import NoReverseMatch, path, reverse, reverse_lazy + from django.utils.deprecation import RemovedInDjango41Warning ++from django.utils.version import PY311 + + from .models import Car, Person, PossessedCar + from .views import empty_response +@@ -78,9 +79,11 @@ class SkippingTestCase(SimpleTestCase): + SkipTestCase('test_foo').test_foo, + ValueError, + "skipUnlessDBFeature cannot be used on test_foo (test_utils.tests." +- "SkippingTestCase.test_skip_unless_db_feature..SkipTestCase) " ++ "SkippingTestCase.test_skip_unless_db_feature..SkipTestCase%s) " + "as SkippingTestCase.test_skip_unless_db_feature..SkipTestCase " + "doesn't allow queries against the 'default' database." ++ # Python 3.11 uses fully qualified test name in the output. ++ % (".test_foo" if PY311 else ""), + ) + + def test_skip_if_db_feature(self): +@@ -122,9 +125,11 @@ class SkippingTestCase(SimpleTestCase): + SkipTestCase('test_foo').test_foo, + ValueError, + "skipIfDBFeature cannot be used on test_foo (test_utils.tests." +- "SkippingTestCase.test_skip_if_db_feature..SkipTestCase) " ++ "SkippingTestCase.test_skip_if_db_feature..SkipTestCase%s) " + "as SkippingTestCase.test_skip_if_db_feature..SkipTestCase " + "doesn't allow queries against the 'default' database." ++ # Python 3.11 uses fully qualified test name in the output. ++ % (".test_foo" if PY311 else ""), + ) + + +-- +2.40.0 + From 0981a4bc273e2a87ad10c602d9547e006e06d8dd Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 7 Apr 2023 11:07:54 +0200 diff --git a/dev-python/django/files/django-4.0.5-py311.patch b/dev-python/django/files/django-4.0.5-py311.patch deleted file mode 100644 index d566db006574..000000000000 --- a/dev-python/django/files/django-4.0.5-py311.patch +++ /dev/null @@ -1,218 +0,0 @@ -From 3d022e13bcc1de5162ba7198c856bf27c03d4f37 Mon Sep 17 00:00:00 2001 -From: David Smith <39445562+smithdc1@users.noreply.github.com> -Date: Sat, 19 Feb 2022 19:36:01 +0000 -Subject: [PATCH 1/3] Refs #33173 -- Fixed MailTests.test_backend_arg() on - Windows and Python 3.11+. - ---- - django/utils/version.py | 1 + - tests/mail/tests.py | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/django/utils/version.py b/django/utils/version.py -index 77f13833cb..8f4ab2bcfa 100644 ---- a/django/utils/version.py -+++ b/django/utils/version.py -@@ -15,6 +15,7 @@ PY37 = sys.version_info >= (3, 7) - PY38 = sys.version_info >= (3, 8) - PY39 = sys.version_info >= (3, 9) - PY310 = sys.version_info >= (3, 10) -+PY311 = sys.version_info >= (3, 11) - - - def get_version(version=None): -diff --git a/tests/mail/tests.py b/tests/mail/tests.py -index 51e26cc6be..183a0c0ab1 100644 ---- a/tests/mail/tests.py -+++ b/tests/mail/tests.py -@@ -29,6 +29,7 @@ from django.core.mail.message import BadHeaderError, sanitize_address - from django.test import SimpleTestCase, override_settings - from django.test.utils import requires_tz_support - from django.utils.translation import gettext_lazy -+from django.utils.version import PY311 - - try: - from aiosmtpd.controller import Controller -@@ -790,7 +791,7 @@ class MailTests(HeadersCheckMixin, SimpleTestCase): - filebased.EmailBackend, - ) - -- if sys.platform == "win32": -+ if sys.platform == "win32" and not PY311: - msg = ( - "_getfullpathname: path should be string, bytes or os.PathLike, not " - "object" --- -2.35.1 - -From 4d548dce8fb280ed7be63e9818c316fe5f0ee154 Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak -Date: Thu, 7 Apr 2022 07:02:21 +0200 -Subject: [PATCH 2/3] Refs #33173 -- Fixed test_runner/test_utils tests on - Python 3.11+. - -Python 3.11 uses fully qualified test name in unittest output. See -https://github.com/python/cpython/commit/755be9b1505af591b9f2ee424a6525b6c2b65ce9 ---- - tests/test_runner/test_debug_sql.py | 14 +++++++++----- - tests/test_runner/test_parallel.py | 5 ++++- - tests/test_utils/tests.py | 13 +++++++++---- - 3 files changed, 22 insertions(+), 10 deletions(-) - -diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py -index 9957295f01..d45d8cb4ba 100644 ---- a/tests/test_runner/test_debug_sql.py -+++ b/tests/test_runner/test_debug_sql.py -@@ -4,6 +4,7 @@ from io import StringIO - from django.db import connection - from django.test import TestCase - from django.test.runner import DiscoverRunner -+from django.utils.version import PY311 - - from .models import Person - -@@ -109,14 +110,17 @@ class TestDebugSQL(unittest.TestCase): - ), - ] - -+ # Python 3.11 uses fully qualified test name in the output. -+ method_name = ".runTest" if PY311 else "" -+ test_class_path = "test_runner.test_debug_sql.TestDebugSQL" - verbose_expected_outputs = [ -- "runTest (test_runner.test_debug_sql.TestDebugSQL.FailingTest) ... FAIL", -- "runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorTest) ... ERROR", -- "runTest (test_runner.test_debug_sql.TestDebugSQL.PassingTest) ... ok", -+ f"runTest ({test_class_path}.FailingTest{method_name}) ... FAIL", -+ f"runTest ({test_class_path}.ErrorTest{method_name}) ... ERROR", -+ f"runTest ({test_class_path}.PassingTest{method_name}) ... ok", - # If there are errors/failures in subtests but not in test itself, - # the status is not written. That behavior comes from Python. -- "runTest (test_runner.test_debug_sql.TestDebugSQL.FailingSubTest) ...", -- "runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorSubTest) ...", -+ f"runTest ({test_class_path}.FailingSubTest{method_name}) ...", -+ f"runTest ({test_class_path}.ErrorSubTest{method_name}) ...", - ( - """SELECT COUNT(*) AS "__count" """ - """FROM "test_runner_person" WHERE """ -diff --git a/tests/test_runner/test_parallel.py b/tests/test_runner/test_parallel.py -index ca208f6a48..a2f68d3512 100644 ---- a/tests/test_runner/test_parallel.py -+++ b/tests/test_runner/test_parallel.py -@@ -4,6 +4,7 @@ import unittest - - from django.test import SimpleTestCase - from django.test.runner import RemoteTestResult -+from django.utils.version import PY311 - - try: - import tblib.pickling_support -@@ -125,7 +126,9 @@ class RemoteTestResultTest(SimpleTestCase): - self.assertEqual(event[0], "addSubTest") - self.assertEqual( - str(event[2]), -- "dummy_test (test_runner.test_parallel.SampleFailingSubtest) (index=0)", -+ "dummy_test (test_runner.test_parallel.SampleFailingSubtest%s) (index=0)" -+ # Python 3.11 uses fully qualified test name in the output. -+ % (".dummy_test" if PY311 else ""), - ) - self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1')") - -diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py -index b21c83585b..3b17da1c13 100644 ---- a/tests/test_utils/tests.py -+++ b/tests/test_utils/tests.py -@@ -47,6 +47,7 @@ from django.test.utils import ( - from django.urls import NoReverseMatch, path, reverse, reverse_lazy - from django.utils.deprecation import RemovedInDjango41Warning - from django.utils.log import DEFAULT_LOGGING -+from django.utils.version import PY311 - - from .models import Car, Person, PossessedCar - from .views import empty_response -@@ -99,9 +100,11 @@ class SkippingTestCase(SimpleTestCase): - SkipTestCase("test_foo").test_foo, - ValueError, - "skipUnlessDBFeature cannot be used on test_foo (test_utils.tests." -- "SkippingTestCase.test_skip_unless_db_feature..SkipTestCase) " -+ "SkippingTestCase.test_skip_unless_db_feature..SkipTestCase%s) " - "as SkippingTestCase.test_skip_unless_db_feature..SkipTestCase " -- "doesn't allow queries against the 'default' database.", -+ "doesn't allow queries against the 'default' database." -+ # Python 3.11 uses fully qualified test name in the output. -+ % (".test_foo" if PY311 else ""), - ) - - def test_skip_if_db_feature(self): -@@ -144,9 +147,11 @@ class SkippingTestCase(SimpleTestCase): - SkipTestCase("test_foo").test_foo, - ValueError, - "skipIfDBFeature cannot be used on test_foo (test_utils.tests." -- "SkippingTestCase.test_skip_if_db_feature..SkipTestCase) " -+ "SkippingTestCase.test_skip_if_db_feature..SkipTestCase%s) " - "as SkippingTestCase.test_skip_if_db_feature..SkipTestCase " -- "doesn't allow queries against the 'default' database.", -+ "doesn't allow queries against the 'default' database." -+ # Python 3.11 uses fully qualified test name in the output. -+ % (".test_foo" if PY311 else ""), - ) - - --- -2.35.1 - -From 2037b6b40a4250daaf3fa85f489fab34536c4f3a Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak -Date: Mon, 9 May 2022 10:38:11 +0200 -Subject: [PATCH 3/3] Refs #33173 -- Fixed test_dateparse tests on Python - 3.11+. - -date/datetime/time.fromisoformat() support any valid ISO 8601 format -in Python 3.11+, see https://github.com/python/cpython/issues/80010. ---- - tests/utils_tests/test_dateparse.py | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/tests/utils_tests/test_dateparse.py b/tests/utils_tests/test_dateparse.py -index 8683811636..3f04a8a49c 100644 ---- a/tests/utils_tests/test_dateparse.py -+++ b/tests/utils_tests/test_dateparse.py -@@ -8,6 +8,7 @@ from django.utils.dateparse import ( - parse_time, - ) - from django.utils.timezone import get_fixed_timezone -+from django.utils.version import PY311 - - - class DateParseTests(unittest.TestCase): -@@ -15,14 +16,18 @@ class DateParseTests(unittest.TestCase): - # Valid inputs - self.assertEqual(parse_date("2012-04-23"), date(2012, 4, 23)) - self.assertEqual(parse_date("2012-4-9"), date(2012, 4, 9)) -+ if PY311: -+ self.assertEqual(parse_date("20120423"), date(2012, 4, 23)) - # Invalid inputs -- self.assertIsNone(parse_date("20120423")) -+ self.assertIsNone(parse_date("2012423")) - with self.assertRaises(ValueError): - parse_date("2012-04-56") - - def test_parse_time(self): - # Valid inputs - self.assertEqual(parse_time("09:15:00"), time(9, 15)) -+ if PY311: -+ self.assertEqual(parse_time("091500"), time(9, 15)) - self.assertEqual(parse_time("10:10"), time(10, 10)) - self.assertEqual(parse_time("10:20:30.400"), time(10, 20, 30, 400000)) - self.assertEqual(parse_time("10:20:30,400"), time(10, 20, 30, 400000)) -@@ -35,7 +40,7 @@ class DateParseTests(unittest.TestCase): - self.assertIsNone(parse_time("00:05:23+")) - self.assertIsNone(parse_time("00:05:23+25:00")) - self.assertIsNone(parse_time("4:18:101")) -- self.assertIsNone(parse_time("091500")) -+ self.assertIsNone(parse_time("91500")) - with self.assertRaises(ValueError): - parse_time("09:15:90") - --- -2.35.1 - diff --git a/dev-python/django/files/django-4.1.8-py311.patch b/dev-python/django/files/django-4.1.8-py311.patch deleted file mode 100644 index a84c9f4cb7e9..000000000000 --- a/dev-python/django/files/django-4.1.8-py311.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://code.djangoproject.com/ticket/34118#comment:11 -https://github.com/python/cpython/issues/102549 -https://github.com/django/django/commit/f55bcff9dcac1d0cb1f927f9fd543cfd567400c4 - -From f55bcff9dcac1d0cb1f927f9fd543cfd567400c4 Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak -Date: Fri, 7 Apr 2023 11:07:54 +0200 -Subject: [PATCH] [4.1.x] Refs #34118 -- Fixed - CustomChoicesTests.test_uuid_unsupported on Python 3.11.4+. - -https://github.com/python/cpython/commit/5342f5e713e0cc45b6f226d2d053a8cde1b4d68e - -Follow up to 38e63c9e61152682f3ff982c85a73793ab6d3267. - -Backport of 2eb1f37260f0e0b71ef3a77eb5522d2bb68d6489 from main ---- a/tests/model_enums/tests.py -+++ b/tests/model_enums/tests.py -@@ -311,8 +311,7 @@ class Timezone(datetime.timezone, models.Choices): - pass - - def test_uuid_unsupported(self): -- msg = "UUID objects are immutable" -- with self.assertRaisesMessage(TypeError, msg): -+ with self.assertRaises(TypeError): - - class Identifier(uuid.UUID, models.Choices): - A = "972ce4eb-a95f-4a56-9339-68c208a76f18" - -- cgit v1.2.3