From 5fde61feedcf3aa98d2b326759f939ac7f4f0617 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 30 Jan 2019 10:45:33 +0100 Subject: Tests: remove unecessary line return --- ishtar_common/migrations/0079_migrate-importers.py | 4 ++-- ishtar_common/migrations/0081_recreate_m2m_history.py | 9 +++++---- ishtar_common/migrations/0083_document_index_external_id.py | 5 ++++- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'ishtar_common/migrations') diff --git a/ishtar_common/migrations/0079_migrate-importers.py b/ishtar_common/migrations/0079_migrate-importers.py index 3a66ffb30..56df76a7b 100644 --- a/ishtar_common/migrations/0079_migrate-importers.py +++ b/ishtar_common/migrations/0079_migrate-importers.py @@ -55,8 +55,8 @@ def migrate_importer(apps, schema): if item.concat: dup_dct['concat'] = item.concat ImporterDuplicateField.objects.create(**dup_dct) - - print("{} dup field created".format(idx)) + if idx: + print("{} dup field created".format(idx)) class Migration(migrations.Migration): diff --git a/ishtar_common/migrations/0081_recreate_m2m_history.py b/ishtar_common/migrations/0081_recreate_m2m_history.py index 8f2779aed..3d7f28bb6 100644 --- a/ishtar_common/migrations/0081_recreate_m2m_history.py +++ b/ishtar_common/migrations/0081_recreate_m2m_history.py @@ -16,17 +16,18 @@ def recreate_m2m_migrations(apps, schema_editor): history_models = [ ContextRecord, File, Find, Treatment, Operation, ArchaeologicalSite ] - sys.stdout.write("\n") + has_values = False for model in history_models: q = model.objects ln = q.count() for idx, item in enumerate(model.objects.all()): + if not idx: + sys.stdout.write("\n") sys.stdout.write("{}: {}/{}\r".format(model, idx + 1, ln)) sys.stdout.flush() m2m_historization_init(item) - if ln: - sys.stdout.write("\n") - sys.stdout.write("\n") + if has_values: + sys.stdout.write("\n") class Migration(migrations.Migration): diff --git a/ishtar_common/migrations/0083_document_index_external_id.py b/ishtar_common/migrations/0083_document_index_external_id.py index 4f1dafcf9..3d9a76e02 100644 --- a/ishtar_common/migrations/0083_document_index_external_id.py +++ b/ishtar_common/migrations/0083_document_index_external_id.py @@ -8,14 +8,17 @@ from django.db import migrations def gen_index(apps, schema_editor): from ishtar_common.models import Document - sys.stdout.write("\n") q = Document.objects ln = q.count() + if ln: + sys.stdout.write("\n") for idx, doc in enumerate(Document.objects.all()): sys.stdout.write(" * {}/{}\r".format(idx, ln)) sys.stdout.flush() doc._no_move = True doc.save() + if ln: + sys.stdout.write("\n") class Migration(migrations.Migration): -- cgit v1.2.3