mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-08 14:23:18 +03:00
Merge a0fbdbd30e
into 3038494705
This commit is contained in:
commit
57dc3faca2
|
@ -5,3 +5,4 @@ pytest-django>=4.5.2,<5.0
|
||||||
importlib-metadata<5.0
|
importlib-metadata<5.0
|
||||||
# temporary pin of attrs
|
# temporary pin of attrs
|
||||||
attrs==22.1.0
|
attrs==22.1.0
|
||||||
|
pytz
|
||||||
|
|
|
@ -16,6 +16,7 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pytz = None
|
pytz = None
|
||||||
|
|
||||||
|
import django
|
||||||
from django.core.exceptions import ValidationError as DjangoValidationError
|
from django.core.exceptions import ValidationError as DjangoValidationError
|
||||||
from django.db.models import IntegerChoices, TextChoices
|
from django.db.models import IntegerChoices, TextChoices
|
||||||
from django.http import QueryDict
|
from django.http import QueryDict
|
||||||
|
@ -1624,7 +1625,10 @@ class TestCustomTimezoneForDateTimeField(TestCase):
|
||||||
assert rendered_date == rendered_date_in_timezone
|
assert rendered_date == rendered_date_in_timezone
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.skipif(pytz is None, reason="Django 5.0 has removed pytz; this test should eventually be able to get removed.")
|
@pytest.mark.skipif(
|
||||||
|
condition=django.VERSION >= (5,),
|
||||||
|
reason="Django 5.0 has removed pytz; this test should eventually be able to get removed.",
|
||||||
|
)
|
||||||
class TestPytzNaiveDayLightSavingTimeTimeZoneDateTimeField(FieldValues):
|
class TestPytzNaiveDayLightSavingTimeTimeZoneDateTimeField(FieldValues):
|
||||||
"""
|
"""
|
||||||
Invalid values for `DateTimeField` with datetime in DST shift (non-existing or ambiguous) and timezone with DST.
|
Invalid values for `DateTimeField` with datetime in DST shift (non-existing or ambiguous) and timezone with DST.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user