Refs #23433 -- Removed django-admin.py entry point per deprecation timeline.

felixxm · felixxm · commit 90c59b4e12e6 · 2021-01-14T17:50:04.000+01:00
diff --git a/django/bin/django-admin.py b/django/bin/django-admin.py
diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt
@@ -273,3 +273,5 @@ to remove usage of these features.
   right-hand side.
 
 * The ``django.db.models.query_utils.InvalidQuery`` exception class is removed.
+
+* The ``django-admin.py`` entry point is removed.
diff --git a/extras/django_bash_completion b/extras/django_bash_completion
@@ -36,16 +36,15 @@ _django_completion()
                    COMP_CWORD=$COMP_CWORD \
                    DJANGO_AUTO_COMPLETE=1 $1 ) )
 }
-# When the django-admin.py deprecation ends, remove django-admin.py.
-complete -F _django_completion -o default django-admin.py manage.py django-admin
+complete -F _django_completion -o default 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
+            if echo "$PYTHON_SCRIPT" | grep -qE "manage\.py|django-admin"; then
                 COMPREPLY=( $( COMP_WORDS=( "${COMP_WORDS[*]:1}" )
                                COMP_CWORD=$(( COMP_CWORD-1 ))
                                DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
diff --git a/setup.cfg b/setup.cfg
@@ -36,8 +36,6 @@ project_urls =
 [options]
 python_requires = >=3.6
 packages = find:
-# When the django-admin.py deprecation ends, remove "scripts".
-scripts = django/bin/django-admin.py
 include_package_data = true
 zip_safe = false
 install_requires =
diff --git a/tests/admin_scripts/test_django_admin_py.py b/tests/admin_scripts/test_django_admin_py.py
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
@@ -167,12 +167,12 @@ def assertNotInOutput(self, stream, msg):
 ##########################################################################
 # DJANGO ADMIN TESTS
 # This first series of test classes checks the environment processing
-# of the django-admin.py script
+# of the django-admin.
 ##########################################################################
 
 
 class DjangoAdminNoSettings(AdminScriptTestCase):
-    "A series of tests for django-admin.py when there is no settings.py file."
+    "A series of tests for django-admin when there is no settings.py file."
 
     def test_builtin_command(self):
         "no settings: django-admin builtin commands fail with an error when no settings provided"
@@ -207,7 +207,8 @@ def test_commands_with_invalid_settings(self):
 
 
 class DjangoAdminDefaultSettings(AdminScriptTestCase):
-    """A series of tests for django-admin.py when using a settings.py file that
+    """
+    A series of tests for django-admin when using a settings.py file that
     contains the test application.
     """
     def setUp(self):
@@ -273,7 +274,8 @@ def test_custom_command_with_environment(self):
 
 
 class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase):
-    """A series of tests for django-admin.py when using a settings.py file that
+    """
+    A series of tests for django-admin when using a settings.py file that
     contains the test application specified using a full path.
     """
     def setUp(self):
@@ -340,7 +342,8 @@ def test_custom_command_with_environment(self):
 
 
 class DjangoAdminMinimalSettings(AdminScriptTestCase):
-    """A series of tests for django-admin.py when using a settings.py file that
+    """
+    A series of tests for django-admin when using a settings.py file that
     doesn't contain the test application.
     """
     def setUp(self):
@@ -406,8 +409,9 @@ def test_custom_command_with_environment(self):
 
 
 class DjangoAdminAlternateSettings(AdminScriptTestCase):
-    """A series of tests for django-admin.py when using a settings file
-    with a name other than 'settings.py'.
+    """
+    A series of tests for django-admin when using a settings file with a name
+    other than 'settings.py'.
     """
     def setUp(self):
         super().setUp()
@@ -472,7 +476,8 @@ def test_custom_command_with_environment(self):
 
 
 class DjangoAdminMultipleSettings(AdminScriptTestCase):
-    """A series of tests for django-admin.py when multiple settings files
+    """
+    A series of tests for django-admin when multiple settings files
     (including the default 'settings.py') are available. The default settings
     file is insufficient for performing the operations described, so the
     alternate settings must be used by the running script.
@@ -541,7 +546,7 @@ def test_custom_command_with_environment(self):
 
 class DjangoAdminSettingsDirectory(AdminScriptTestCase):
     """
-    A series of tests for django-admin.py when the settings file is in a
+    A series of tests for django-admin when the settings file is in a
     directory. (see #9751).
     """
 
