paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 03:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ruff: Fix UP036 Version block is outdated for minimum Python version.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-04-01 15:29:38 -07:00
committed by Tim Abbott
parent a82a3eb4d7
commit 6e871e7731
7 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib/zulip_tools.py
View File

@@ -19,6 +19,8 @@ from datetime import datetime, timedelta
from typing import IO, Any, Dict, List, Optional, Sequence, Set, Union, overload from typing import IO, Any, Dict, List, Optional, Sequence, Set, Union, overload
from urllib.parse import SplitResult from urllib.parse import SplitResult
import zoneinfo
DEPLOYMENTS_DIR = "/home/zulip/deployments" DEPLOYMENTS_DIR = "/home/zulip/deployments"
LOCK_DIR = os.path.join(DEPLOYMENTS_DIR, "lock") LOCK_DIR = os.path.join(DEPLOYMENTS_DIR, "lock")
TIMESTAMP_FORMAT = "%Y-%m-%d-%H-%M-%S" TIMESTAMP_FORMAT = "%Y-%m-%d-%H-%M-%S"
@@ -470,11 +472,6 @@ def os_families() -> Set[str]:
def get_tzdata_zi() -> IO[str]: def get_tzdata_zi() -> IO[str]:
if sys.version_info < (3, 9): # nocoverage
from backports import zoneinfo
else: # nocoverage
import zoneinfo
for path in zoneinfo.TZPATH: for path in zoneinfo.TZPATH:
filename = os.path.join(path, "tzdata.zi") filename = os.path.join(path, "tzdata.zi")
if os.path.exists(filename): if os.path.exists(filename):

3
tools/setup/build_timezone_values
View File

@@ -3,9 +3,6 @@ import json
import os import os
import sys import sys
if sys.version_info < (3, 9):
from backports import zoneinfo
else:
import zoneinfo import zoneinfo
ZULIP_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../") ZULIP_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../")

6
zerver/lib/email_notifications.py
View File

@@ -12,6 +12,7 @@ from email.headerregistry import Address
from typing import Any, Dict, List, Optional, Tuple, Union from typing import Any, Dict, List, Optional, Tuple, Union
import lxml.html import lxml.html
import zoneinfo
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from django.conf import settings from django.conf import settings
from django.contrib.auth import get_backends from django.contrib.auth import get_backends
@@ -42,11 +43,6 @@ from zerver.models.messages import get_context_for_message
from zerver.models.scheduled_jobs import NotificationTriggers from zerver.models.scheduled_jobs import NotificationTriggers
from zerver.models.users import get_user_profile_by_id from zerver.models.users import get_user_profile_by_id
if sys.version_info < (3, 9): # nocoverage
from backports import zoneinfo
else: # nocoverage
import zoneinfo
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

7
zerver/lib/validator.py
View File

@@ -29,7 +29,6 @@ for any particular type of object.
""" """
import re import re
import sys
from dataclasses import dataclass from dataclasses import dataclass
from datetime import datetime, timezone from datetime import datetime, timezone
from decimal import Decimal from decimal import Decimal
@@ -52,6 +51,7 @@ from typing import (
) )
import orjson import orjson
import zoneinfo
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.validators import URLValidator, validate_email from django.core.validators import URLValidator, validate_email
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
@@ -63,11 +63,6 @@ from zerver.lib.exceptions import InvalidJSONError, JsonableError
from zerver.lib.timezone import canonicalize_timezone from zerver.lib.timezone import canonicalize_timezone
from zerver.lib.types import ProfileFieldData, Validator from zerver.lib.types import ProfileFieldData, Validator
if sys.version_info < (3, 9): # nocoverage
from backports import zoneinfo
else: # nocoverage
import zoneinfo
ResultT = TypeVar("ResultT") ResultT = TypeVar("ResultT")

7
zerver/signals.py
View File

@@ -1,6 +1,6 @@
import sys
from typing import Any, Optional from typing import Any, Optional
import zoneinfo
from django.conf import settings from django.conf import settings
from django.contrib.auth.signals import user_logged_in, user_logged_out from django.contrib.auth.signals import user_logged_in, user_logged_out
from django.dispatch import receiver from django.dispatch import receiver
@@ -14,11 +14,6 @@ from zerver.lib.send_email import FromAddress
from zerver.lib.timezone import canonicalize_timezone from zerver.lib.timezone import canonicalize_timezone
from zerver.models import UserProfile from zerver.models import UserProfile
if sys.version_info < (3, 9): # nocoverage
from backports import zoneinfo
else: # nocoverage
import zoneinfo
JUST_CREATED_THRESHOLD = 60 JUST_CREATED_THRESHOLD = 60

7
zerver/tests/test_new_users.py
View File

@@ -1,8 +1,8 @@
import sys
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from typing import Sequence from typing import Sequence
import time_machine import time_machine
import zoneinfo
from django.conf import settings from django.conf import settings
from django.core import mail from django.core import mail
from django.test import override_settings from django.test import override_settings
@@ -18,11 +18,6 @@ from zerver.models import Message, Realm, Recipient, Stream, UserProfile
from zerver.models.realms import get_realm from zerver.models.realms import get_realm
from zerver.signals import JUST_CREATED_THRESHOLD, get_device_browser, get_device_os from zerver.signals import JUST_CREATED_THRESHOLD, get_device_browser, get_device_os
if sys.version_info < (3, 9): # nocoverage
from backports import zoneinfo
else: # nocoverage
import zoneinfo
class SendLoginEmailTest(ZulipTestCase): class SendLoginEmailTest(ZulipTestCase):
""" """

7
zerver/tests/test_timezone.py
View File

@@ -1,16 +1,11 @@
import sys
from datetime import datetime, timezone from datetime import datetime, timezone
import zoneinfo
from django.utils.timezone import now as timezone_now from django.utils.timezone import now as timezone_now
from zerver.lib.test_classes import ZulipTestCase from zerver.lib.test_classes import ZulipTestCase
from zerver.lib.timezone import canonicalize_timezone, common_timezones from zerver.lib.timezone import canonicalize_timezone, common_timezones
if sys.version_info < (3, 9): # nocoverage
from backports import zoneinfo
else: # nocoverage
import zoneinfo
class TimeZoneTest(ZulipTestCase): class TimeZoneTest(ZulipTestCase):
def test_canonicalize_timezone(self) -> None: def test_canonicalize_timezone(self) -> None: