diff --git a/0001-Fixed-33887-Added-version-in-asserted-test-URL.patch b/0001-Fixed-33887-Added-version-in-asserted-test-URL.patch new file mode 100644 index 0000000..19d8c54 --- /dev/null +++ b/0001-Fixed-33887-Added-version-in-asserted-test-URL.patch @@ -0,0 +1,33 @@ +From 6a5640efabd6a01c827462c979a2dbf5cf6c86da Mon Sep 17 00:00:00 2001 +From: Alberto Planas +Date: Wed, 3 Aug 2022 15:42:39 +0200 +Subject: [PATCH] Fixed #33887 -- Added {version} in asserted test URL + +--- + 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 a3e1efc924..0d4fb52bbb 100644 +--- a/tests/migrations/test_commands.py ++++ b/tests/migrations/test_commands.py +@@ -3005,11 +3005,12 @@ class OptimizeMigrationTests(MigrationTestBase): + 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) +-- +2.37.1 + diff --git a/Django-4.0.7.tar.gz b/Django-4.0.7.tar.gz deleted file mode 100644 index 2821e93..0000000 --- a/Django-4.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c6d5ad36be798e562ddcaa6b17b1c3ff2d3c4f529a47432b69fb9a30f847461 -size 10407810 diff --git a/Django-4.0.7.tar.gz.asc.INVALID b/Django-4.0.7.tar.gz.asc.INVALID deleted file mode 100644 index 56d670a..0000000 --- a/Django-4.0.7.tar.gz.asc.INVALID +++ /dev/null @@ -1,67 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -This file contains MD5, SHA1, and SHA256 checksums for the source-code -tarball and wheel files of Django 4.0.7, released August 3, 2022. - -To use this file, you will need a working install of PGP or other -compatible public-key encryption software. You will also need to have -the Django release manager's public key in your keyring. This key has -the ID ``E17DF5C82B4F9D00`` and can be imported from the MIT -keyserver, for example, if using the open-source GNU Privacy Guard -implementation of PGP: - - gpg --keyserver pgp.mit.edu --recv-key E17DF5C82B4F9D00 - -or via the GitHub API: - - curl https://github.com/carltongibson.gpg | gpg --import - - -Once the key is imported, verify this file: - - gpg --verify <> - -Once you have verified this file, you can use normal MD5, SHA1, or SHA256 -checksumming applications to generate the checksums of the Django -package and compare them to the checksums listed below. - -Release packages: -================= - -https://www.djangoproject.com/m/releases/4.0/Django-4.0.7.tar.gz -https://www.djangoproject.com/m/releases/4.0/Django-4.0.7-py3-none-any.whl - -MD5 checksums -============= - -68abb56603fcc5c961083859bda8b04b Django-4.0.7.tar.gz -9e6f021f50b1c40ea7071bbd37950485 Django-4.0.7-py3-none-any.whl - -SHA1 checksums -============== - -fe0a63db1d1de63500f0c012027106fbbe77f8b5 Django-4.0.7.tar.gz -7501d0a41110ea76ae2d15da3cf43da44f74de2c Django-4.0.7-py3-none-any.whl - -SHA256 checksums -================ - -9c6d5ad36be798e562ddcaa6b17b1c3ff2d3c4f529a47432b69fb9a30f847461 Django-4.0.7.tar.gz -41bd65a9e5f8a89cdbfa7a7bba45cd7431ae89e750af82dea8a35fd1a7ecbe66 Django-4.0.7-py3-none-any.whl ------BEGIN PGP SIGNATURE----- - -iQJPBAEBCAA5FiEE/l+2OHah1xioxnVW4X31yCtPnQAFAmLqHBQbHGNhcmx0b24u -Z2lic29uQG5vdW1lbmFsLmVzAAoJEOF99cgrT50AcooP/2gklEPRBY5P/BkSEkVN -69+cCjIqCYDevxqq8aDqYBARZfVZbFGCbLDJi4wUCngIpoRhgHdJWRMUSSrJVd3+ -sVL/U7CLyJPyml1Ry+QvHXWcUXF5ET1IEEQdktdr+WFjtwRQeV/KRZnhDLj5N/vs -xDSjHvSLDmYaYAm9wTOYQ4KogFoIifihOrcUotvjOqsoikMoXVLTlFHKn/ZO7RMr -Tr6xgbilEQxpyEaDnReQWbX/adCDAVaFYIbWR4bQdd6HdxEAjQ+2N7ydC1+JdnLg -/P2NT6etX18jdVgNU7+F9rl/ZMv8GnOCgd80Z50QPVVTDEhLyupVs5mdPkk8iZAj -Uw1cs/Y5b5WR2Yp72m7rdkY5tRFHWkEEogjB9JMvWcFHH3BarAORzm0CUptNmsxd -JfrRJObIhSR5ACLFpSFWgeJeoKDAqG2AVLQ+gHoJgX02wQgcMLISpEXLO83Q4+rV -u3UqnZaWnRSRmDvVAFg5Gzbyd/guuLwUitK3XJMhDVtfB8BRV/9GcIlZLh7Lxkxt -x1s4+W4j0ydk1vjUUe7hCpwwfCuKD2TO2RYDYvMZhD6L0fOUcdAeveCEQ/hW1iX3 -f3uMj8noWIsBFUDmt5MOS/2zIqMTTI1f9ayLqE+S1vi9c9k6WsnGLlls29/1qnmQ -X+oc2EXeslxZc4rb05cvPbN4 -=YlDN ------END PGP SIGNATURE----- diff --git a/Django-4.1.tar.gz b/Django-4.1.tar.gz new file mode 100644 index 0000000..c6e1a9a --- /dev/null +++ b/Django-4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:032f8a6fc7cf05ccd1214e4a2e21dfcd6a23b9d575c6573cacc8c67828dbe642 +size 10484595 diff --git a/Django-4.1.tar.gz.asc.INVALID b/Django-4.1.tar.gz.asc.INVALID new file mode 100644 index 0000000..31e8176 --- /dev/null +++ b/Django-4.1.tar.gz.asc.INVALID @@ -0,0 +1,67 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +This file contains MD5, SHA1, and SHA256 checksums for the source-code +tarball and wheel files of Django 4.1, released August 3, 2022. + +To use this file, you will need a working install of PGP or other +compatible public-key encryption software. You will also need to have +the Django release manager's public key in your keyring. This key has +the ID ``E17DF5C82B4F9D00`` and can be imported from the MIT +keyserver, for example, if using the open-source GNU Privacy Guard +implementation of PGP: + + gpg --keyserver pgp.mit.edu --recv-key E17DF5C82B4F9D00 + +or via the GitHub API: + + curl https://github.com/carltongibson.gpg | gpg --import - + +Once the key is imported, verify this file: + + gpg --verify <> + +Once you have verified this file, you can use normal MD5, SHA1, or SHA256 +checksumming applications to generate the checksums of the Django +package and compare them to the checksums listed below. + +Release packages: +================= + +https://www.djangoproject.com/m/releases/4.1/Django-4.1-py3-none-any.whl +https://www.djangoproject.com/m/releases/4.1/Django-4.1.tar.gz + +MD5 checksums +============= + +940ab96fc1f61c12430d27867d72fccc Django-4.1-py3-none-any.whl +9ef83433b44e798a3bdc0b15a56e0f80 Django-4.1.tar.gz + +SHA1 checksums +============== + +34e04d5360f491595379539165a2435a77f52c5f Django-4.1-py3-none-any.whl +74a42e5359f53dc45c644953754d857b8869fc00 Django-4.1.tar.gz + +SHA256 checksums +================ + +031ccb717782f6af83a0063a1957686e87cb4581ea61b47b3e9addf60687989a Django-4.1-py3-none-any.whl +032f8a6fc7cf05ccd1214e4a2e21dfcd6a23b9d575c6573cacc8c67828dbe642 Django-4.1.tar.gz +-----BEGIN PGP SIGNATURE----- + +iQJPBAEBCAA5FiEE/l+2OHah1xioxnVW4X31yCtPnQAFAmLqMxgbHGNhcmx0b24u +Z2lic29uQG5vdW1lbmFsLmVzAAoJEOF99cgrT50Av1wQALY/UW5iSlW7Wlxtk2dn +Xx+zG3y9jzkFSlF0dQS1ruiJwRTd8dpN19YOr1zoShLJnfHyKkXnAwoNeivKbcuA +6u5fzX8Qb3dbhahh79AOupRaQ/oFZantcrryJZ/8OxI68aagQoJhop6SyFfVTWgy +P5hHTnMp2/5Ij/5FoVTgTLqxmHcaV1h8PAUYN8egIIq8X5OnZequ+JX+EYDsn6ih +aOyK5Piu94+JW/jR3TO3CwQXSv95pBMC9Alsi2S+BVYyx9sU8Do3Mfp0ZzmxTxYG +losH4YUJIUhkOh4W7w3Fiz/m8d3bL+jpCC8ysXWVdlpf2+zZKAcjRMZ7QjdpPCqm +TfOWTtxgyWtNCB4KUBJzowq+2VbZfOUXoTQ6rlH3naDicvVNpF23D9Wt0jkSxU+W +zT3PKgwDt1mZyWTzzIX8CCLgZ2GlvPvC3ROGxq2URJjSPQRyAKDCsdtndF6s6Fvr +zOkWjKRtbwsKwLVFWJGrCE0WOhTPfDrPMbERFDtYzsWaMwdowhR1MZ41uv3m/0K0 +jQOzVOaON266gVZ1VbIjbDFoFA66aJjgGGECUrKcdD19zAFBpo/3OcCpt+Xoyl3W +bizFS0dGeEmQCIdqIzY+4CeuqgHj8f5gRt5IovZJLok7+xWeB+F63tqTNUeLsy3W +T4/z429aKXm6hwHy0MTR34lB +=ylzB +-----END PGP SIGNATURE----- diff --git a/fix_test_custom_fields_SQLite.patch b/fix_test_custom_fields_SQLite.patch deleted file mode 100644 index 2c4a56c..0000000 --- a/fix_test_custom_fields_SQLite.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 402ed030933ffa1af74db50f737872d48f0152bb Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak -Date: Thu, 9 Dec 2021 13:21:36 +0100 -Subject: [PATCH] Fixed inspectdb.tests.InspectDBTestCase.test_custom_fields() - on SQLite 3.37+. - -Use FlexibleFieldLookupDict which is case-insensitive mapping because -SQLite 3.37+ returns some data type names uppercased e.g. TEXT. ---- - tests/inspectdb/tests.py | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -Index: Django-4.0.3/tests/inspectdb/tests.py -=================================================================== ---- Django-4.0.3.orig/tests/inspectdb/tests.py -+++ Django-4.0.3/tests/inspectdb/tests.py -@@ -387,18 +387,18 @@ class InspectDBTestCase(TestCase): - Introspection of columns with a custom field (#21090) - """ - out = StringIO() -- orig_data_types_reverse = connection.introspection.data_types_reverse -- try: -- connection.introspection.data_types_reverse = { -+ with mock.patch( -+ "django.db.connection.introspection.data_types_reverse." -+ "base_data_types_reverse", -+ { - "text": "myfields.TextField", - "bigint": "BigIntegerField", -- } -+ }, -+ ): - call_command("inspectdb", "inspectdb_columntypes", stdout=out) - output = out.getvalue() - self.assertIn("text_field = myfields.TextField()", output) - self.assertIn("big_int_field = models.BigIntegerField()", output) -- finally: -- connection.introspection.data_types_reverse = orig_data_types_reverse - - def test_introspection_errors(self): - """ diff --git a/python-Django.changes b/python-Django.changes index a70ed60..7a84ef8 100644 --- a/python-Django.changes +++ b/python-Django.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Aug 3 13:20:52 UTC 2022 - Alberto Planas Dominguez + +- Update to 4.1: + This is just a summary. Full release notes are available at + https://docs.djangoproject.com/en/4.1/releases/4.1/ + + Django 4.1 supports Python 3.8, 3.9, and 3.10 + + Asynchronous handlers for class-based views + + Asynchronous ORM interface + + Validation of Constraints + + Form rendering accessibility + + CSRF_COOKIE_MASKED setting +- Drop fix_test_custom_fields_SQLite.patch (already merged) + ------------------------------------------------------------------- Wed Aug 3 11:48:48 UTC 2022 - Alberto Planas Dominguez diff --git a/python-Django.spec b/python-Django.spec index a80dde4..8b22f27 100644 --- a/python-Django.spec +++ b/python-Django.spec @@ -24,26 +24,23 @@ %bcond_with memcached Name: python-Django # We want support LTS versions of Django - numbered 2.2 -> 3.2 -> 4.2 etc -Version: 4.0.7 +Version: 4.1 Release: 0 Summary: A high-level Python Web framework License: BSD-3-Clause URL: https://www.djangoproject.com -Source: https://www.djangoproject.com/m/releases/4.0/Django-%{version}.tar.gz -# For 4.0.7 the signature file seems to be invalid, but the SHA1 match the published one +Source: https://www.djangoproject.com/m/releases/4.1/Django-%{version}.tar.gz +# For 4.1 the signature file seems to be invalid, but the SHA1 match the published one Source1: https://media.djangoproject.com/pgp/Django-%{version}.checksum.txt#/Django-%{version}.tar.gz.asc.INVALID Source2: %{name}.keyring Source99: python-Django-rpmlintrc -# PATCH-FIX-UPSTREAM fix_test_custom_fields_SQLite.patch gh#django/django#15168 mcepl@suse.com -# Use FlexibleFieldLookupDict which is case-insensitive mapping -# because SQLite 3.37+ returns some data type names upper-cased -# e.g. TEXT. -Patch0: fix_test_custom_fields_SQLite.patch +# PATCH-FIX-UPSTREAM 0001-Fixed-33887-Added-version-in-asserted-test-URL.patch gh#django/django#15908 aplanas@suse.com +Patch0: 0001-Fixed-33887-Added-version-in-asserted-test-URL.patch BuildRequires: %{python_module Jinja2 >= 2.9.2} BuildRequires: %{python_module Pillow >= 6.2.0} BuildRequires: %{python_module PyYAML} -BuildRequires: %{python_module argon2-cffi >= 16.1.0} -BuildRequires: %{python_module asgiref >= 3.4.1} +BuildRequires: %{python_module argon2-cffi >= 19.1.0} +BuildRequires: %{python_module asgiref >= 3.5.2} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module bcrypt} BuildRequires: %{python_module docutils} @@ -59,11 +56,12 @@ BuildRequires: python-rpm-macros BuildRequires: %{python_module backports.zoneinfo if (%python-base with python38-base)} Requires: python Requires: python-Pillow >= 6.2.0 -Requires: python-argon2-cffi >= 16.1.0 -Requires: python-asgiref >= 3.4.1 +Requires: python-argon2-cffi >= 19.1.0 +Requires: python-asgiref >= 3.5.2 %if "%{python_flavor}" == "python38" Requires: python-backports.zoneinfo %endif +Requires: python-bcrypt Requires: python-pytz Requires: python-setuptools Requires: python-sqlparse >= 0.2.2 @@ -71,7 +69,6 @@ Requires(post): update-alternatives Requires(postun):update-alternatives Recommends: python-Jinja2 >= 2.9.2 Recommends: python-PyYAML -Recommends: python-bcrypt Recommends: python-geoip2 Recommends: python-pylibmc Recommends: python-python-memcached >= 1.59