diff --git a/bookwyrm/migrations/0036_merge_20210114_0348.py b/bookwyrm/migrations/0036_merge_20210114_0348.py new file mode 100644 index 00000000..6dd1a775 --- /dev/null +++ b/bookwyrm/migrations/0036_merge_20210114_0348.py @@ -0,0 +1,14 @@ +# Generated by Django 3.0.7 on 2021-01-14 03:48 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0015_auto_20201128_0734'), + ('bookwyrm', '0035_edition_edition_rank'), + ] + + operations = [ + ] diff --git a/bookwyrm/tests/actions/test_readthrough.py b/bookwyrm/tests/actions/test_readthrough.py index c764fac3..fb16edcb 100644 --- a/bookwyrm/tests/actions/test_readthrough.py +++ b/bookwyrm/tests/actions/test_readthrough.py @@ -19,7 +19,9 @@ class ReadThrough(TestCase): self.work.default_edition = self.edition self.work.save() - self.user = models.User.objects.create() + self.user = models.User.objects.create_user( + 'cinco', 'cinco@example.com', 'seissiete', + local=True, localname='cinco') self.client.force_login(self.user) diff --git a/bw-dev b/bw-dev index 978f48c5..f3162bd3 100755 --- a/bw-dev +++ b/bw-dev @@ -43,7 +43,7 @@ set -x case "$CMD" in up) - docker-compose up --build + docker-compose up --build "$@" ;; run) docker-compose run --rm --service-ports web