mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-11-26 03:21:05 +00:00
Merge migration branches
Also add $@ to bw-dev migrations, and factor the shift 1 out
This commit is contained in:
parent
85026b837c
commit
3b0b8f16f6
2 changed files with 18 additions and 5 deletions
14
bookwyrm/migrations/0014_merge_20201128_0007.py
Normal file
14
bookwyrm/migrations/0014_merge_20201128_0007.py
Normal 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
9
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)
|
||||
|
|
Loading…
Reference in a new issue