Skip to content

Commit 68aa1d1

Browse files
authored
Merge pull request #27 from igorkramaric/django-5.0
Django 5.0
2 parents ad669f6 + 8af61ca commit 68aa1d1

5 files changed

Lines changed: 25 additions & 6 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "jsonate"
7-
version = "0.7.9"
7+
version = "0.7.10"
88
authors = [
99
{name = "James Robert"},
1010
{email = "jiaaro@gmail.com"}

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
psycopg[binary]==3.1.12
2-
django==4.2.6
3-
Pillow==9.0.1
2+
Django==5.0.6
3+
Pillow==10.3.0
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 5.0.6 on 2024-05-15 15:07
2+
3+
import datetime
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('test_app', '0008_alter_mymodel_null_field'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='mymodel',
16+
name='datetime_field',
17+
field=models.DateTimeField(default=datetime.datetime(2011, 1, 11, 11, 11, 11, tzinfo=datetime.timezone.utc)),
18+
),
19+
]

test_project/test_app/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from datetime import datetime, date
1+
from datetime import datetime, date, timezone
22
from decimal import Decimal
33

44
from django.db import models
@@ -13,7 +13,7 @@ class MyModel(models.Model):
1313

1414
sensitive_field1 = models.CharField(max_length=25, default='sensitive')
1515

16-
datetime_field = models.DateTimeField(default=datetime(2011, 1, 11, 11, 11, 11))
16+
datetime_field = models.DateTimeField(default=datetime(2011, 1, 11, 11, 11, 11, tzinfo=timezone.utc))
1717
date_field = models.DateField(default=date(2011, 1, 11))
1818

1919
decimal_field = models.DecimalField(max_digits=10, decimal_places=2, default=Decimal('32.25'))

test_project/test_app/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def test_basic_serialization(self):
146146
"null_field": None,
147147
"decimal_field": 32.25,
148148
"foreign_key": 1,
149-
"datetime_field": "2011-01-11T11:11:11",
149+
"datetime_field": "2011-01-11T11:11:11+00:00",
150150
"image_field": "images/image_file.wbm",
151151
"date_field": "2011-01-11",
152152
"id": 1,

0 commit comments

Comments
 (0)