From 3b0b8f16f66dfbce89b6b947ba978b734f229a12 Mon Sep 17 00:00:00 2001 From: Joel Bradshaw Date: Fri, 27 Nov 2020 16:07:53 -0800 Subject: [PATCH] Merge migration branches Also add $@ to bw-dev migrations, and factor the shift 1 out --- bookwyrm/migrations/0014_merge_20201128_0007.py | 14 ++++++++++++++ bw-dev | 9 ++++----- 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 bookwyrm/migrations/0014_merge_20201128_0007.py diff --git a/bookwyrm/migrations/0014_merge_20201128_0007.py b/bookwyrm/migrations/0014_merge_20201128_0007.py new file mode 100644 index 000000000..e811fa7ff --- /dev/null +++ b/bookwyrm/migrations/0014_merge_20201128_0007.py @@ -0,0 +1,14 @@ +# Generated by Django 3.0.7 on 2020-11-28 00:07 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0013_book_origin_id'), + ('bookwyrm', '0012_progressupdate'), + ] + + operations = [ + ] diff --git a/bw-dev b/bw-dev index 53c8e52d9..a6a1f326d 100755 --- a/bw-dev +++ b/bw-dev @@ -38,7 +38,9 @@ function initdb { execweb python manage.py initdb } -case "$1" in +CMD=$1 +shift +case "$CMD" in up) docker-compose up --build ;; @@ -57,11 +59,10 @@ case "$1" in clean ;; makemigrations) - execweb python manage.py makemigrations + execweb python manage.py makemigrations "$@" ;; migrate) execweb python manage.py rename_app fedireads bookwyrm - shift 1 execweb python manage.py migrate "$@" ;; bash) @@ -77,11 +78,9 @@ case "$1" in docker-compose restart celery_worker ;; test) - shift 1 execweb coverage run --source='.' --omit="*/test*,celerywyrm*,bookwyrm/migrations/*" manage.py test "$@" ;; pytest) - shift 1 execweb pytest "$@" ;; test_report)