Skip to content

Conversation

nessita
Copy link
Contributor

@nessita nessita commented Sep 18, 2023

No description provided.

@nessita nessita force-pushed the pre-branch-edits-for-5.0a1 branch from b661905 to ebe84d7 Compare September 18, 2023 12:15
@nessita nessita force-pushed the pre-branch-edits-for-5.0a1 branch from ebe84d7 to 2e802f9 Compare September 18, 2023 12:26
@nessita nessita force-pushed the pre-branch-edits-for-5.0a1 branch from 2e802f9 to d0c45be Compare September 18, 2023 12:52
Copy link
Member

@felixxm felixxm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nessita Thanks 👍 I'd also move backward incompatible changes for modules below the
"Database backend API":

diff --git a/docs/releases/5.0.txt b/docs/releases/5.0.txt
index 7d45396824..814ae844f4 100644
--- a/docs/releases/5.0.txt
+++ b/docs/releases/5.0.txt
@@ -452,12 +452,6 @@ backends.
   ``False`` if the database doesn't support the ``DEFAULT`` keyword in bulk
   ``INSERT`` queries.
 
-Dropped support for MySQL < 8.0.11
-----------------------------------
-
-Support for pre-releases of MySQL 8.0.x series is removed. Django 5.0 supports
-MySQL 8.0.11 and higher.
-
 :mod:`django.contrib.gis`
 -------------------------
 
@@ -474,6 +468,12 @@ MySQL 8.0.11 and higher.
 
 * The ``django.contrib.sitemaps.SitemapNotFound`` exception class is removed.
 
+Dropped support for MySQL < 8.0.11
+----------------------------------
+
+Support for pre-releases of MySQL 8.0.x series is removed. Django 5.0 supports
+MySQL 8.0.11 and higher.
+
 Using ``create_defaults__exact`` may now be required with ``QuerySet.update_or_create()``
 -----------------------------------------------------------------------------------------
 
@@ -583,7 +583,7 @@ Miscellaneous
 * The ``DjangoDivFormRenderer`` and ``Jinja2DivFormRenderer`` transitional form
   renderers are deprecated.
 
-* Passing positional arguments  ``name`` and ``violation_error_message`` to
+* Passing positional arguments ``name`` and ``violation_error_message`` to
   :class:`~django.db.models.BaseConstraint` is deprecated in favor of
   keyword-only arguments.
 

@nessita nessita force-pushed the pre-branch-edits-for-5.0a1 branch from d0c45be to 613b7ba Compare September 18, 2023 13:21
@nessita
Copy link
Contributor Author

nessita commented Sep 18, 2023

Failing test is a flaky one: cache.tests.PyLibMCCacheTests.test_touch:

Traceback (most recent call last):
  File "/home/jenkins/workspace/pull-requests-focal/database/spatialite/label/focal-pr/python/python3.10/tests/cache/tests.py", line 495, in test_touch
    self.assertIs(cache.touch("expire1", timeout=4), True)
AssertionError: False is not True

@nessita nessita merged commit 613b7ba into django:main Sep 18, 2023
@nessita nessita deleted the pre-branch-edits-for-5.0a1 branch September 18, 2023 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants