Remove virtualtime - adapt requirements for buster

10 files changed, 18 insertions, 47 deletions

diff --git a/ishtar_common/apps.py b/ishtar_common/apps.py
index 41dce9300..f60f83724 100644
--- a/ishtar_common/apps.py
+++ b/ishtar_common/apps.py
@@ -4,8 +4,6 @@ from django.apps import AppConfig
 from django.contrib.admin import AdminSite
 from django.utils.translation import ugettext_lazy as _
 
-import virtualtime
-
 
 class IshtarAdminSite(AdminSite):
     site_header = _('Ishtar administration')
@@ -48,6 +46,3 @@ class ArchaeologicalWarehouseConfig(AppConfig):
 class IshtarCommonConfig(AppConfig):
     name = 'ishtar_common'
     verbose_name = _("Ishtar - Common")
-
-    def ready(self):
-        virtualtime.enable()
diff --git a/ishtar_common/management/commands/makemigrations.py b/ishtar_common/management/commands/makemigrations.py
deleted file mode 100644
index 15309b0d2..000000000
--- a/ishtar_common/management/commands/makemigrations.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from datetime import datetime
-
-from django.core.management.commands.makemigrations import Command
-from django.db import models
-
-
-original_deconstruct = models.Field.deconstruct
-
-
-def new_deconstruct(self):
-    """
-    virtualtime can induce bad signature for "now" function replace it
-    explicitly
-    """
-    name, path, args, kwargs = original_deconstruct(self)
-    if 'default' in kwargs and callable(kwargs['default']) and \
-            kwargs['default'].__name__ == 'now':
-        kwargs['default'] = datetime.now
-    return name, path, args, kwargs
-
-
-models.Field.deconstruct = new_deconstruct
-
diff --git a/ishtar_common/migrations/0031_auto_20180228_1741.py b/ishtar_common/migrations/0031_auto_20180228_1741.py
index 6f5f381f2..a62d9523c 100644
--- a/ishtar_common/migrations/0031_auto_20180228_1741.py
+++ b/ishtar_common/migrations/0031_auto_20180228_1741.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import virtualtime
+import datetime
 
 
 class Migration(migrations.Migration):
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='administrationtask',
             name='creation_date',
-            field=models.DateTimeField(default=virtualtime.datetime.now),
+            field=models.DateTimeField(default=datetime.datetime.now),
         ),
     ]
diff --git a/ishtar_common/migrations/0032_auto_20180303_1159.py b/ishtar_common/migrations/0032_auto_20180303_1159.py
index b74073462..53c5d7fa2 100644
--- a/ishtar_common/migrations/0032_auto_20180303_1159.py
+++ b/ishtar_common/migrations/0032_auto_20180303_1159.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import virtualtime
+import datetime
 
 
 class Migration(migrations.Migration):
@@ -21,6 +21,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='administrationtask',
             name='creation_date',
-            field=models.DateTimeField(default=virtualtime.datetime.now),
+            field=models.DateTimeField(default=datetime.datetime.now),
         ),
     ]
diff --git a/ishtar_common/migrations/0033_auto_20180306_1054.py b/ishtar_common/migrations/0033_auto_20180306_1054.py
index e339c8250..5f198e26d 100644
--- a/ishtar_common/migrations/0033_auto_20180306_1054.py
+++ b/ishtar_common/migrations/0033_auto_20180306_1054.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import virtualtime
+import datetime
 
 
 class Migration(migrations.Migration):
@@ -21,6 +21,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='administrationtask',
             name='creation_date',
-            field=models.DateTimeField(default=virtualtime.datetime.now),
+            field=models.DateTimeField(default=datetime.datetime.now),
         ),
     ]
diff --git a/ishtar_common/migrations/0073_auto_20181017_1642.py b/ishtar_common/migrations/0073_auto_20181017_1642.py
index 42e905b2c..1b91efd0d 100644
--- a/ishtar_common/migrations/0073_auto_20181017_1642.py
+++ b/ishtar_common/migrations/0073_auto_20181017_1642.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import virtualtime
+import datetime
 
 from ishtar_common.utils_migrations import reinit_last_modified
 
