Merge pull request #1593 from bookwyrm-social/bw-dev-updates

bw-dev updates
This commit is contained in:
Mouse Reeve 2021-11-08 11:33:02 -08:00 committed by GitHub
commit c6db7ffcbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 12 deletions

13
bw-dev
View file

@ -61,7 +61,7 @@ case "$CMD" in
up) up)
docker-compose up --build "$@" docker-compose up --build "$@"
;; ;;
run) service_ports_web)
docker-compose run --rm --service-ports web docker-compose run --rm --service-ports web
;; ;;
initdb) initdb)
@ -96,9 +96,6 @@ case "$CMD" in
restart_celery) restart_celery)
docker-compose restart celery_worker docker-compose restart celery_worker
;; ;;
test)
runweb coverage run --source='.' --omit="*/test*,celerywyrm*,bookwyrm/migrations/*" manage.py test "$@"
;;
pytest) pytest)
execweb pytest --no-cov-on-fail "$@" execweb pytest --no-cov-on-fail "$@"
;; ;;
@ -148,14 +145,11 @@ case "$CMD" in
runweb) runweb)
runweb "$@" runweb "$@"
;; ;;
rundb)
rundb "$@"
;;
*) *)
set +x # No need to echo echo set +x # No need to echo echo
echo "Unrecognised command. Try:" echo "Unrecognised command. Try:"
echo " up [container]" echo " up [container]"
echo " run" echo " service_ports_web"
echo " initdb" echo " initdb"
echo " resetdb" echo " resetdb"
echo " makemigrations [migration]" echo " makemigrations [migration]"
@ -164,10 +158,8 @@ case "$CMD" in
echo " shell" echo " shell"
echo " dbshell" echo " dbshell"
echo " restart_celery" echo " restart_celery"
echo " test [path]"
echo " pytest [path]" echo " pytest [path]"
echo " collectstatic" echo " collectstatic"
echo " add_locale [locale]"
echo " makemessages" echo " makemessages"
echo " compilemessages [locale]" echo " compilemessages [locale]"
echo " build" echo " build"
@ -180,6 +172,5 @@ case "$CMD" in
echo " copy_media_to_s3" echo " copy_media_to_s3"
echo " set_cors_to_s3 [cors file]" echo " set_cors_to_s3 [cors file]"
echo " runweb [command]" echo " runweb [command]"
echo " rundb [command]"
;; ;;
esac esac

View file

@ -20,7 +20,6 @@ django-storages==1.11.1
# Dev # Dev
black==21.4b0 black==21.4b0
coverage==5.1
pytest-django==4.1.0 pytest-django==4.1.0
pytest==6.1.2 pytest==6.1.2
pytest-cov==2.10.1 pytest-cov==2.10.1