[gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/

[Michał Górny]

commit:     920700795b221fe66a2b08a0cf5892370d5a2ddc
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri May  7 18:11:08 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May  7 22:22:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92070079

dev-python/django: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../django/files/django-3.0.6-bashcomp.patch       | 56 ----------------------
 1 file changed, 56 deletions(-)

diff --git a/dev-python/django/files/django-3.0.6-bashcomp.patch b/dev-python/django/files/django-3.0.6-bashcomp.patch
deleted file mode 100644
index 2eca3416db6..00000000000
--- a/dev-python/django/files/django-3.0.6-bashcomp.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d082b413b0b6edfcae52f64c8a64f16b2bf6110f 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 3c2f14c263..abe76e5903 100755
---- a/extras/django_bash_completion
-+++ b/extras/django_bash_completion
-@@ -37,35 +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]##*/}
--        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.26.2
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/

[Conrad Kostecki]

commit:     8411d210883211feba31b1c79185b4963525e9cb
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct  7 20:20:07 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8411d210

dev-python/django: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27686
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-python/django/files/django-4.1-test.patch | 33 ---------------------------
 1 file changed, 33 deletions(-)

diff --git a/dev-python/django/files/django-4.1-test.patch b/dev-python/django/files/django-4.1-test.patch
deleted file mode 100644
index d50c3df89bec..000000000000
--- a/dev-python/django/files/django-4.1-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9e9bdf8dbd6e2354a2e23aa7e37d5b491338085e Mon Sep 17 00:00:00 2001
-From: Alberto Planas <aplanas@gmail.com>
-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)

[gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/

[Sam James]

commit:     ea5b13def6daa43408265f900201f265e680fbae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  7 10:37:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 10:37:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5b13de

dev-python/django: update to upstream patch for test failure

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/django/files/django-4.1.8-py311.patch | 28 +++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/dev-python/django/files/django-4.1.8-py311.patch b/dev-python/django/files/django-4.1.8-py311.patch
index 043b31a2c780..a84c9f4cb7e9 100644
--- a/dev-python/django/files/django-4.1.8-py311.patch
+++ b/dev-python/django/files/django-4.1.8-py311.patch
@@ -1,16 +1,28 @@
 https://code.djangoproject.com/ticket/34118#comment:11
 https://github.com/python/cpython/issues/102549
-https://github.com/django/django/commit/38e63c9e61152682f3ff982c85a73793ab6d3267
+https://github.com/django/django/commit/f55bcff9dcac1d0cb1f927f9fd543cfd567400c4
 
-Skip the test for now until upstream adapt it to the fix backported to Python 3.11 too.
+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
-@@ -310,7 +310,7 @@ class CustomChoicesTests(SimpleTestCase):
-             class Timezone(datetime.timezone, models.Choices):
+@@ -311,8 +311,7 @@ class Timezone(datetime.timezone, models.Choices):
                  pass
  
--    def test_uuid_unsupported(self):
-+    def _test_uuid_unsupported(self):
-         msg = "UUID objects are immutable"
-         with self.assertRaisesMessage(TypeError, msg):
+     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"
  

[gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/

[Michał Górny]

commit:     d2e589a151e8096f282a093c573d41b7a801fe67
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 14:36:31 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 14:56:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e589a1

dev-python/django: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/django/files/django-4.2.3-py312.patch | 25 ------------------------
 1 file changed, 25 deletions(-)

diff --git a/dev-python/django/files/django-4.2.3-py312.patch b/dev-python/django/files/django-4.2.3-py312.patch
deleted file mode 100644
index 7989f8e7cbcc..000000000000
--- a/dev-python/django/files/django-4.2.3-py312.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This is a hack to get the tests to pass prior to:
-
-[e83a88566a71a2353cebc35992c110be0f8628af] Fixed #32172 -- Adapted signals to allow async handlers.
-
-diff --git a/django/test/signals.py b/django/test/signals.py
-index 94a5161e82..1358101b98 100644
---- a/django/test/signals.py
-+++ b/django/test/signals.py
-@@ -14,6 +14,7 @@ from django.utils import timezone
- from django.utils.formats import FORMAT_SETTINGS, reset_format_cache
- from django.utils.functional import empty
- from django.utils.module_loading import import_string
-+from django.utils.version import PY312
- 
- template_rendered = Signal()
- 
-@@ -183,7 +184,7 @@ def complex_setting_changed(*, enter, setting, **kwargs):
-         # this stacklevel shows the line containing the override_settings call.
-         warnings.warn(
-             f"Overriding setting {setting} can lead to unexpected behavior.",
--            stacklevel=6,
-+            stacklevel=5 if PY312 else 6,
-         )
- 
-