diff --git a/requirements/common.in b/requirements/common.in index b18b3cb597..af5cb3739c 100644 --- a/requirements/common.in +++ b/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 diff --git a/requirements/dev.txt b/requirements/dev.txt index e04e1b279d..b462254634 100644 --- a/requirements/dev.txt +++ b/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 \ - --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 diff --git a/requirements/prod.txt b/requirements/prod.txt index daea305c04..1ba4de9ac1 100644 --- a/requirements/prod.txt +++ b/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 \ - --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 diff --git a/tools/test-backend b/tools/test-backend index 3c0b8df982..233ec37cb5 100755 --- a/tools/test-backend +++ b/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", diff --git a/version.py b/version.py index b01c311854..5125daa3fe 100644 --- a/version.py +++ b/version.py @@ -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" diff --git a/zerver/__init__.py b/zerver/__init__.py index e69de29bb2..08e90b7a2a 100644 --- a/zerver/__init__.py +++ b/zerver/__init__.py @@ -0,0 +1,2 @@ +# Load AppConfig app subclass by default on django applications initialization +default_app_config = "zerver.apps.ZerverConfig" diff --git a/zproject/computed_settings.py b/zproject/computed_settings.py index d860911cb0..f4d881ad4f 100644 --- a/zproject/computed_settings.py +++ b/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 ########################################################################