From f43fc07278c9c3ee9f1320bb0b63eb3b497002aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
<jkuensem@physik.uni-bielefeld.de>
Date: Thu, 2 Aug 2018 16:54:44 +0000
Subject: [PATCH] Task LSMR-23: Added remakemigrations.py script to
conveniently remake migrations from scratch without manual action for
subversion and choice population
---
.gitattributes | 5 ++-
SAS/LSMR/bin/CMakeLists.txt | 2 +-
SAS/LSMR/bin/lsmr_makemigrations | 32 -------------------
SAS/LSMR/src/CMakeLists.txt | 1 +
...802_1547.py => 0002_auto_20180802_1653.py} | 2 +-
.../lsmr/lsmrapp/migrations/0003_populate.py | 2 +-
...remakemigration.py => remakemigrations.py} | 0
7 files changed, 6 insertions(+), 38 deletions(-)
delete mode 100755 SAS/LSMR/bin/lsmr_makemigrations
rename SAS/LSMR/src/lsmr/lsmrapp/migrations/{0002_auto_20180802_1547.py => 0002_auto_20180802_1653.py} (99%)
rename SAS/LSMR/src/{remakemigration.py => remakemigrations.py} (100%)
diff --git a/.gitattributes b/.gitattributes
index 156df2c6209..90df7afcb8c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4234,7 +4234,6 @@ SAS/Feedback_Service/src/fb_data_44883.txt -text
SAS/LSMR/CMakeLists.txt -text
SAS/LSMR/bin/CMakeLists.txt -text
SAS/LSMR/bin/lsmr -text
-SAS/LSMR/bin/lsmr_makemigrations -text
SAS/LSMR/bin/lsmr_testdatabase -text
SAS/LSMR/doc/LSMR.md -text
SAS/LSMR/doc/package.dox -text
@@ -4246,7 +4245,7 @@ SAS/LSMR/src/lsmr/lsmrapp/__init__.py -text
SAS/LSMR/src/lsmr/lsmrapp/admin.py -text
SAS/LSMR/src/lsmr/lsmrapp/apps.py -text
SAS/LSMR/src/lsmr/lsmrapp/migrations/0001_initial.py -text
-SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180802_1547.py -text
+SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180802_1653.py -text
SAS/LSMR/src/lsmr/lsmrapp/migrations/0003_populate.py -text
SAS/LSMR/src/lsmr/lsmrapp/migrations/CMakeLists.txt -text
SAS/LSMR/src/lsmr/lsmrapp/migrations/__init__.py -text
@@ -4267,7 +4266,7 @@ SAS/LSMR/src/lsmr/settings.py -text
SAS/LSMR/src/lsmr/urls.py -text
SAS/LSMR/src/lsmr/wsgi.py -text
SAS/LSMR/src/manage.py -text
-SAS/LSMR/src/remakemigration.py -text
+SAS/LSMR/src/remakemigrations.py -text
SAS/LSMR/test/CMakeLists.txt -text
SAS/LSMR/test/__init__.py -text
SAS/LSMR/test/postgres_testrunner.py -text
diff --git a/SAS/LSMR/bin/CMakeLists.txt b/SAS/LSMR/bin/CMakeLists.txt
index 5305dc9285b..84b9364b08f 100644
--- a/SAS/LSMR/bin/CMakeLists.txt
+++ b/SAS/LSMR/bin/CMakeLists.txt
@@ -1,2 +1,2 @@
lofar_add_bin_scripts(lsmr)
-lofar_add_bin_scripts(lsmr_testdatabase)
+lofar_add_bin_scripts(lsmr_testdatabase)
\ No newline at end of file
diff --git a/SAS/LSMR/bin/lsmr_makemigrations b/SAS/LSMR/bin/lsmr_makemigrations
deleted file mode 100755
index 75e37043603..00000000000
--- a/SAS/LSMR/bin/lsmr_makemigrations
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2012-2015 ASTRON (Netherlands Institute for Radio Astronomy)
-# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
-#
-# This file is part of the LOFAR software suite.
-# The LOFAR software suite is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# The LOFAR software suite is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
-
-
-# Utility script to make migrations from scratch. This should not be used once a production database has been created
-# since from that moment on we want to have incremental migrations that alter the existing database!
-
-# This script will remove existing migrations, then run makemigrations to create fresh migrations, and then recreate
-# the migration for populating the database with the valid choices.
-
-# Parse args:
-
-echo "Removing existing migrations"
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-/usr/bin/env python3 $DIR/../lib*/python*/site-packages/lofar/sas/lsmr/remakemigrations.py
\ No newline at end of file
diff --git a/SAS/LSMR/src/CMakeLists.txt b/SAS/LSMR/src/CMakeLists.txt
index f945b70f408..31632c3d7e4 100644
--- a/SAS/LSMR/src/CMakeLists.txt
+++ b/SAS/LSMR/src/CMakeLists.txt
@@ -15,6 +15,7 @@ find_python_module(django_filters REQUIRED) # pip install django-filter
set(_py_files
manage.py
+ remakemigrations.py
)
python_install(${_py_files}
diff --git a/SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180802_1547.py b/SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180802_1653.py
similarity index 99%
rename from SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180802_1547.py
rename to SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180802_1653.py
index 3c41b0dabde..060a10a0197 100644
--- a/SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180802_1547.py
+++ b/SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180802_1653.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-08-02 15:47
+# Generated by Django 2.0.6 on 2018-08-02 16:53
import django.contrib.postgres.fields
import django.contrib.postgres.fields.jsonb
diff --git a/SAS/LSMR/src/lsmr/lsmrapp/migrations/0003_populate.py b/SAS/LSMR/src/lsmr/lsmrapp/migrations/0003_populate.py
index a68502041c0..150dc5bf176 100644
--- a/SAS/LSMR/src/lsmr/lsmrapp/migrations/0003_populate.py
+++ b/SAS/LSMR/src/lsmr/lsmrapp/migrations/0003_populate.py
@@ -6,7 +6,7 @@ from ..populate import *
class Migration(migrations.Migration):
dependencies = [
- ('lsmrapp', '0002_auto_20180802_1547'),
+ ('lsmrapp', '0002_auto_20180802_1653'),
]
operations = [ migrations.RunPython(populate_choices) ]
diff --git a/SAS/LSMR/src/remakemigration.py b/SAS/LSMR/src/remakemigrations.py
similarity index 100%
rename from SAS/LSMR/src/remakemigration.py
rename to SAS/LSMR/src/remakemigrations.py
--
GitLab