diff options
Diffstat (limited to 'dev-python/django')
| -rw-r--r-- | dev-python/django/Manifest | 16 | ||||
| -rw-r--r-- | dev-python/django/django-3.2.25.ebuild (renamed from dev-python/django/django-3.2.9.ebuild) | 39 | ||||
| -rw-r--r-- | dev-python/django/django-4.2.11.ebuild (renamed from dev-python/django/django-2.2.24.ebuild) | 49 | ||||
| -rw-r--r-- | dev-python/django/django-5.0.3.ebuild (renamed from dev-python/django/django-3.1.13.ebuild) | 59 | ||||
| -rw-r--r-- | dev-python/django/django-5.0.4.ebuild | 101 | ||||
| -rw-r--r-- | dev-python/django/files/django-2.0.7-bashcomp.patch | 41 | ||||
| -rw-r--r-- | dev-python/django/files/django-3.2.19-py311.patch | 183 | ||||
| -rw-r--r-- | dev-python/django/files/django-3.2.20-urlsplit.patch | 111 | ||||
| -rw-r--r-- | dev-python/django/files/django-4.0-bashcomp.patch | 56 |
9 files changed, 546 insertions, 109 deletions
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index a477b2962850..ef18136b41d2 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -1,6 +1,10 @@ -DIST Django-2.2.24.checksum.txt 2558 BLAKE2B 8a4b1759f0c52f9dfe6eafc2b54d2d6db8c1204be837ef0df362e02afb41faa3fcfef3ee1b5bc10482a200db58c21c3a7a9650b6ed8103c69f196b655af5b239 SHA512 e26d71ed2cded2521837c82ee896b68d765da224a42f34457cb67a0105a72b2b0223655208400baddf7bb70dd51c4902b9ae80d8cb2bc8963c16b23d37bb2d53 -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.9.checksum.txt 2547 BLAKE2B 7a1c38abe3215ee4533984c7d78c37b369545695fb11d84d6600d64eec290addb9257c4d2850af4e311df2245799572e0866917e09713643376da7859754a2ce SHA512 9aae8da65079e20dcf9071fd72fa5f5c61640264b52c842d96cc2f697ba1d5003cf7b7c6d1f95549eb8ec4449679a00ddd267c022b3d0483ab030cc96c9405b7 -DIST Django-3.2.9.tar.gz 9809157 BLAKE2B 27fc04e874055f69466f06b009c015b46c2d2fa9ddd0005f7b2b7b32a45bd1b8a9f34e693027e040b8d05fa581dfeb9a00aaa1d876477cff5292167f20768b60 SHA512 62fb297694a7f5e48465e102dc97e3d1d04b94499bc6d98d37a00d96b438b8c919b6d08055868a1836d62b89ff65ce4fa7dbc9390789dab2eeca0187269b125f +DIST Django-3.2.25.checksum.txt 2560 BLAKE2B e082c588f4e124c9d71c1914e475fd70ed9b68583d65ea59ba0822b96de36c2edc98b4d9192f3d7c75467306fe03404303f6c2a98a026bdb5308bbd1dee89f99 SHA512 49a1610dcd61cbd322f0a5d7fe3cf249c0c4288b194fc8c2bdf7ec6fb8f92b69ca68dcdb71b79998cd80b978b70f48069669d996b6503261ba726c77c8b87672 +DIST Django-3.2.25.tar.gz 9836336 BLAKE2B 586520e0689b2594dd8ce4abb173418aedfde80cc84012d2a4207cbfc67120cbf405a8dfc8d069bb946f027f0eef22b233bd3b3ce569b01ea8fdc7836a6e530f SHA512 ccba83abd1777123186d685e21b96f41abf216a692d18ffe764d2e519eb9d1f6011d08c86b3affdd891591ca4ed7fee27ffa4750d19b486ca775ee680fdb0cb1 +DIST Django-4.2.11.checksum.txt 2560 BLAKE2B 75359ca138515642b4cb4bb17f4e5f18f94d9c4b5a98fe62f4813068d3dfccfa6c3fe1a2ae9ec24758610d0c5c8fe899b54f39b9cd657a92635e8cd7c6f7dcf0 SHA512 9ab3700f2675380dd6e18b5cc1ebbf4fbbd31680079e9232f96133810956e3ab5a46eefa45103a90bbec9d0ba85cc54f5cc2dd4f3d69c64960724f2821ecf3f3 +DIST Django-4.2.11.tar.gz 10426858 BLAKE2B bce1611700383831138a467cfdc3ad2780385429be040d197cb757206c3d1b4c82075cf6766f8222d0c061ee7c0a7a48caf8cd28e8fe6271c39dc47899c4b276 SHA512 5842f0c2592b695ecfd7f00d250075cb9581efc8a7f389f155dbac74d80ac7899f600ffba0d51e3391f15c4a1444554d901b8a673a1091ab7269e24862122ef0 +DIST Django-5.0.3.checksum.txt 2550 BLAKE2B d69fe42e77a1163509f570488b5744571b314b4f24aa0b2f3727ad26ccc53cdc4e16a4b53f21d7e31b0e120462b68397cb31cceded5f4f2d4f0fc9f7afd0f1ee SHA512 abf04cf4fb43f51a8ecef8924e000680184cbb39a9a1a80b679dd1b5cd1e8a90870bc9749b84a6ada79c76cf9c8adb7f870ac0c7ebad68330e8731acdaf3ff22 +DIST Django-5.0.3.tar.gz 10620661 BLAKE2B eaf2f04abf73ad36f7e7825d3655319fbab2268bf5da67ad112e2662f5f5c1bab16d485c75c681ec7e203c111b9676dab2f3552e599a5592a90981e6f7cc75eb SHA512 ed1899007898fc1f6c0889b28fc94016aa9cd2a3556f486bf77efc4310d04896c73bcef93fb4c9162ce884da01c557f6343a20da15a7d6cf2193fd9e88e0dadb +DIST Django-5.0.4.checksum.txt 2570 BLAKE2B dd60e743933312e8744c89a9602acf6643e778cf23d1ab303845f52a2040ff9de73b843c0facf15e8aecc61d9b29f597d76de1e015e7e5a111668fbeb1f84b99 SHA512 9a180082a1735f5d62b51acaf1bd23941d921208d6e3ea14439ceb29603f35860e0307c0b18c1b17d9a155498ef50943e10bf352090f0b6408c5921655d1f992 +DIST Django-5.0.4.tar.gz 10638006 BLAKE2B 81796ec0ba285bebe2c3a4b6d3bfce39e87ad39c01fb450bd66e4eb76c167d08a16e857156d45bce95ac30121fe5855dd7493beb4dcf7628255d729e0d1a2048 SHA512 322b0de4e9e533831937b9f50929e150d9c1ff3045e92b3530d49708df05ad0139819a1056c3def529e93826d26ef8e04f1ced655525fe8c9c2d449c2c701f28 +DIST django-4.2.8-pypy3.patch.xz 5900 BLAKE2B b7dc5c5fc162817a218ee6d025ed8a65559b80e4506e49ac393428c26e2621f9e7c5010b36f2412dea8194a9f1086ab21f97286eabd696c6a786285eb07393cf SHA512 f953b5adbd1364f1d84dde55087ccb493256b1327701275fd2fe99f3cd41751d18e002b6e21afc96892e1671428a6b8f3c2e4b88252c3c278f1a79e286bb73e3 +DIST django-5.0-pypy3.patch.xz 6124 BLAKE2B 7eba7cc70b30743cf4e186a2c5b0f27c13f49114a7a80bcaa2b25fdd7a959583c115a302c9bc6da97c32f6401cf8f3616818ba759190d317c5b033a0f0088766 SHA512 c550e2b2c1243d13cd1f4908f4b6df606355d1491e3bf72042e4b4777a4474306ff0f67b1c2eb4ab4d137cc85bde52dcdbd54bec245d2ba2e092545be8a2993b diff --git a/dev-python/django/django-3.2.9.ebuild b/dev-python/django/django-3.2.25.ebuild index c74bf99146af..a026c5a478e4 100644 --- a/dev-python/django/django-3.2.9.ebuild +++ b/dev-python/django/django-3.2.25.ebuild @@ -1,20 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) 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/" +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)/${MY_P}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )" -S="${WORKDIR}/${MY_P}" + 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) @@ -29,7 +34,9 @@ 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}]" + >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}] + sys-libs/timezone-data +" BDEPEND=" test? ( $(python_gen_impl_dep sqlite) @@ -42,25 +49,26 @@ BDEPEND=" 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 ) + verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 ) " PATCHES=( "${FILESDIR}"/${PN}-3.1-bashcomp.patch + "${FILESDIR}"/django-3.2.19-py311.patch + # needed for Python 3.11 + "${FILESDIR}"/django-3.2.20-urlsplit.patch ) distutils_enable_sphinx docs --no-autodoc -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/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" + "${P^}.checksum.txt" sha256 "${P^}.tar.gz" cd "${WORKDIR}" || die fi @@ -69,7 +77,9 @@ src_unpack() { python_prepare_all() { # Fails because of warnings - sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py + 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 } @@ -97,5 +107,4 @@ pkg_postinst() { 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-2.2.24.ebuild b/dev-python/django/django-4.2.11.ebuild index bc3377ea66e2..7379e6655f94 100644 --- a/dev-python/django/django-2.2.24.ebuild +++ b/dev-python/django/django-4.2.11.ebuild @@ -1,20 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3 python3_{10..12} ) PYTHON_REQ_USE='sqlite?,threads(+)' -inherit bash-completion-r1 distutils-r1 optfeature verify-sig +inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig -MY_P=${P^} DESCRIPTION="High-level Python web framework" -HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/" +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)/${MY_P}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )" -S="${WORKDIR}/${MY_P}" + https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz + https://dev.gentoo.org/~mgorny/dist/python/django-4.2.8-pypy3.patch.xz + verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt ) +" +S="${WORKDIR}/${P^}" LICENSE="BSD" # admin fonts: Roboto (media-fonts/roboto) @@ -22,15 +28,17 @@ LICENSE+=" Apache-2.0" # admin icons, jquery, xregexp.js LICENSE+=" MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos" IUSE="doc sqlite test" RESTRICT="!test? ( test )" RDEPEND=" - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]" + <dev-python/asgiref-4[${PYTHON_USEDEP}] + >=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}] + >=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}] + sys-libs/timezone-data +" BDEPEND=" - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( $(python_gen_impl_dep sqlite) ${RDEPEND} @@ -43,22 +51,23 @@ BDEPEND=" dev-python/tblib[${PYTHON_USEDEP}] sys-devel/gettext ) - verify-sig? ( app-crypt/openpgp-keys-django ) + verify-sig? ( >=sec-keys/openpgp-keys-django-20230606 ) " PATCHES=( - "${FILESDIR}"/${PN}-2.0.7-bashcomp.patch + "${FILESDIR}"/django-4.0-bashcomp.patch + "${WORKDIR}"/django-4.2.8-pypy3.patch ) distutils_enable_sphinx docs --no-autodoc -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/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" + "${P^}.checksum.txt" sha256 "${P^}.tar.gz" cd "${WORKDIR}" || die fi @@ -68,7 +77,8 @@ src_unpack() { 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 || + PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \ + -v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" || die "Tests fail with ${EPYTHON}" } @@ -82,11 +92,10 @@ 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 "PostgreSQL backend support" dev-python/psycopg:0 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.1.13.ebuild b/dev-python/django/django-5.0.3.ebuild index d6e468940850..cb3b94f67c03 100644 --- a/dev-python/django/django-3.1.13.ebuild +++ b/dev-python/django/django-5.0.3.ebuild @@ -1,20 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..9} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3 python3_{10..12} ) PYTHON_REQ_USE='sqlite?,threads(+)' -inherit bash-completion-r1 distutils-r1 optfeature verify-sig +inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig -MY_P=${P^} DESCRIPTION="High-level Python web framework" -HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/" +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)/${MY_P}.tar.gz - verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )" -S="${WORKDIR}/${MY_P}" + https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz + https://dev.gentoo.org/~mgorny/dist/python/django-5.0-pypy3.patch.xz + verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt ) +" +S="${WORKDIR}/${P^}" LICENSE="BSD" # admin fonts: Roboto (media-fonts/roboto) @@ -22,46 +28,45 @@ LICENSE+=" Apache-2.0" # admin icons, jquery, xregexp.js LICENSE+=" MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos" +KEYWORDS="amd64 arm arm64 ~loong ~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}]" + <dev-python/asgiref-4[${PYTHON_USEDEP}] + >=dev-python/asgiref-3.7.0[${PYTHON_USEDEP}] + >=dev-python/sqlparse-0.3.1[${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/docutils-0.19[${PYTHON_USEDEP}] + >=dev-python/jinja-2.11.0[${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}] + >=dev-python/selenium-4.8.0[${PYTHON_USEDEP}] + >=dev-python/tblib-1.5.0[${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 ) + verify-sig? ( >=sec-keys/openpgp-keys-django-20230606 ) " PATCHES=( - "${FILESDIR}"/${PN}-3.1-bashcomp.patch + "${FILESDIR}"/django-4.0-bashcomp.patch + "${WORKDIR}"/django-5.0-pypy3.patch ) distutils_enable_sphinx docs --no-autodoc -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/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" + "${P^}.checksum.txt" sha256 "${P^}.tar.gz" cd "${WORKDIR}" || die fi @@ -71,7 +76,8 @@ src_unpack() { 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 || + PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \ + -v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" || die "Tests fail with ${EPYTHON}" } @@ -85,11 +91,10 @@ 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 "PostgreSQL backend support" dev-python/psycopg:0 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-5.0.4.ebuild b/dev-python/django/django-5.0.4.ebuild new file mode 100644 index 000000000000..8a79467dedd4 --- /dev/null +++ b/dev-python/django/django-5.0.4.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3 python3_{10..12} ) +PYTHON_REQ_USE='sqlite?,threads(+)' + +inherit bash-completion-r1 distutils-r1 multiprocessing 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 + https://dev.gentoo.org/~mgorny/dist/python/django-5.0-pypy3.patch.xz + 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="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" +IUSE="doc sqlite test" +RESTRICT="!test? ( test )" + +RDEPEND=" + <dev-python/asgiref-4[${PYTHON_USEDEP}] + >=dev-python/asgiref-3.7.0[${PYTHON_USEDEP}] + >=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}] + sys-libs/timezone-data +" +BDEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + ${RDEPEND} + >=dev-python/docutils-0.19[${PYTHON_USEDEP}] + >=dev-python/jinja-2.11.0[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pillow[webp,${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/selenium-4.8.0[${PYTHON_USEDEP}] + >=dev-python/tblib-1.5.0[${PYTHON_USEDEP}] + sys-devel/gettext + ) + verify-sig? ( >=sec-keys/openpgp-keys-django-20230606 ) +" + +PATCHES=( + "${FILESDIR}"/django-4.0-bashcomp.patch + "${WORKDIR}"/django-5.0-pypy3.patch +) + +distutils_enable_sphinx docs --no-autodoc + +VERIFY_SIG_OPENPGP_KEY_PATH=/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 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" || + 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:0 + 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 +} diff --git a/dev-python/django/files/django-2.0.7-bashcomp.patch b/dev-python/django/files/django-2.0.7-bashcomp.patch deleted file mode 100644 index 2d886fe6481c..000000000000 --- a/dev-python/django/files/django-2.0.7-bashcomp.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/extras/django_bash_completion -+++ b/extras/django_bash_completion -@@ -37,37 +37,4 @@ _django_completion() - COMP_CWORD=$COMP_CWORD \ - DJANGO_AUTO_COMPLETE=1 $1 ) ) - } --complete -F _django_completion -o default django-admin.py manage.py django-admin -- --_python_django_completion() --{ -- if [[ ${COMP_CWORD} -ge 2 ]]; then -- local PYTHON_EXE=${COMP_WORDS[0]##*/} -- echo $PYTHON_EXE | egrep "python([3-9]\.[0-9])?" >/dev/null 2>&1 -- if [[ $? == 0 ]]; then -- local PYTHON_SCRIPT=${COMP_WORDS[1]##*/} -- echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1 -- if [[ $? == 0 ]]; then -- COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \ -- COMP_CWORD=$(( COMP_CWORD-1 )) \ -- DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) ) -- fi -- fi -- fi --} -- --# Support for multiple interpreters. --unset pythons --if command -v whereis &>/dev/null; then -- python_interpreters=$(whereis python | cut -d " " -f 2-) -- for python in $python_interpreters; do -- [[ $python != *-config ]] && pythons="${pythons} ${python##*/}" -- done -- unset python_interpreters -- pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ") --else -- pythons=python --fi -- --complete -F _python_django_completion -o default $pythons --unset pythons -+complete -F _django_completion -o default django-admin.py django-admin diff --git a/dev-python/django/files/django-3.2.19-py311.patch b/dev-python/django/files/django-3.2.19-py311.patch new file mode 100644 index 000000000000..976537289ff3 --- /dev/null +++ b/dev-python/django/files/django-3.2.19-py311.patch @@ -0,0 +1,183 @@ +From 2882cf6f184c7578219e2b5266623e82c0e9b8a2 Mon Sep 17 00:00:00 2001 +From: Mariusz Felisiak <felisiak.mariusz@gmail.com> +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.<locals>.SkipTestCase) " ++ "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase%s) " + "as SkippingTestCase.test_skip_unless_db_feature.<locals>.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.<locals>.SkipTestCase) " ++ "SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase%s) " + "as SkippingTestCase.test_skip_if_db_feature.<locals>.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 <felisiak.mariusz@gmail.com> +Date: Fri, 7 Apr 2023 11:07:54 +0200 +Subject: [PATCH] Refs #34118 -- Fixed CustomChoicesTests.test_uuid_unsupported + on Python 3.11.4+. + +https://github.com/python/cpython/commit/5342f5e713e0cc45b6f226d2d053a8cde1b4d68e + +Follow up to 38e63c9e61152682f3ff982c85a73793ab6d3267. +--- + tests/model_enums/tests.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/model_enums/tests.py b/tests/model_enums/tests.py +index ffc199ce42..c4ca6c91d7 100644 +--- a/tests/model_enums/tests.py ++++ b/tests/model_enums/tests.py +@@ -259,7 +259,7 @@ class CustomChoicesTests(SimpleTestCase): + 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' +-- +2.40.1 + diff --git a/dev-python/django/files/django-3.2.20-urlsplit.patch b/dev-python/django/files/django-3.2.20-urlsplit.patch new file mode 100644 index 000000000000..4883da38c0f5 --- /dev/null +++ b/dev-python/django/files/django-3.2.20-urlsplit.patch @@ -0,0 +1,111 @@ +From 74fee3f5cab1481dcb299b6eeaf82f862470bafa Mon Sep 17 00:00:00 2001 +From: mendespedro <windowsxpedro@gmail.com> +Date: Wed, 15 Dec 2021 11:55:19 -0300 +Subject: [PATCH] Fixed #33367 -- Fixed URLValidator crash in some edge cases. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[backported to 3.2.x by Michał Górny] +--- + django/core/validators.py | 13 +++--- + .../forms_tests/field_tests/test_urlfield.py | 40 +++++++++++++++---- + 2 files changed, 40 insertions(+), 13 deletions(-) + +diff --git a/django/core/validators.py b/django/core/validators.py +index b9b58dfa61..aad21f95ea 100644 +--- a/django/core/validators.py ++++ b/django/core/validators.py +@@ -111,15 +111,16 @@ class URLValidator(RegexValidator): + raise ValidationError(self.message, code=self.code, params={'value': value}) + + # Then check full URL ++ try: ++ splitted_url = urlsplit(value) ++ except ValueError: ++ raise ValidationError(self.message, code=self.code, params={'value': value}) + try: + super().__call__(value) + except ValidationError as e: + # Trivial case failed. Try for possible IDN domain + if value: +- try: +- scheme, netloc, path, query, fragment = urlsplit(value) +- except ValueError: # for example, "Invalid IPv6 URL" +- raise ValidationError(self.message, code=self.code, params={'value': value}) ++ scheme, netloc, path, query, fragment = splitted_url + try: + netloc = punycode(netloc) # IDN -> ACE + except UnicodeError: # invalid domain part +@@ -130,7 +131,7 @@ class URLValidator(RegexValidator): + raise + else: + # Now verify IPv6 in the netloc part +- host_match = re.search(r'^\[(.+)\](?::\d{2,5})?$', urlsplit(value).netloc) ++ host_match = re.search(r'^\[(.+)\](?::\d{1,5})?$', splitted_url.netloc) + if host_match: + potential_ip = host_match[1] + try: +@@ -142,7 +143,7 @@ class URLValidator(RegexValidator): + # section 3.1. It's defined to be 255 bytes or less, but this includes + # one byte for the length of the name and one byte for the trailing dot + # that's used to indicate absolute names in DNS. +- if len(urlsplit(value).hostname) > 253: ++ if splitted_url.hostname is None or len(splitted_url.hostname) > 253: + raise ValidationError(self.message, code=self.code, params={'value': value}) + + +diff --git a/tests/forms_tests/field_tests/test_urlfield.py b/tests/forms_tests/field_tests/test_urlfield.py +index 19e4351c6a..68b148e7b7 100644 +--- a/tests/forms_tests/field_tests/test_urlfield.py ++++ b/tests/forms_tests/field_tests/test_urlfield.py +@@ -135,13 +135,39 @@ class URLFieldTest(FormFieldAssertionsMixin, SimpleTestCase): + def test_urlfield_10(self): + """URLField correctly validates IPv6 (#18779).""" + f = URLField() +- urls = ( +- 'http://[12:34::3a53]/', +- 'http://[a34:9238::]:8080/', +- ) +- for url in urls: +- with self.subTest(url=url): +- self.assertEqual(url, f.clean(url)) ++ tests = [ ++ 'foo', ++ 'com.', ++ '.', ++ 'http://', ++ 'http://example', ++ 'http://example.', ++ 'http://.com', ++ 'http://invalid-.com', ++ 'http://-invalid.com', ++ 'http://inv-.alid-.com', ++ 'http://inv-.-alid.com', ++ '[a', ++ 'http://[a', ++ # Non-string. ++ 23, ++ # Hangs "forever" before fixing a catastrophic backtracking, ++ # see #11198. ++ 'http://%s' % ('X' * 60,), ++ # A second example, to make sure the problem is really addressed, ++ # even on domains that don't fail the domain label length check in ++ # the regex. ++ 'http://%s' % ("X" * 200,), ++ # urlsplit() raises ValueError. ++ '////]@N.AN', ++ # Empty hostname. ++ '#@A.bO', ++ ] ++ msg = "'Enter a valid URL.'" ++ for value in tests: ++ with self.subTest(value=value): ++ with self.assertRaisesMessage(ValidationError, msg): ++ f.clean(value) + + def test_urlfield_not_string(self): + f = URLField(required=False) +-- +2.41.0 + diff --git a/dev-python/django/files/django-4.0-bashcomp.patch b/dev-python/django/files/django-4.0-bashcomp.patch new file mode 100644 index 000000000000..06d121cce102 --- /dev/null +++ b/dev-python/django/files/django-4.0-bashcomp.patch @@ -0,0 +1,56 @@ +From 103a0f5559795f6517c24ab65d2305a8320acf8a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 6 May 2020 07:24:05 +0200 +Subject: [PATCH] Remove completions unsuitable for autoloading + +The override of 'python*' completions, as well as the attempt +to './manage.py' completion are not going to work with autoloader. +Strip them. +--- + extras/django_bash_completion | 33 +-------------------------------- + 1 file changed, 1 insertion(+), 32 deletions(-) + +diff --git a/extras/django_bash_completion b/extras/django_bash_completion +index 6fb941bef6..2f761ceb83 100755 +--- a/extras/django_bash_completion ++++ b/extras/django_bash_completion +@@ -36,35 +36,4 @@ _django_completion() + COMP_CWORD=$COMP_CWORD \ + DJANGO_AUTO_COMPLETE=1 $1 ) ) + } +-complete -F _django_completion -o default manage.py django-admin +- +-_python_django_completion() +-{ +- if [[ ${COMP_CWORD} -ge 2 ]]; then +- local PYTHON_EXE=${COMP_WORDS[0]##*/} +- if echo "$PYTHON_EXE" | grep -qE "python([3-9]\.[0-9])?"; then +- local PYTHON_SCRIPT=${COMP_WORDS[1]##*/} +- if echo "$PYTHON_SCRIPT" | grep -qE "manage\.py|django-admin"; then +- COMPREPLY=( $( COMP_WORDS=( "${COMP_WORDS[*]:1}" ) +- COMP_CWORD=$(( COMP_CWORD-1 )) +- DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) ) +- fi +- fi +- fi +-} +- +-# Support for multiple interpreters. +-unset pythons +-if command -v whereis &>/dev/null; then +- python_interpreters=$(whereis python | cut -d " " -f 2-) +- for python in $python_interpreters; do +- [[ $python != *-config ]] && pythons="${pythons} ${python##*/}" +- done +- unset python_interpreters +- pythons=$(echo "$pythons" | tr " " "\n" | sort -u | tr "\n" " ") +-else +- pythons=python +-fi +- +-complete -F _python_django_completion -o default $pythons +-unset pythons ++complete -F _django_completion -o default django-admin +-- +2.34.1 + |