From 32c7b79bcc8a67e6bc6516adbc729e83f957a368 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Aug 2022 14:12:01 +0100 Subject: gentoo auto-resync : 07:08:2022 - 14:12:00 --- dev-python/django/Manifest | 4 + dev-python/django/django-4.1.ebuild | 106 ++++++++++++++++++++++++++ dev-python/django/files/django-4.1-test.patch | 33 ++++++++ 3 files changed, 143 insertions(+) create mode 100644 dev-python/django/django-4.1.ebuild create mode 100644 dev-python/django/files/django-4.1-test.patch (limited to 'dev-python/django') diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index 44486b31e4e1..55f287b86ddc 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -1,10 +1,14 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c 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-test.patch 1683 BLAKE2B b332eeea0a5aae5a4b8f3d9baf464928e68ddf63d7ca4375e0f30f4ee1a6b54427826b9d81c9a3533b1cad26d75eabd442855f8fac8fcc6e5eb96a70369c891f SHA512 a73210312f62afa90db63e168b97cf1fad97e085e716dd12b64f4b83ded3c70e684d21aced3c7a8b6274ad3dec576c88dc6678677b43446468401deda4f6f054 DIST Django-3.2.15.checksum.txt 2560 BLAKE2B 35a4f28005a07cee0b667ec55838d846cb7f1970be41ce08f2191992b1247263f7632bb9dcaa3d20f9df4e050b370416a2a9af6f0e5cc3523484016161a7a47e SHA512 b3d00d18e14be7dec77901ddd8818b41e2b592dbafb2c66b314478f0b2ac0f8486ce41a73a71da9bed4d9ad92a6d6bf21765ede79055c1fb2a9972e3f16cfac7 DIST Django-3.2.15.tar.gz 9833828 BLAKE2B 4b914b1e3c192340d9a1bbd68b7d3bf3d1c1b3f41da6e4a67149e811a2312f646e2ced83af23ae035cf590e526dad00537aa5b4aee14a657f6952675eca94b30 SHA512 fccdad52d39c8757972d5e987b94b13d8ce5ce08ad480ef79407b0d9b88cff69336770409cbe18ce9529bf10966ad63105a0b0f1ffe39b681a41be3718ec886b DIST Django-4.0.7.checksum.txt 2551 BLAKE2B 6fa44707d33af485d3c55096dcc650b4e2384421c57c30cedee9f9577488783836a3ad8261dceaf5c718c1a5fcbe5852b081596525b22639c310c9aa6e86c639 SHA512 4b2453be8090c2a9d48bbe34f6e5dd55859b9debc3a116519c69da39d04ecca202e6da62ae9114790a9da8c55cfcfe176a972bb25576305a8e23736e2e063e3e DIST Django-4.0.7.tar.gz 10407810 BLAKE2B 77c994d042ace329699aa33e14098cbcd4f24fa4db880dd78ed87828b02c25298a1c1664511547de53eb80ebade7bdfb16412a615027e512ded437ae7de79b54 SHA512 51574ab7423a3948318a5985f74bd781269bf1c95dc77838c11e8f9d5e9233f0a3be5dfa4798d523473b9f1fd3196d4c10284e3a28d9543084b2a63179167731 +DIST Django-4.1.checksum.txt 2533 BLAKE2B 263c3719c572347cb5d2087b960a47f0e6ac409a94499cd5ee8ec619c3388d29354c10813d4b3d2a0d6bd73ca52f562a6ae89a3d9340d5ea478a80cc30284467 SHA512 96d0a66c40261530d65bdde34ba1fc2e650690821b0f52900d60ab85162debc64e33e089f90e2b106235fc47581a54dc6432968534837c1a71a887b40fdd4f36 +DIST Django-4.1.tar.gz 10484595 BLAKE2B 29a833330862abcf69bf082af6df08986443d34abfe821bd307fba6ddd73dd00be7ae8d3e809fe97db0b22f9062daa760cbe01da8d773e1528f583938959f775 SHA512 f0f7e627b3c474c886cb2476f900222d2623e1ed1da1ac6b23ac618ff49e330edc2efd47b275cb02b8bcb254126bf3c926462c616bb0abee1cd433715f5184da EBUILD django-3.2.15.ebuild 3050 BLAKE2B da552703a81abf12dc9f104268237438fcc8b9003a9d4789706ee2c812799aef24e4476039cd64bb65c7821f844138e22220006ea14c1475cf3d1705babc6298 SHA512 59e9aa4a66d7b804578fab30b0db04ad2f07d482c07260bfdec986c921d321e4a79b03c046b877a2ffb7d0bc204f0799d4f2557abdc01560879db2c75d68f536 EBUILD django-4.0.7.ebuild 3014 BLAKE2B b7cf6af18b777fe0953f5b8d86f973052f91deebb13b4098389501492fa0154a219a92f73f4c7d4f7837f213b3d577dc8019adc45f166c7168d35e7c86d8263b SHA512 4fadb585365955d6d3e9fabbc0657b35435266bb27fd1515712f91844e21fd5adf6a24c42b02ec6e58c031c40fc9909cb4f25f610acdc752b6046cc19d9840ad +EBUILD django-4.1.ebuild 3014 BLAKE2B 2e1a238d9c1e3d3256111d2153f9bc4ec6e4ffc5d084f87d7fc699290999dfb8ef870ab94607ba8777753be053b888230be3a31d820e53be522edb32a352c698 SHA512 fae3486b9008e457b4b65bee3fc919e82a81786cf79b54cfc6a4823f1c2f9d9f7e551ab3e8db6b4d9c8c3bca217278a165d49dd5648bc591ec4096d34fbf811e MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7 diff --git a/dev-python/django/django-4.1.ebuild b/dev-python/django/django-4.1.ebuild new file mode 100644 index 000000000000..5c62178ef58f --- /dev/null +++ b/dev-python/django/django-4.1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..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://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}" + +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.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 + # https://github.com/django/django/commit/9e9bdf8dbd6e2354a2e23aa7e37d5b491338085e + "${FILESDIR}"/${P}-test.patch +) + +distutils_enable_sphinx docs --no-autodoc + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc + +src_unpack() { + if use verify-sig; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + "${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz" + cd "${WORKDIR}" || die + fi + + default +} + +python_test() { + # Tests have non-standard assumptions about PYTHONPATH, + # and don't work with ${BUILD_DIR}/lib. + PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 || + die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + newbashcomp extras/django_bash_completion ${PN}-admin + bashcomp_alias ${PN}-admin django-admin.py + + distutils-r1_python_install_all +} + +pkg_postinst() { + 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-4.1-test.patch b/dev-python/django/files/django-4.1-test.patch new file mode 100644 index 000000000000..d50c3df89bec --- /dev/null +++ b/dev-python/django/files/django-4.1-test.patch @@ -0,0 +1,33 @@ +From 9e9bdf8dbd6e2354a2e23aa7e37d5b491338085e Mon Sep 17 00:00:00 2001 +From: Alberto Planas +Date: Wed, 3 Aug 2022 16:36:04 +0200 +Subject: [PATCH] [4.1.x] Fixed #33887 -- Fixed + test_fails_squash_migration_manual_porting() on final tags. + +Regression in 7c318a8bdd66f8c5241864c9970dddb525d0ca4c. +Backport of 4e13b40a764cfdae50416338c5d077e9d9a6d0f1 from main +--- + tests/migrations/test_commands.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py +index a3e1efc924bd..0d4fb52bbb82 100644 +--- a/tests/migrations/test_commands.py ++++ b/tests/migrations/test_commands.py +@@ -3005,11 +3005,12 @@ def test_fails_squash_migration_manual_porting(self): + with self.temporary_migration_module( + module="migrations.test_migrations_manual_porting" + ) as migration_dir: ++ version = get_docs_version() + msg = ( +- "Migration will require manual porting but is already a squashed " +- "migration.\nTransition to a normal migration first: " +- "https://docs.djangoproject.com/en/dev/topics/migrations/" +- "#squashing-migrations" ++ f"Migration will require manual porting but is already a squashed " ++ f"migration.\nTransition to a normal migration first: " ++ f"https://docs.djangoproject.com/en/{version}/topics/migrations/" ++ f"#squashing-migrations" + ) + with self.assertRaisesMessage(CommandError, msg): + call_command("optimizemigration", "migrations", "0004", stdout=out) -- cgit v1.2.3