diff options
Diffstat (limited to 'dev-python/django')
| -rw-r--r-- | dev-python/django/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/django/files/django-4.1.8-py311.patch | 28 |
2 files changed, 21 insertions, 9 deletions
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index 5630a65e5764..ac7f0ebcc154 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -2,7 +2,7 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152 AUX django-3.2.18-py311.patch 6716 BLAKE2B 6937c7dad0b4435906923cf08c47198d1d2046efbdc98dbcd914e66a6d72ea1d80393df71632e97f4f8aa3fdbc0e9cd63f4036dfc21833d9ce62de49986f76b9 SHA512 fb8c57bc1bcac563a6572ba54c2cb8ee98e6290ac44d75a380c841c048021e464aa85e60a41652d58094e21ec5b4ec4d677bbf9ce686fcbf1ea3e0999fe92c13 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.8-py311.patch 668 BLAKE2B d9ddd4e78775576aff0bda993fda23dec2ba412028c42ad58a85a62ebdf9dc57f11d5e6b4aaf3161cb8d350ed605f7251683a3f412c96ef2fba8fa3cb6b0f800 SHA512 a22394cdcd2724a0aa7a9acbbc1b9d1fd3d5364439829ae1bef1b2ad2d5180d2ee217e346f72b5f32a69c3d2c59c6d74b0bebcf30f270bcff9458ee21865c1fa +AUX django-4.1.8-py311.patch 1120 BLAKE2B 09793426aa8a7ff0273ae0267e4c74c58fe05e51200c0fe283242e53e2af789280d4860d8d88008d819863320352b546bcd52b6abd52034409e2da14cec57910 SHA512 03ae3e631819a12ecb2bc6db2a548ed7197da70698aecf361fea41ed485ce7300d4d8679478da9f49a32ff7065aae5c532e18d37773928e7a7553c7b5d1531dc 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-4.0.10.checksum.txt 2563 BLAKE2B 1ec93751204e80d75f5f4f15086cfd9aabe65e392359f82edb234f2b86802bd1078e00575379c1956dfca8e6c60ddc6209079ae7e99450aa000b22c3312a89f4 SHA512 67b335f184ce02395efba3a4bec7d8087735ef8816eda70867faf9c02242c11c95f30fc36db6abd30996098dd567ef53f6dd467567c5405f34cb2bff7cd2a23c 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" |