diff --git a/requirements/common.in b/requirements/common.in index da0c20c711..6b62bb5e26 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -6,7 +6,7 @@ -r pip.in # Django itself -https://github.com/django/django/archive/27c32cc9916502132a57cd2a60b1402869e00537.zip#egg=Django[argon2]==4.2.12.dev+git # https://code.djangoproject.com/ticket/35361 +https://github.com/django/django/archive/d36ecbd5306f98231c9f9cbfc78136052fde723a.zip#egg=Django[argon2]==5.0.5.dev+git # https://code.djangoproject.com/ticket/35361 asgiref<3.8.0 # Breaks with https://github.com/django/asgiref/pull/367 # needed for NotRequired, ParamSpec @@ -190,7 +190,7 @@ django-scim2 circuitbreaker # Runtime monkeypatching of django-stubs generics -django-stubs-ext +https://github.com/typeddjango/django-stubs/archive/e11955f05994e196dcee004811ce2e05ff230462.zip#egg=django-stubs-ext==5.0.0.dev1+git&subdirectory=ext # https://github.com/typeddjango/django-stubs/issues/1493 # Structured data representation with parsing. pydantic diff --git a/requirements/dev.txt b/requirements/dev.txt index 4b54a1985e..4b5a73e4ee 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -147,6 +147,7 @@ asgiref==3.7.2 \ # via # -r requirements/common.in # django + # django-stubs asttokens==2.4.1 \ --hash=sha256:051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24 \ --hash=sha256:b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0 @@ -602,8 +603,8 @@ distro==1.9.0 \ --hash=sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed \ --hash=sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2 # via zulip -https://github.com/django/django/archive/27c32cc9916502132a57cd2a60b1402869e00537.zip#egg=Django[argon2]==4.2.12.dev+git \ - --hash=sha256:0a0bbbf1cb1aac3ad852a2947a9f9b63b2bd3eff1f9489c05ec838badb36ad9a +https://github.com/django/django/archive/d36ecbd5306f98231c9f9cbfc78136052fde723a.zip#egg=Django[argon2]==5.0.5.dev+git \ + --hash=sha256:9a5cdd46a35c332e254fe9ebd719217ce782f46ac92c4b5444f0ddfaca2e847b # via # -r requirements/common.in # django-auth-ldap @@ -646,13 +647,11 @@ django-scim2==0.19.1 \ --hash=sha256:8126111160e76a880f6699babc5259f0345c9316c8018ce5dcc3f7579ccb9e89 \ --hash=sha256:845eaa64e72e4ddfe2aa54d21865721f8c1d59ecd9c06e72341eeb03ed6ba94e # via -r requirements/common.in -django-stubs==4.2.7 \ - --hash=sha256:4cf4de258fa71adc6f2799e983091b9d46cfc67c6eebc68fe111218c9a62b3b8 \ - --hash=sha256:8ccd2ff4ee5adf22b9e3b7b1a516d2e1c2191e9d94e672c35cc2bc3dd61e0f6b +https://github.com/typeddjango/django-stubs/archive/e11955f05994e196dcee004811ce2e05ff230462.zip#egg=django-stubs==5.0.0.dev1+git \ + --hash=sha256:44ffd1e917b2b606b7efcfedd1d8123931d61ed54c39d98da17c75471bfa40e8 # via -r requirements/mypy.in -django-stubs-ext==4.2.7 \ - --hash=sha256:45a5d102417a412e3606e3c358adb4744988a92b7b58ccf3fd64bddd5d04d14c \ - --hash=sha256:519342ac0849cda1559746c9a563f03ff99f636b0ebe7c14b75e816a00dfddc3 +https://github.com/typeddjango/django-stubs/archive/e11955f05994e196dcee004811ce2e05ff230462.zip#egg=django-stubs-ext==5.0.0.dev1+git&subdirectory=ext \ + --hash=sha256:44ffd1e917b2b606b7efcfedd1d8123931d61ed54c39d98da17c75471bfa40e8 # via # -r requirements/common.in # django-stubs @@ -3206,10 +3205,6 @@ types-python-dateutil==2.9.0.20240316 \ # via # -r requirements/mypy.in # arrow -types-pytz==2024.1.0.20240203 \ - --hash=sha256:9679eef0365db3af91ef7722c199dbb75ee5c1b67e3c4dd7bfbeb1b8a71c21a3 \ - --hash=sha256:c93751ee20dfc6e054a0148f8f5227b9a00b79c90a4d3c9f464711a73179c89e - # via django-stubs types-pyyaml==6.0.12.20240311 \ --hash=sha256:a9e0f0f88dc835739b0c1ca51ee90d04ca2a897a71af79de9aec5f38cb0a5342 \ --hash=sha256:b845b06a1c7e54b8e5b4c683043de0d9caf205e7434b3edc678ff2411979b8f6 diff --git a/requirements/mypy.in b/requirements/mypy.in index b6a1a7189b..b3298a2d59 100644 --- a/requirements/mypy.in +++ b/requirements/mypy.in @@ -26,4 +26,4 @@ types-regex types-requests types-zxcvbn -django-stubs +https://github.com/typeddjango/django-stubs/archive/e11955f05994e196dcee004811ce2e05ff230462.zip#egg=django-stubs==5.0.0.dev1+git # https://github.com/typeddjango/django-stubs/issues/1493 diff --git a/requirements/prod.txt b/requirements/prod.txt index 1382feaa42..1ac90944fb 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -426,8 +426,8 @@ distro==1.9.0 \ --hash=sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed \ --hash=sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2 # via zulip -https://github.com/django/django/archive/27c32cc9916502132a57cd2a60b1402869e00537.zip#egg=Django[argon2]==4.2.12.dev+git \ - --hash=sha256:0a0bbbf1cb1aac3ad852a2947a9f9b63b2bd3eff1f9489c05ec838badb36ad9a +https://github.com/django/django/archive/d36ecbd5306f98231c9f9cbfc78136052fde723a.zip#egg=Django[argon2]==5.0.5.dev+git \ + --hash=sha256:9a5cdd46a35c332e254fe9ebd719217ce782f46ac92c4b5444f0ddfaca2e847b # via # -r requirements/common.in # django-auth-ldap @@ -469,9 +469,8 @@ django-scim2==0.19.1 \ --hash=sha256:8126111160e76a880f6699babc5259f0345c9316c8018ce5dcc3f7579ccb9e89 \ --hash=sha256:845eaa64e72e4ddfe2aa54d21865721f8c1d59ecd9c06e72341eeb03ed6ba94e # via -r requirements/common.in -django-stubs-ext==4.2.7 \ - --hash=sha256:45a5d102417a412e3606e3c358adb4744988a92b7b58ccf3fd64bddd5d04d14c \ - --hash=sha256:519342ac0849cda1559746c9a563f03ff99f636b0ebe7c14b75e816a00dfddc3 +https://github.com/typeddjango/django-stubs/archive/e11955f05994e196dcee004811ce2e05ff230462.zip#egg=django-stubs-ext==5.0.0.dev1+git&subdirectory=ext \ + --hash=sha256:44ffd1e917b2b606b7efcfedd1d8123931d61ed54c39d98da17c75471bfa40e8 # via -r requirements/common.in django-two-factor-auth[call,phonenumberslite,sms]==1.16.0 \ --hash=sha256:662782a4ab9f59a06afe3be04540dc8dd04e63b06f52520386a546fcad8d2d41 \ diff --git a/version.py b/version.py index 56870ac30f..48bf1d68d1 100644 --- a/version.py +++ b/version.py @@ -48,4 +48,4 @@ API_FEATURE_LEVEL = 253 # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = (267, 2) # last bumped 2024-04-10 for Python requirements upgrade +PROVISION_VERSION = (268, 0) # last bumped 2024-04-17 for Django upgrade diff --git a/zerver/lib/test_runner.py b/zerver/lib/test_runner.py index 3bd84da3f3..6aff6b6ccb 100644 --- a/zerver/lib/test_runner.py +++ b/zerver/lib/test_runner.py @@ -186,6 +186,7 @@ def init_worker( process_setup: Optional[Callable[..., None]] = None, process_setup_args: Optional[Tuple[Any, ...]] = None, debug_mode: Optional[bool] = None, + used_aliases: Optional[Set[str]] = None, ) -> None: """ This function runs only under parallel mode. It initializes the @@ -359,14 +360,13 @@ class Runner(DiscoverRunner): def run_tests( self, test_labels: List[str], - extra_tests: Optional[List[unittest.TestCase]] = None, failed_tests_path: Optional[str] = None, full_suite: bool = False, include_webhooks: bool = False, **kwargs: Any, ) -> int: self.setup_test_environment() - suite = self.build_suite(test_labels, extra_tests) + suite = self.build_suite(test_labels) self.test_imports(test_labels, suite) if self.parallel == 1: # We are running in serial mode so create the databases here. diff --git a/zproject/computed_settings.py b/zproject/computed_settings.py index 13111e7f01..4aba17d188 100644 --- a/zproject/computed_settings.py +++ b/zproject/computed_settings.py @@ -144,9 +144,6 @@ LANGUAGE_CODE = "en-us" # to load the internationalization machinery. USE_I18N = True -# If you set this to False, Django will not use time-zone-aware datetimes. -USE_TZ = True - # this directory will be used to store logs for development environment DEVELOPMENT_LOG_DIRECTORY = os.path.join(DEPLOY_ROOT, "var", "log")