Release Zulip Server 4.0-rc1.

We're still investigating the situation with Django 3.2's changes to
password salting configuration, and want to hold off on including this
in a release until we've completed that investigation.

This reverts commit 1d9fb4f988.

docs/overview/changelog.md

@@ -9,6 +9,8 @@ All notable changes to the Zulip server are documented in this file.
 This section lists notable unreleased changes; it is generally updated
 in bursts.
 
+### 4.0-rc1 -- May 3, 2021
+
 #### Highlights
 
 - Added copy-to-clipboard button on code blocks, making it convenient

requirements/common.in

@@ -3,7 +3,7 @@
 # and requirements/prod.txt.
 # See requirements/README.md for more detail.
 # Django itself
-Django[argon2]==3.2.*
+Django[argon2]==3.1.*
 
 # needed for Literal, TypedDict
 typing-extensions

requirements/dev.txt

@@ -380,9 +380,9 @@ django-two-factor-auth[call,phonenumberslite,sms]==1.13.1 \
     --hash=sha256:a20e03d256fd9fd668988545f052cedcc47e5a981888562e5e27d0bb83deae89 \
     --hash=sha256:d270d4288731233621a9462a89a8dfed2dcb86fa354125c816a89772d55f9e29
     # via -r requirements/common.in
-django[argon2]==3.2 \
+django[argon2]==3.1.8 \
-    --hash=sha256:0604e84c4fb698a5e53e5857b5aea945b2f19a18f25f10b8748dbdf935788927 \
+    --hash=sha256:c348b3ddc452bf4b62361f0752f71a339140c777ebea3cdaaaa8fdb7f417a862 \
-    --hash=sha256:21f0f9643722675976004eb683c55d33c05486f94506672df3d6a141546f389d
+    --hash=sha256:f8393103e15ec2d2d313ccbb95a3f1da092f9f58d74ac1c61ca2ac0436ae1eac
     # via
     #   -r requirements/common.in
     #   django-auth-ldap

requirements/prod.txt

@@ -244,9 +244,9 @@ django-two-factor-auth[call,phonenumberslite,sms]==1.13.1 \
     --hash=sha256:a20e03d256fd9fd668988545f052cedcc47e5a981888562e5e27d0bb83deae89 \
     --hash=sha256:d270d4288731233621a9462a89a8dfed2dcb86fa354125c816a89772d55f9e29
     # via -r requirements/common.in
-django[argon2]==3.2 \
+django[argon2]==3.1.8 \
-    --hash=sha256:0604e84c4fb698a5e53e5857b5aea945b2f19a18f25f10b8748dbdf935788927 \
+    --hash=sha256:c348b3ddc452bf4b62361f0752f71a339140c777ebea3cdaaaa8fdb7f417a862 \
-    --hash=sha256:21f0f9643722675976004eb683c55d33c05486f94506672df3d6a141546f389d
+    --hash=sha256:f8393103e15ec2d2d313ccbb95a3f1da092f9f58d74ac1c61ca2ac0436ae1eac
     # via
     #   -r requirements/common.in
     #   django-auth-ldap

tools/test-backend

@@ -76,6 +76,7 @@ not_yet_fully_covered = [
     "zerver/lib/markdown/help_relative_links.py",
     "zerver/lib/markdown/nested_code_blocks.py",
     # Other lib files that ideally would coverage, but aren't sorted
+    "zerver/__init__.py",
     "zerver/filters.py",
     "zerver/middleware.py",
     "zerver/lib/bot_lib.py",

version.py

@@ -1,6 +1,6 @@
 import os
 
-ZULIP_VERSION = "4.0-dev+git"
+ZULIP_VERSION = "4.0-rc1"
 # Add information on number of commits and commit hash to version, if available
 zulip_git_version_file = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), "zulip-git-version"
@@ -45,4 +45,4 @@ API_FEATURE_LEVEL = 62
 #   historical commits sharing the same major version, in which case a
 #   minor version bump suffices.
 
-PROVISION_VERSION = "142.0"
+PROVISION_VERSION = "141.3"

zerver/__init__.py

@@ -0,0 +1,2 @@
+# Load AppConfig app subclass by default on django applications initialization
+default_app_config = "zerver.apps.ZerverConfig"

zproject/computed_settings.py

@@ -315,8 +315,6 @@ elif REMOTE_POSTGRES_HOST != "":
 
 POSTGRESQL_MISSING_DICTIONARIES = bool(get_config("postgresql", "missing_dictionaries", None))
 
-DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
-
 ########################################################################
 # RABBITMQ CONFIGURATION
 ########################################################################