@@ -23,22 +23,22 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='historicalorganization',
             name='last_modified',
-            field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+            field=models.DateTimeField(default=datetime.datetime.now),
         ),
         migrations.AddField(
             model_name='historicalperson',
             name='last_modified',
-            field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+            field=models.DateTimeField(default=datetime.datetime.now),
         ),
         migrations.AddField(
             model_name='organization',
             name='last_modified',
-            field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+            field=models.DateTimeField(default=datetime.datetime.now),
         ),
         migrations.AddField(
             model_name='person',
             name='last_modified',
-            field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+            field=models.DateTimeField(default=datetime.datetime.now),
         ),
         migrations.RunPython(migrate_codes)
     ]
diff --git a/ishtar_common/migrations/0092_auto_20190327_1854.py b/ishtar_common/migrations/0092_auto_20190327_1854.py
index 69c6a9e56..6e49d9865 100644
--- a/ishtar_common/migrations/0092_auto_20190327_1854.py
+++ b/ishtar_common/migrations/0092_auto_20190327_1854.py
@@ -6,7 +6,7 @@ import django.contrib.gis.db.models.fields
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
 import django.db.models.deletion
-import virtualtime
+import datetime
 
 
 class Migration(migrations.Migration):
@@ -23,7 +23,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=virtualtime.virtual_datetime.now)),
+                ('updated', models.DateTimeField(default=datetime.datetime.now)),
                 ('update_requested', models.DateTimeField(blank=True, null=True)),
             ],
             options={
diff --git a/ishtar_common/migrations/0101_auto_20190908_1345.py b/ishtar_common/migrations/0101_auto_20190908_1345.py
index 4ff843d7e..091cf1399 100644
--- a/ishtar_common/migrations/0101_auto_20190908_1345.py
+++ b/ishtar_common/migrations/0101_auto_20190908_1345.py
@@ -9,7 +9,7 @@ import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 import re
-import virtualtime
+import datetime
 
 
 class Migration(migrations.Migration):
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
                 ('filter_text', models.TextField(blank=True, help_text='Textual query on this item (try it on the main interface)', null=True, verbose_name='Filter query')),
                 ('geo', models.BooleanField(default=True, help_text='Geographic data can represent large volume of information. Geographic data can be excluded from the export', verbose_name='Export geographic data')),
                 ('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')),
-                ('creation_date', models.DateTimeField(default=virtualtime.virtual_datetime.now)),
+                ('creation_date', models.DateTimeField(default=datetime.datetime.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', verbose_name='Result')),
diff --git a/ishtar_common/migrations/0102_auto_20190909_1300.py b/ishtar_common/migrations/0102_auto_20190909_1300.py
index 6016cac7f..e88570695 100644
--- a/ishtar_common/migrations/0102_auto_20190909_1300.py
+++ b/ishtar_common/migrations/0102_auto_20190909_1300.py
@@ -9,7 +9,7 @@ import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 import re
-import virtualtime
+import datetime
 
 
 class Migration(migrations.Migration):
@@ -23,7 +23,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=virtualtime.virtual_datetime.now)),
+                ('creation_date', models.DateTimeField(default=datetime.datetime.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')),
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index aa9a39965..5c6b2b3c5 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -5,7 +5,6 @@ from collections import OrderedDict
 from copy import copy, deepcopy
 import csv
 import datetime
-import virtualtime
 import json
 import logging
 import re
@@ -812,7 +811,7 @@ def _manage_dated_fields(dated_fields, dct):
             dct.pop(k)
             return
         try:
-            dct[k] = virtualtime.datetime(
+            dct[k] = datetime.datetime(
                 *map(lambda x: int(x), items)).strftime('%Y-%m-%d')
         except ValueError:
             dct.pop(k)