Merge branch 'main' into production

bookwyrm/migrations/0101_auto_20210929_1847.py

@@ -17,7 +17,7 @@ def infer_format(app_registry, schema_editor):
     for edition in editions:
         free_format = edition.physical_format_detail.lower()
         edition.physical_format = infer_physical_format(free_format)
-        edition.save(broadcast=False, update_fields=["physical_format"])
+        edition.save()
 
 
 def reverse(app_registry, schema_editor):

bookwyrm/migrations/0105_alter_connector_connector_file.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.5 on 2021-10-03 19:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0104_auto_20211001_2012"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="connector",
+            name="connector_file",
+            field=models.CharField(
+                choices=[
+                    ("openlibrary", "Openlibrary"),
+                    ("inventaire", "Inventaire"),
+                    ("bookwyrm_connector", "Bookwyrm Connector"),
+                ],
+                max_length=255,
+            ),
+        ),
+    ]