From 246c20e5364b6f97d084d3934d0a394a323a3c06 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Thu, 16 Sep 2021 16:34:12 +0200 Subject: [PATCH] dev-python/django: New package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alarig Le Lay +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 fa77d59aff..dfeb439a2e 100755 +--- a/extras/django_bash_completion ++++ b/extras/django_bash_completion +@@ -37,35 +37,4 @@ _django_completion() + DJANGO_AUTO_COMPLETE=1 $1 ) ) + } + # When the django-admin.py deprecation ends, remove django-admin.py. +-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]##*/} +- 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(\.py)?"; 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 +-- +2.28.0 + diff --git a/dev-python/django/files/django-3.2.7-argparse-py310.patch b/dev-python/django/files/django-3.2.7-argparse-py310.patch new file mode 100644 index 0000000..3702a4c --- /dev/null +++ b/dev-python/django/files/django-3.2.7-argparse-py310.patch @@ -0,0 +1,52 @@ +From dc7d30c03ff72917584952e70b3b25c9a0c59033 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Tue, 3 Aug 2021 10:04:22 +0200 +Subject: [PATCH] Refs #32074 -- Update expected argparse error in invalid + choice test + +Python 3.10.0rc1 changed the error messages issued by argparse on +invalid choice to include the argument name. Update the expected test +output to account for that. +--- + django/utils/version.py | 1 + + tests/user_commands/tests.py | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/django/utils/version.py b/django/utils/version.py +index 4b26586b36..54b10e89d7 100644 +--- a/django/utils/version.py ++++ b/django/utils/version.py +@@ -13,6 +13,7 @@ PY36 = sys.version_info >= (3, 6) + PY37 = sys.version_info >= (3, 7) + PY38 = sys.version_info >= (3, 8) + PY39 = sys.version_info >= (3, 9) ++PY310 = sys.version_info >= (3, 10) + + + def get_version(version=None): +diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py +index 9262e2717a..9da0977c38 100644 +--- a/tests/user_commands/tests.py ++++ b/tests/user_commands/tests.py +@@ -17,7 +17,7 @@ from django.test import SimpleTestCase, override_settings + from django.test.utils import captured_stderr, extend_sys_path, ignore_warnings + from django.utils import translation + from django.utils.deprecation import RemovedInDjango41Warning +-from django.utils.version import PY37 ++from django.utils.version import PY37, PY310 + + from .management.commands import dance + +@@ -334,7 +334,8 @@ class CommandTests(SimpleTestCase): + self.assertIn('bar', out.getvalue()) + + def test_subparser_invalid_option(self): +- msg = "Error: invalid choice: 'test' (choose from 'foo')" ++ msg = "Error: %sinvalid choice: 'test' (choose from 'foo')" % ( ++ 'argument {foo}: ' if PY310 else '') + with self.assertRaisesMessage(CommandError, msg): + management.call_command('subparser', 'test', 12) + if PY37: +-- +2.32.0 + diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml new file mode 100644 index 0000000..c23d3d6 --- /dev/null +++ b/dev-python/django/metadata.xml @@ -0,0 +1,13 @@ + + + + + python@gentoo.org + Python + + + + Django + django/django + +