paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "django: Upgrade Zulip to Django 3.2 LTS."

Browse Source 
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.
This commit is contained in:
Tim Abbott
2021-05-03 17:30:41 -07:00
parent a1f543f605
commit c9097bd7ae
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/common.in
View File

@@ -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

6
requirements/dev.txt
View File

@@ -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 \
--hash=sha256:0604e84c4fb698a5e53e5857b5aea945b2f19a18f25f10b8748dbdf935788927 \
--hash=sha256:21f0f9643722675976004eb683c55d33c05486f94506672df3d6a141546f389d
django[argon2]==3.1.8 \
--hash=sha256:c348b3ddc452bf4b62361f0752f71a339140c777ebea3cdaaaa8fdb7f417a862 \
--hash=sha256:f8393103e15ec2d2d313ccbb95a3f1da092f9f58d74ac1c61ca2ac0436ae1eac
# via
# -r requirements/common.in
# django-auth-ldap

6
requirements/prod.txt
View File

@@ -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 \
--hash=sha256:0604e84c4fb698a5e53e5857b5aea945b2f19a18f25f10b8748dbdf935788927 \
--hash=sha256:21f0f9643722675976004eb683c55d33c05486f94506672df3d6a141546f389d
django[argon2]==3.1.8 \
--hash=sha256:c348b3ddc452bf4b62361f0752f71a339140c777ebea3cdaaaa8fdb7f417a862 \
--hash=sha256:f8393103e15ec2d2d313ccbb95a3f1da092f9f58d74ac1c61ca2ac0436ae1eac
# via
# -r requirements/common.in
# django-auth-ldap

1
tools/test-backend
View File

@@ -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",

2
version.py
View File

@@ -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"

2
zerver/__init__.py
View File

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

2
zproject/computed_settings.py
View File

@@ -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
########################################################################