[pull] main from django:main

.github/workflows/postgis.yml

@@ -59,7 +59,7 @@ jobs:
         run: |
           PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -d $POSTGRES_DB -h localhost -c "SELECT PostGIS_full_version();"
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e .
       - name: Create PostgreSQL settings file
         run: mv ./.github/workflows/data/test_postgis.py.tpl ./tests/test_postgis.py

.github/workflows/python_matrix.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Install libmemcached-dev for pylibmc
         run: sudo apt-get install libmemcached-dev
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -e .
       - name: Run tests
         run: python -Wall tests/runtests.py -v2

.github/workflows/schedule_tests.yml

@@ -31,7 +31,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: 'tests/requirements/py3.txt'
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -e .
       - name: Run tests
         run: python -Wall tests/runtests.py -v2
@@ -50,7 +50,7 @@ jobs:
       - name: Install libmemcached-dev for pylibmc
         run: sudo apt-get install libmemcached-dev
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install .
       - name: Prepare site-packages
         run: |
@@ -92,7 +92,7 @@ jobs:
       - name: Install libmemcached-dev for pylibmc
         run: sudo apt-get install libmemcached-dev
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -e .
       - name: Run Selenium tests
         working-directory: ./tests/
@@ -128,7 +128,7 @@ jobs:
       - name: Install libmemcached-dev for pylibmc
         run: sudo apt-get install libmemcached-dev
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e .
       - name: Create PostgreSQL settings file
         run: mv ./.github/workflows/data/test_postgres.py.tpl ./tests/test_postgres.py
@@ -173,7 +173,7 @@ jobs:
       - name: Install libmemcached-dev for pylibmc
         run: sudo apt-get install libmemcached-dev
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e .
       - name: Create PostgreSQL settings file
         run: mv ./.github/workflows/data/test_postgres.py.tpl ./tests/test_postgres.py

.github/workflows/screenshots.yml

@@ -28,7 +28,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: 'tests/requirements/py3.txt'
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -e .
 
       - name: Run Selenium tests with screenshots

.github/workflows/selenium.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Install libmemcached-dev for pylibmc
         run: sudo apt-get install libmemcached-dev
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -e .
       - name: Run Selenium tests
         working-directory: ./tests/
@@ -67,7 +67,7 @@ jobs:
       - name: Install libmemcached-dev for pylibmc
         run: sudo apt-get install libmemcached-dev
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e .
       - name: Create PostgreSQL settings file
         run: mv ./.github/workflows/data/test_postgres.py.tpl ./tests/test_postgres.py

.github/workflows/tests.yml

@@ -35,7 +35,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: 'tests/requirements/py3.txt'
       - name: Install and upgrade packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip wheel
       - run: python -m pip install -r tests/requirements/py3.txt -e .
       - name: Run tests
         run: python -Wall tests/runtests.py -v2

django/contrib/auth/forms.py

@@ -134,6 +134,9 @@ def set_password_and_save(self, user, password_field_name="password1", commit=Tr
             user.save()
         return user
 
+    def __class_getitem__(cls, *args, **kwargs):
+        return cls
+
 
 class SetUnusablePasswordMixin:
     """

django/db/models/base.py

@@ -1182,8 +1182,9 @@ def _do_update(
         returning_fields,
     ):
         """
-        Try to update the model. Return True if the model was updated (if an
-        update query was done and a matching row was found in the DB).
+        Try to update the model. Return a list of updated fields if the model
+        was updated (if an update query was done and a matching row was
+        found in the DB).
         """
         filtered = base_qs.filter(pk=pk_val)
         if not values:

docs/internals/contributing/writing-code/unit-tests.txt

@@ -325,7 +325,6 @@ dependencies:
 * :pypi:`PyYAML` 6.0.2+
 * :pypi:`pywatchman`
 * :pypi:`redis` 5.1.0+
-* :pypi:`setuptools`
 * :pypi:`pymemcache`, plus a `supported Python binding
   <https://memcached.org/>`_
 * `gettext <https://www.gnu.org/software/gettext/manual/gettext.html>`_

docs/internals/howto-release-django.txt

@@ -604,8 +604,7 @@ Now you're ready to actually put the release out there. To do this:
 
    __ https://djangoci.com/job/confirm-release/
 
-#. Upload the release packages to PyPI (for pre-releases, only upload the wheel
-   file):
+#. Upload the release packages to PyPI:
 
    .. code-block:: shell
 

tests/auth_tests/test_forms.py

@@ -350,6 +350,9 @@ def test_html_autocomplete_attributes(self):
                     form.fields[field_name].widget.attrs["autocomplete"], autocomplete
                 )
 
+    def test_user_creation_form_class_getitem(self):
+        self.assertIs(BaseUserCreationForm["MyCustomUser"], BaseUserCreationForm)
+
 
 class CustomUserCreationFormTest(TestDataMixin, TestCase):