mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-14 11:19:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge migration branches

Browse source 
Also add $@ to bw-dev migrations, and factor the shift 1 out
This commit is contained in:
Joel Bradshaw 2020-11-27 16:07:53 -08:00
parent 85026b837c
commit 3b0b8f16f6
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bookwyrm/migrations/0014_merge_20201128_0007.py Normal file
View file

@ -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 = [
]

9
bw-dev
View file

@ -38,7 +38,9 @@ function initdb {
execweb python manage.py initdb execweb python manage.py initdb
} }
case "$1" in CMD=$1
shift
case "$CMD" in
up) up)
docker-compose up --build docker-compose up --build
;; ;;
@ -57,11 +59,10 @@ case "$1" in
clean clean
;; ;;
makemigrations) makemigrations)
execweb python manage.py makemigrations execweb python manage.py makemigrations "$@"
;; ;;
migrate) migrate)
execweb python manage.py rename_app fedireads bookwyrm execweb python manage.py rename_app fedireads bookwyrm
shift 1
execweb python manage.py migrate "$@" execweb python manage.py migrate "$@"
;; ;;
bash) bash)
@ -77,11 +78,9 @@ case "$1" in
docker-compose restart celery_worker docker-compose restart celery_worker
;; ;;
test) test)
shift 1
execweb coverage run --source='.' --omit="*/test*,celerywyrm*,bookwyrm/migrations/*" manage.py test "$@" execweb coverage run --source='.' --omit="*/test*,celerywyrm*,bookwyrm/migrations/*" manage.py test "$@"
;; ;;
pytest) pytest)
shift 1
execweb pytest "$@" execweb pytest "$@"
;; ;;
test_report) test_report)