summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2026-03-18 12:06:04 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2026-03-18 12:34:33 +0100
commit99021ffc60cb67b5af7725069adf06fe2219d22d (patch)
treeeb08a2a6d2bcb4628e134995b730ef7f29e55243 /ishtar_common
parentd760e9f87fe040ab33dcdb942303d39fbf83a9c8 (diff)
downloadIshtar-99021ffc60cb67b5af7725069adf06fe2219d22d.tar.bz2
Ishtar-99021ffc60cb67b5af7725069adf06fe2219d22d.zip
🐛 fix naive datetime in migrations
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/migrations/0201_squashed.py10
-rw-r--r--ishtar_common/migrations/0218_auto_20220329_1121.py4
-rw-r--r--ishtar_common/migrations/0220_auto_20220707_1633.py12
-rw-r--r--ishtar_common/migrations/0224_auto_20230130_1838.py16
-rw-r--r--ishtar_common/migrations/0234_gdprlog_gdprperson.py4
-rw-r--r--ishtar_common/migrations/0236_auto_20240218_1726.py6
6 files changed, 26 insertions, 26 deletions
diff --git a/ishtar_common/migrations/0201_squashed.py b/ishtar_common/migrations/0201_squashed.py
index 6a21afd2f..c16ebf764 100644
--- a/ishtar_common/migrations/0201_squashed.py
+++ b/ishtar_common/migrations/0201_squashed.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.27 on 2020-01-23 18:21
-import datetime
from django.conf import settings
import django.contrib.gis.db.models.fields
import django.contrib.postgres.fields.jsonb
@@ -9,6 +8,7 @@ import django.contrib.postgres.search
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
+import django.utils.timezone
import ishtar_common.models
import ishtar_common.models_common
import re
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('state', models.CharField(choices=[('S', 'Scheduled'), ('P', 'In progress'), ('FE', 'Finished with errors'), ('F', 'Finished')], default='S', max_length=2, verbose_name='State')),
- ('creation_date', models.DateTimeField(default=datetime.datetime.now)),
+ ('creation_date', models.DateTimeField(default=django.utils.timezone.now)),
('launch_date', models.DateTimeField(blank=True, null=True)),
('finished_date', models.DateTimeField(blank=True, null=True)),
('result', models.TextField(blank=True, null=True, verbose_name='Result')),
@@ -254,7 +254,7 @@ class Migration(migrations.Migration):
('export_dir', models.BooleanField(default=True, verbose_name='Export directory')),
('export_docs', models.BooleanField(default=True, verbose_name='Export documents')),
('export_items', models.BooleanField(default=True, verbose_name='Export main items')),
- ('creation_date', models.DateTimeField(default=datetime.datetime.now)),
+ ('creation_date', models.DateTimeField(default=django.utils.timezone.now)),
('launch_date', models.DateTimeField(blank=True, null=True)),
('finished_date', models.DateTimeField(blank=True, null=True)),
('result', models.FileField(blank=True, null=True, upload_to='exports/%Y/%m/', verbose_name='Result')),
@@ -546,7 +546,7 @@ class Migration(migrations.Migration):
name='ImportTask',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('creation_date', models.DateTimeField(default=datetime.datetime.now)),
+ ('creation_date', models.DateTimeField(default=django.utils.timezone.now)),
('launch_date', models.DateTimeField(blank=True, null=True)),
('finished_date', models.DateTimeField(blank=True, null=True)),
('state', models.CharField(choices=[('C', 'Created'), ('S', 'Scheduled'), ('P', 'In progress'), ('FE', 'Finished with errors'), ('F', 'Finished')], default='C', max_length=2, verbose_name='State')),
@@ -949,7 +949,7 @@ class Migration(migrations.Migration):
('model', models.CharField(max_length=200, verbose_name='Model name')),
('model_pk', models.IntegerField(verbose_name='Associated primary key')),
('values', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={})),
- ('updated', models.DateTimeField(default=datetime.datetime.now)),
+ ('updated', models.DateTimeField(default=django.utils.timezone.now)),
('update_requested', models.DateTimeField(blank=True, null=True)),
],
options={
diff --git a/ishtar_common/migrations/0218_auto_20220329_1121.py b/ishtar_common/migrations/0218_auto_20220329_1121.py
index 01e5bfbcf..f9d9db852 100644
--- a/ishtar_common/migrations/0218_auto_20220329_1121.py
+++ b/ishtar_common/migrations/0218_auto_20220329_1121.py
@@ -1,9 +1,9 @@
# Generated by Django 2.2.24 on 2022-03-29 11:21
-import datetime
import django.contrib.postgres.fields
from django.db import migrations, models
import django.db.models.deletion
+import django.utils.timezone
class Migration(migrations.Migration):
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
('view', models.CharField(choices=[('generate-labels', 'Generate label')], max_length=100, verbose_name='View')),
('args', django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, null=True, size=None, verbose_name='Arguments')),
('state', models.CharField(choices=[('S', 'Scheduled'), ('P', 'In progress'), ('F', 'Finished')], default='S', max_length=2, verbose_name='State')),
- ('creation_date', models.DateTimeField(default=datetime.datetime.now)),
+ ('creation_date', models.DateTimeField(default=django.utils.timezone.now)),
('launch_date', models.DateTimeField(blank=True, null=True)),
('finished_date', models.DateTimeField(blank=True, null=True)),
('result', models.FileField(blank=True, null=True, upload_to='', verbose_name='Result')),
diff --git a/ishtar_common/migrations/0220_auto_20220707_1633.py b/ishtar_common/migrations/0220_auto_20220707_1633.py
index 48fca1a68..4620c2587 100644
--- a/ishtar_common/migrations/0220_auto_20220707_1633.py
+++ b/ishtar_common/migrations/0220_auto_20220707_1633.py
@@ -1,8 +1,8 @@
# Generated by Django 2.2.24 on 2022-07-07 16:33
-import datetime
from django.db import migrations, models
import django.db.models.deletion
+import django.utils.timezone
class Migration(migrations.Migration):
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='document',
name='last_modified',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.AlterField(
model_name='geovectordata',
@@ -44,21 +44,21 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='historicalorganization',
name='last_modified',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.AlterField(
model_name='historicalperson',
name='last_modified',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.AlterField(
model_name='organization',
name='last_modified',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.AlterField(
model_name='person',
name='last_modified',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
]
diff --git a/ishtar_common/migrations/0224_auto_20230130_1838.py b/ishtar_common/migrations/0224_auto_20230130_1838.py
index 749d48725..e0a3acebf 100644
--- a/ishtar_common/migrations/0224_auto_20230130_1838.py
+++ b/ishtar_common/migrations/0224_auto_20230130_1838.py
@@ -1,11 +1,11 @@
# Generated by Django 2.2.24 on 2023-01-30 18:38
-import datetime
from django.conf import settings
import django.contrib.postgres.fields.jsonb
import django.contrib.postgres.search
from django.db import migrations, models
import django.db.models.deletion
+import django.utils.timezone
import simple_history.models
@@ -25,17 +25,17 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='document',
name='created',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.AddField(
model_name='historicalorganization',
name='created',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.AddField(
model_name='historicalperson',
name='created',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.AddField(
model_name='ishtarsiteprofile',
@@ -90,12 +90,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='organization',
name='created',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.AddField(
model_name='person',
name='created',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
),
migrations.CreateModel(
name='HistoricalDocument',
@@ -103,8 +103,8 @@ class Migration(migrations.Migration):
('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
('search_vector', django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector')),
('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)),
- ('last_modified', models.DateTimeField(blank=True, default=datetime.datetime.now)),
- ('created', models.DateTimeField(blank=True, default=datetime.datetime.now)),
+ ('last_modified', models.DateTimeField(blank=True, default=django.utils.timezone.now)),
+ ('created', models.DateTimeField(blank=True, default=django.utils.timezone.now)),
('history_m2m', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)),
('need_update', models.BooleanField(default=False, verbose_name='Need update')),
('locked', models.BooleanField(default=False, verbose_name='Item locked for edition')),
diff --git a/ishtar_common/migrations/0234_gdprlog_gdprperson.py b/ishtar_common/migrations/0234_gdprlog_gdprperson.py
index 367303a21..9f38e2c31 100644
--- a/ishtar_common/migrations/0234_gdprlog_gdprperson.py
+++ b/ishtar_common/migrations/0234_gdprlog_gdprperson.py
@@ -1,9 +1,9 @@
# Generated by Django 2.2.24 on 2023-11-17 12:04
-import datetime
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
+import django.utils.timezone
class Migration(migrations.Migration):
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
name='GDPRLog',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('date', models.DateTimeField(default=datetime.datetime.now, verbose_name='Date')),
+ ('date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Date')),
('ip', models.GenericIPAddressField(blank=True, null=True, verbose_name='IP')),
('routable_ip', models.BooleanField(default=False, verbose_name='Routable IP')),
('activity', models.CharField(choices=[('DC', 'Directory consultation'), ('DE', 'Directory export'), ('PV', "Viewing a person's notice"), ('PE', "Exporting a person's notice"), ('PC', 'Person creation'), ('PM', 'Person modification'), ('PD', 'Person deletion')], max_length=2, verbose_name='Activity')),
diff --git a/ishtar_common/migrations/0236_auto_20240218_1726.py b/ishtar_common/migrations/0236_auto_20240218_1726.py
index 39bee4796..5dc25af78 100644
--- a/ishtar_common/migrations/0236_auto_20240218_1726.py
+++ b/ishtar_common/migrations/0236_auto_20240218_1726.py
@@ -1,12 +1,12 @@
# Generated by Django 2.2.24 on 2024-02-18 17:26
-import datetime
from django.conf import settings
import django.contrib.postgres.fields.jsonb
import django.contrib.postgres.search
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
+import django.utils.timezone
import ishtar_common.models
import ishtar_common.models_common
import re
@@ -109,8 +109,8 @@ class Migration(migrations.Migration):
('timestamp_geo', models.IntegerField(blank=True, null=True, verbose_name='Timestamp geo')),
('timestamp_label', models.IntegerField(blank=True, null=True, verbose_name='Timestamp label')),
('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)),
- ('last_modified', models.DateTimeField(blank=True, default=datetime.datetime.now)),
- ('created', models.DateTimeField(blank=True, default=datetime.datetime.now)),
+ ('last_modified', models.DateTimeField(blank=True, default=django.utils.timezone.now)),
+ ('created', models.DateTimeField(blank=True, default=django.utils.timezone.now)),
('history_m2m', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)),
('need_update', models.BooleanField(default=False, verbose_name='Need update')),
('locked', models.BooleanField(default=False, verbose_name='Item locked for edition')),