diff --git a/bw-dev b/bw-dev index 6c9def8ff..35f3694ee 100755 --- a/bw-dev +++ b/bw-dev @@ -61,7 +61,7 @@ case "$CMD" in up) docker-compose up --build "$@" ;; - run) + service_ports_web) docker-compose run --rm --service-ports web ;; initdb) @@ -96,9 +96,6 @@ case "$CMD" in restart_celery) docker-compose restart celery_worker ;; - test) - runweb coverage run --source='.' --omit="*/test*,celerywyrm*,bookwyrm/migrations/*" manage.py test "$@" - ;; pytest) execweb pytest --no-cov-on-fail "$@" ;; @@ -148,14 +145,11 @@ case "$CMD" in runweb) runweb "$@" ;; - rundb) - rundb "$@" - ;; *) set +x # No need to echo echo echo "Unrecognised command. Try:" echo " up [container]" - echo " run" + echo " service_ports_web" echo " initdb" echo " resetdb" echo " makemigrations [migration]" @@ -164,10 +158,8 @@ case "$CMD" in echo " shell" echo " dbshell" echo " restart_celery" - echo " test [path]" echo " pytest [path]" echo " collectstatic" - echo " add_locale [locale]" echo " makemessages" echo " compilemessages [locale]" echo " build" @@ -180,6 +172,5 @@ case "$CMD" in echo " copy_media_to_s3" echo " set_cors_to_s3 [cors file]" echo " runweb [command]" - echo " rundb [command]" ;; esac diff --git a/requirements.txt b/requirements.txt index 7cf1c68a0..2cb1eec97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,6 @@ django-storages==1.11.1 # Dev black==21.4b0 -coverage==5.1 pytest-django==4.1.0 pytest==6.1.2 pytest-cov==2.10.1