mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
dev-python/django: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,16 +1,6 @@
|
||||
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
|
||||
|
||||
@@ -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
|
||||
!!<dev-python/ipython-7.21.0-r1
|
||||
!!=dev-python/ipython-7.22.0-r0
|
||||
)
|
||||
verify-sig? ( >=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
|
||||
}
|
||||
@@ -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
|
||||
!!<dev-python/ipython-7.21.0-r1
|
||||
!!=dev-python/ipython-7.22.0-r0
|
||||
)
|
||||
verify-sig? ( >=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
|
||||
}
|
||||
@@ -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
|
||||
!!<dev-python/ipython-7.21.0-r1
|
||||
!!=dev-python/ipython-7.22.0-r0
|
||||
)
|
||||
verify-sig? ( >=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
|
||||
}
|
||||
@@ -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-4[${PYTHON_USEDEP}]
|
||||
>=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
|
||||
!!<dev-python/ipython-7.21.0-r1
|
||||
!!=dev-python/ipython-7.22.0-r0
|
||||
)
|
||||
verify-sig? ( >=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
|
||||
}
|
||||
@@ -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-4[${PYTHON_USEDEP}]
|
||||
>=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
|
||||
!!<dev-python/ipython-7.21.0-r1
|
||||
!!=dev-python/ipython-7.22.0-r0
|
||||
)
|
||||
verify-sig? ( >=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
|
||||
}
|
||||
@@ -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-4[${PYTHON_USEDEP}]
|
||||
>=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
|
||||
!!<dev-python/ipython-7.21.0-r1
|
||||
!!=dev-python/ipython-7.22.0-r0
|
||||
)
|
||||
verify-sig? ( >=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
|
||||
}
|
||||
@@ -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 <felisiak.mariusz@gmail.com>
|
||||
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.<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.",
|
||||
+ "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.<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.",
|
||||
+ "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 <felisiak.mariusz@gmail.com>
|
||||
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
|
||||
|
||||
@@ -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 <felisiak.mariusz@gmail.com>
|
||||
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"
|
||||
|
||||
Reference in New Issue
Block a user