summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-01-22 19:04:22 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2020-07-01 18:01:58 +0200
commit71fd406a6552304d11fcaad373c9ee326222d31e (patch)
tree4269104e125f7c01dd52fb8d817963dcdc72b8a4
parentfefdb198e0b75ddfe1510d2d6ee9a44917ade3c1 (diff)
downloadIshtar-71fd406a6552304d11fcaad373c9ee326222d31e.tar.bz2
Ishtar-71fd406a6552304d11fcaad373c9ee326222d31e.zip
Remove virtualtime - adapt requirements for buster
-rw-r--r--archaeological_context_records/migrations/0031_auto_20181017_1642.py6
-rw-r--r--archaeological_files/migrations/0014_auto_20181017_1642.py6
-rw-r--r--archaeological_finds/migrations/0017_auto_20180228_1741.py4
-rw-r--r--archaeological_finds/migrations/0018_auto_20180303_0812.py4
-rw-r--r--archaeological_finds/migrations/0035_auto_20181017_1642.py20
-rw-r--r--archaeological_finds/migrations/0039_auto_20181115_1649.py6
-rw-r--r--archaeological_operations/migrations/0019_auto_20180228_1741.py6
-rw-r--r--archaeological_operations/migrations/0020_auto_20180303_1159.py6
-rw-r--r--archaeological_operations/migrations/0038_auto_20181017_1642.py18
-rw-r--r--archaeological_warehouse/migrations/0014_auto_20180228_1741.py6
-rw-r--r--archaeological_warehouse/migrations/0023_auto_20181017_1642.py8
-rwxr-xr-xinstall/ishtar-install78
-rw-r--r--ishtar_common/apps.py5
-rw-r--r--ishtar_common/management/commands/makemigrations.py23
-rw-r--r--ishtar_common/migrations/0031_auto_20180228_1741.py4
-rw-r--r--ishtar_common/migrations/0032_auto_20180303_1159.py4
-rw-r--r--ishtar_common/migrations/0033_auto_20180306_1054.py4
-rw-r--r--ishtar_common/migrations/0073_auto_20181017_1642.py10
-rw-r--r--ishtar_common/migrations/0092_auto_20190327_1854.py4
-rw-r--r--ishtar_common/migrations/0101_auto_20190908_1345.py4
-rw-r--r--ishtar_common/migrations/0102_auto_20190909_1300.py4
-rw-r--r--ishtar_common/views_item.py3
-rw-r--r--requirements.txt32
23 files changed, 154 insertions, 111 deletions
diff --git a/archaeological_context_records/migrations/0031_auto_20181017_1642.py b/archaeological_context_records/migrations/0031_auto_20181017_1642.py
index 4ba07813b..cc597d990 100644
--- a/archaeological_context_records/migrations/0031_auto_20181017_1642.py
+++ b/archaeological_context_records/migrations/0031_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
@@ -25,12 +25,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='contextrecord',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicalcontextrecord',
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/archaeological_files/migrations/0014_auto_20181017_1642.py b/archaeological_files/migrations/0014_auto_20181017_1642.py
index a5868c692..fc341256e 100644
--- a/archaeological_files/migrations/0014_auto_20181017_1642.py
+++ b/archaeological_files/migrations/0014_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
@@ -25,12 +25,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='file',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicalfile',
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/archaeological_finds/migrations/0017_auto_20180228_1741.py b/archaeological_finds/migrations/0017_auto_20180228_1741.py
index f33e067a1..2d7fe1e53 100644
--- a/archaeological_finds/migrations/0017_auto_20180228_1741.py
+++ b/archaeological_finds/migrations/0017_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):
@@ -76,6 +76,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='property',
name='history_date',
- field=models.DateTimeField(default=virtualtime.datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
]
diff --git a/archaeological_finds/migrations/0018_auto_20180303_0812.py b/archaeological_finds/migrations/0018_auto_20180303_0812.py
index 92f0287b6..8d0a271ce 100644
--- a/archaeological_finds/migrations/0018_auto_20180303_0812.py
+++ b/archaeological_finds/migrations/0018_auto_20180303_0812.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
from django.db import migrations, models
-import virtualtime
+import datetime
class Migration(migrations.Migration):
@@ -26,6 +26,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='property',
name='history_date',
- field=models.DateTimeField(default=virtualtime.datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
]
diff --git a/archaeological_finds/migrations/0035_auto_20181017_1642.py b/archaeological_finds/migrations/0035_auto_20181017_1642.py
index d8515bdb5..13796fd4f 100644
--- a/archaeological_finds/migrations/0035_auto_20181017_1642.py
+++ b/archaeological_finds/migrations/0035_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
@@ -26,47 +26,47 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='basefind',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='find',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicalbasefind',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicalfind',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicaltreatment',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicaltreatmentfile',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='property',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='treatment',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='treatmentfile',
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/archaeological_finds/migrations/0039_auto_20181115_1649.py b/archaeological_finds/migrations/0039_auto_20181115_1649.py
index 3752c173c..05c065c7f 100644
--- a/archaeological_finds/migrations/0039_auto_20181115_1649.py
+++ b/archaeological_finds/migrations/0039_auto_20181115_1649.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,12 +16,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='historicaltreatment',
name='creation_date',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='treatment',
name='creation_date',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='treatment',
diff --git a/archaeological_operations/migrations/0019_auto_20180228_1741.py b/archaeological_operations/migrations/0019_auto_20180228_1741.py
index d862ada2e..97f619e8c 100644
--- a/archaeological_operations/migrations/0019_auto_20180228_1741.py
+++ b/archaeological_operations/migrations/0019_auto_20180228_1741.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
-import virtualtime
+import datetime
class Migration(migrations.Migration):
@@ -22,11 +22,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='parcel',
name='history_date',
- field=models.DateTimeField(default=virtualtime.datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AlterField(
model_name='parcelowner',
name='history_date',
- field=models.DateTimeField(default=virtualtime.datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
]
diff --git a/archaeological_operations/migrations/0020_auto_20180303_1159.py b/archaeological_operations/migrations/0020_auto_20180303_1159.py
index 9c5112cb2..73e47199b 100644
--- a/archaeological_operations/migrations/0020_auto_20180303_1159.py
+++ b/archaeological_operations/migrations/0020_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):
@@ -41,11 +41,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='parcel',
name='history_date',
- field=models.DateTimeField(default=virtualtime.datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AlterField(
model_name='parcelowner',
name='history_date',
- field=models.DateTimeField(default=virtualtime.datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
]
diff --git a/archaeological_operations/migrations/0038_auto_20181017_1642.py b/archaeological_operations/migrations/0038_auto_20181017_1642.py
index 88a4e4e7f..7a72fa41c 100644
--- a/archaeological_operations/migrations/0038_auto_20181017_1642.py
+++ b/archaeological_operations/migrations/0038_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
@@ -26,42 +26,42 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='administrativeact',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='archaeologicalsite',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicaladministrativeact',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicalarchaeologicalsite',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='historicaloperation',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='operation',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='parcel',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='parcelowner',
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/archaeological_warehouse/migrations/0014_auto_20180228_1741.py b/archaeological_warehouse/migrations/0014_auto_20180228_1741.py
index 63e0770da..446cb083f 100644
--- a/archaeological_warehouse/migrations/0014_auto_20180228_1741.py
+++ b/archaeological_warehouse/migrations/0014_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,11 +16,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='collection',
name='history_date',
- field=models.DateTimeField(default=virtualtime.datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AlterField(
model_name='container',
name='history_date',
- field=models.DateTimeField(default=virtualtime.datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
]
diff --git a/archaeological_warehouse/migrations/0023_auto_20181017_1642.py b/archaeological_warehouse/migrations/0023_auto_20181017_1642.py
index 340b1911e..c188453e7 100644
--- a/archaeological_warehouse/migrations/0023_auto_20181017_1642.py
+++ b/archaeological_warehouse/migrations/0023_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
@@ -25,17 +25,17 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='collection',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='container',
name='last_modified',
- field=models.DateTimeField(default=virtualtime.virtual_datetime.now),
+ field=models.DateTimeField(default=datetime.datetime.now),
),
migrations.AddField(
model_name='warehouse',
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/install/ishtar-install b/install/ishtar-install
index 119dab2ad..26cd71cb0 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -424,6 +424,80 @@ EOF
( set -x; $sh_c 'sleep 3; apt-get install -y -q uwsgi uwsgi-plugin-python3 nginx' )
fi
+ if [ "$dist_version" == "buster" ]; then
+ if [ "$default_db" == '127.0.0.1' ]; then
+ echo "-------------------------------------------------------------------------------";
+ cecho y "Installing postgresql"
+ echo ""
+ POSTGIS=postgresql-11-postgis-2.5
+ ( set -x; $sh_c 'sleep 3; apt-get install -y -q postgresql postgresql-contrib '$POSTGIS' '$POSTGIS'-scripts postgresql-contrib-9.6' )
+ fi
+ echo "-------------------------------------------------------------------------------";
+ cecho y "Installing Ishtar dependencies"
+ echo "";
+
+ if [ "$lsb_dist" == 'debian' ]; then
+ ( set -x; $sh_c 'sleep 3; apt-get install -y -q \
+ python3-django python3-psycopg2 \
+ python3-django-registration \
+ python3-pil \
+ python3-xmltodict python3-requests \
+ python3-pyqrcode python3-png \
+ python3-gdal \
+ python3-memcache \
+ python3-djangorestframework \
+ python3-tidylib \
+ python3-lxml \
+ python3-django-extra-views \
+ python3-bs4 \
+ python3-markdown \
+ python3-ajax-select \
+ python3-django-compressor \
+ python3-django-formtools \
+ python3-unidecode \
+ python3-django-extensions \
+ python3-html5lib python3-pdfrw \ # weasyprint
+ python3-cairosvg \ # weasyprint
+ python3-cairocffi python3-cffi libpangocairo-1.0-0 \ # weasyprint
+ python3-cssselect2 python3-tinycss2 \ # weasyprint
+ python3-pyphen python3-defusedxml \ # weasyprint
+ python3-markdown2 python3-jinja2 \ secretary
+ gettext memcached graphviz pandoc' )
+ # python3-reportlab ?
+ fi
+
+ if [ "$install_libreoffice" == 'yes' ]; then
+ ( set -x; $sh_c 'sleep 3; apt-get --no-install-recommends install -y -q \
+ libreoffice libreoffice-script-provider-python python3-uno' )
+ cp "install/libreoffice.service" "/etc/systemd/system/libreoffice.service"
+ systemctl daemon-reload
+ systemctl enable libreoffice
+ systemctl start libreoffice
+ fi
+
+ if [ "$install_celery" == 'yes' ]; then
+ ( set -x; $sh_c 'sleep 3; apt-get --no-install-recommends install -y -q \
+ rabbitmq-server' )
+ ( set -x; $sh_c 'sleep 3; apt-get install -y -q python3-celery' )
+ mkdir -p /var/log/celery/
+ mkdir -p /var/run/celery/
+ chown www-data:www-data /var/log/celery/ /var/run/celery/
+ mkdir -p /etc/monit/conf-available/
+ fi
+
+ echo "-------------------------------------------------------------------------------";
+ cecho y "Installing django-simple-history"
+ echo "";
+ ( set -x; $sh_c 'pip3 install git+https://github.com/treyhunner/django-simple-history.git@1.8.2#egg=django-simple-history' )
+ echo "-------------------------------------------------------------------------------";
+ cecho y "Installing python3-secretary"
+ echo "";
+ ( set -x; $sh_c 'pip3 install secretary==0.2.19' )
+ cecho y "Installing weasyprint"
+ echo "";
+ ( set -x; $sh_c 'pip3 install WeasyPrint==0.42.3' )
+ fi
+
if [ "$dist_version" == "stretch" ]; then
if [ "$lsb_dist" == 'debian' ]; then
@@ -458,7 +532,7 @@ EOF
python3-xmltodict python3-djangorestframework \
python3-tidylib python3-lxml python3-pil python3-html5lib \
python3-psycopg2 python3-gdal gettext memcached graphviz \
- python3-memcache python3-dbf python3-markdown \
+ python3-memcache python3-markdown \
python3-reportlab python3-django-extensions python3-unidecode' )
fi
if [ "$lsb_dist" == 'raspbian' ]; then
@@ -473,7 +547,7 @@ EOF
python3-xmltodict python3-djangorestframework \
python3-tidylib python3-lxml python3-imaging python3-html5lib \
python3-psycopg2 python3-gdal gettext memcached \
- python3-memcache python3-dbf python3-markdown \
+ python3-memcache python3-markdown \
python3-reportlab python3-unidecode' )
fi
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)
diff --git a/requirements.txt b/requirements.txt
index 7bd55e33a..5817dc1a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,37 +1,35 @@
six>=1.9
-psycopg2==2.5.4
+psycopg2==2.7.7
django-registration==2.2
-django==1.11.18
-Pillow==3.4.2
-WeasyPrint==0.41
-html5lib==0.999999999
+django==1.11.27
+Pillow==5.4.1
+WeasyPrint==0.42.3
+html5lib==1.0.1
pyqrcode==1.2.1
pypng==0.0.19
-xmltodict==0.10
+xmltodict==0.11
-requests==2.12
+requests==2.21
-dbf==0.96.003
-python-memcached==1.57
+python-memcached==1.59
# celery==4.2.1 ## not mandatory
-djangorestframework==3.4
+djangorestframework==3.9
pytidylib==0.3.2
-lxml==3.4.0
+lxml==4.3.2
django-extra-views==0.12.0
-beautifulsoup4==4.5.3
-markdown==2.5.1
-django-ajax-selects==1.6.0
-django-compressor==2.1
+beautifulsoup4==4.7.1
+markdown==3.0.1
+django-ajax-selects==1.7.0
+django-compressor==2.2
django-formtools==2.0
secretary==0.2.19
unidecode
-virtualtime==1.6 # time for year before 1900 and before 1000 on python < 3.2
-e git+https://github.com/treyhunner/django-simple-history.git@1.8.2#egg=django-simple-history
-django-extensions==1.7.4
+django-extensions==2.1.4