Merge branch 'master' into zarr-upload-dd-update

dandi · Feb 6, 2023 · a8a9bf6 · a8a9bf6
2 parents 84cedb9 + 6ad6395
commit a8a9bf6
Show file tree

Hide file tree

Showing 41 changed files with 1 addition and 44 deletions.
diff --git a/dandiapi/api/migrations/0001_initial.py b/dandiapi/api/migrations/0001_initial.py
@@ -14,7 +14,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/dandiapi/api/migrations/0002_unique_asset_blob_etag_size.py b/dandiapi/api/migrations/0002_unique_asset_blob_etag_size.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0001_initial'),
     ]

diff --git a/dandiapi/api/migrations/0003_rename_uuids.py b/dandiapi/api/migrations/0003_rename_uuids.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0002_unique_asset_blob_etag_size'),
     ]

diff --git a/dandiapi/api/migrations/0004_generic_multipart_upload_id.py b/dandiapi/api/migrations/0004_generic_multipart_upload_id.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0003_rename_uuids'),
     ]

diff --git a/dandiapi/api/migrations/0005_version_doi.py b/dandiapi/api/migrations/0005_version_doi.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0004_generic_multipart_upload_id'),
     ]

diff --git a/dandiapi/api/migrations/0006_default_oauth_application.py b/dandiapi/api/migrations/0006_default_oauth_application.py
@@ -31,7 +31,6 @@ def reverse_create_application(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0005_version_doi'),
         ('oauth2_provider', '0003_auto_20201211_1314'),

diff --git a/dandiapi/api/migrations/0007_validation_status.py b/dandiapi/api/migrations/0007_validation_status.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0006_default_oauth_application'),
     ]

diff --git a/dandiapi/api/migrations/0008_version_validation_status.py b/dandiapi/api/migrations/0008_version_validation_status.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0007_validation_status'),
     ]

diff --git a/dandiapi/api/migrations/0009_asset_published.py b/dandiapi/api/migrations/0009_asset_published.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0008_version_validation_status'),
     ]

diff --git a/dandiapi/api/migrations/0010_blank_validation_errors.py b/dandiapi/api/migrations/0010_blank_validation_errors.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0009_asset_published'),
     ]

diff --git a/dandiapi/api/migrations/0012_merge_20210630_1354.py b/dandiapi/api/migrations/0012_merge_20210630_1354.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0010_blank_validation_errors'),
         ('api', '0011_stagingapplication'),

diff --git a/dandiapi/api/migrations/0013_add_published_status.py b/dandiapi/api/migrations/0013_add_published_status.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0012_merge_20210630_1354'),
     ]

diff --git a/dandiapi/api/migrations/0014_alter_stagingapplication_skip_authorization.py b/dandiapi/api/migrations/0014_alter_stagingapplication_skip_authorization.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0013_add_published_status'),
     ]

diff --git a/dandiapi/api/migrations/0015_validation_fields.py b/dandiapi/api/migrations/0015_validation_fields.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0014_alter_stagingapplication_skip_authorization'),
     ]

diff --git a/dandiapi/api/migrations/0016_remove_metadata_tables.py b/dandiapi/api/migrations/0016_remove_metadata_tables.py
@@ -27,7 +27,6 @@ def migrate_metadata(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0015_validation_fields'),
     ]

diff --git a/dandiapi/api/migrations/0017_alter_version_version.py b/dandiapi/api/migrations/0017_alter_version_version.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0016_remove_metadata_tables'),
     ]

diff --git a/dandiapi/api/migrations/0018_alter_validation_errors.py b/dandiapi/api/migrations/0018_alter_validation_errors.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0017_alter_version_version'),
     ]

diff --git a/dandiapi/api/migrations/0019_usermetadata.py b/dandiapi/api/migrations/0019_usermetadata.py
@@ -26,7 +26,6 @@ def reverse_update_existing_users(app, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('api', '0018_alter_validation_errors'),

diff --git a/dandiapi/api/migrations/0020_zarr.py b/dandiapi/api/migrations/0020_zarr.py
@@ -12,7 +12,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0019_usermetadata'),
     ]

diff --git a/dandiapi/api/migrations/0021_embargo_models.py b/dandiapi/api/migrations/0021_embargo_models.py
@@ -12,7 +12,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0020_zarr'),
     ]

diff --git a/dandiapi/api/migrations/0022_upload_dandiset_alter_stagingapplication_user.py b/dandiapi/api/migrations/0022_upload_dandiset_alter_stagingapplication_user.py
@@ -24,7 +24,6 @@ def reverse_set_default_upload_dandiset(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0021_embargo_models'),
     ]

diff --git a/dandiapi/api/migrations/0023_embargoedzarrarchive.py b/dandiapi/api/migrations/0023_embargoedzarrarchive.py
@@ -11,7 +11,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0022_upload_dandiset_alter_stagingapplication_user'),
     ]

diff --git a/dandiapi/api/migrations/0024_biginteger_zarrarchives.py b/dandiapi/api/migrations/0024_biginteger_zarrarchives.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0023_embargoedzarrarchive'),
     ]

diff --git a/dandiapi/api/migrations/0025_zarrarchive_dandiset.py b/dandiapi/api/migrations/0025_zarrarchive_dandiset.py
@@ -19,7 +19,6 @@ def set_default_zarrarchive_dandiset(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('auth', '0012_alter_user_first_name_max_length'),
         ('api', '0024_biginteger_zarrarchives'),

diff --git a/dandiapi/api/migrations/0026_alter_asset_id_alter_assetblob_id_alter_dandiset_id_and_more.py b/dandiapi/api/migrations/0026_alter_asset_id_alter_assetblob_id_alter_dandiset_id_and_more.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('api', '0025_zarrarchive_dandiset'),

diff --git a/dandiapi/api/migrations/0027_embargoedzarrarchive_status_zarrarchive_status.py b/dandiapi/api/migrations/0027_embargoedzarrarchive_status_zarrarchive_status.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0026_alter_asset_id_alter_assetblob_id_alter_dandiset_id_and_more'),
     ]

diff --git a/dandiapi/api/migrations/0028_alter_asset_previous.py b/dandiapi/api/migrations/0028_alter_asset_previous.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0027_embargoedzarrarchive_status_zarrarchive_status'),
     ]

diff --git a/dandiapi/api/migrations/0029_alter_usermetadata_user.py b/dandiapi/api/migrations/0029_alter_usermetadata_user.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('api', '0028_alter_asset_previous'),

diff --git a/dandiapi/api/migrations/0030_alter_embargoedzarruploadfile_blob_and_more.py b/dandiapi/api/migrations/0030_alter_embargoedzarruploadfile_blob_and_more.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0029_alter_usermetadata_user'),
     ]

diff --git a/dandiapi/api/migrations/0031_asset_asset_metadata_has_schema_version_and_more.py b/dandiapi/api/migrations/0031_asset_asset_metadata_has_schema_version_and_more.py
@@ -14,7 +14,6 @@ def populate_empty_asset_schema_versions(apps, _):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0030_alter_embargoedzarruploadfile_blob_and_more'),
     ]

diff --git a/dandiapi/api/migrations/0032_embargoedzarrarchive_checksum_zarrarchive_checksum_and_more.py b/dandiapi/api/migrations/0032_embargoedzarrarchive_checksum_zarrarchive_checksum_and_more.py
@@ -12,7 +12,6 @@ def forward_set_checksum(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0031_asset_asset_metadata_has_schema_version_and_more'),
     ]

diff --git a/.../api/migrations/0033_remove_embargoedzarrarchive_unique-embargo-dandiset-name_and_more.py b/.../api/migrations/0033_remove_embargoedzarrarchive_unique-embargo-dandiset-name_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0032_embargoedzarrarchive_checksum_zarrarchive_checksum_and_more'),
     ]

diff --git a/dandiapi/api/migrations/0034_remove_embargoedzarrarchive_dandiset_and_more.py b/dandiapi/api/migrations/0034_remove_embargoedzarrarchive_dandiset_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0033_remove_embargoedzarrarchive_unique-embargo-dandiset-name_and_more'),
     ]

diff --git a/dandiapi/api/migrations/0035_alter_asset_zarr_delete_embargoedzarrarchive_and_more.py b/dandiapi/api/migrations/0035_alter_asset_zarr_delete_embargoedzarrarchive_and_more.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0034_remove_embargoedzarrarchive_dandiset_and_more'),
         ('zarr', '0001_initial'),

diff --git a/dandiapi/api/migrations/0036_dandisetuserobjectpermission_and_more.py b/dandiapi/api/migrations/0036_dandisetuserobjectpermission_and_more.py
@@ -24,7 +24,6 @@ def migrate_dandiset_permissions(apps, _):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('auth', '0012_alter_user_first_name_max_length'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),

diff --git a/dandiapi/api/migrations/0037_alter_version_status.py b/dandiapi/api/migrations/0037_alter_version_status.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0036_dandisetuserobjectpermission_and_more'),
     ]

diff --git a/dandiapi/api/migrations/0038_assetpath_assetpathrelation_alter_asset_path_and_more.py b/dandiapi/api/migrations/0038_assetpath_assetpathrelation_alter_asset_path_and_more.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0037_alter_version_status'),
     ]

diff --git a/dandiapi/api/migrations/0039_assetpath_consistent-leaf-paths.py b/dandiapi/api/migrations/0039_assetpath_consistent-leaf-paths.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0038_assetpath_assetpathrelation_alter_asset_path_and_more'),
     ]

diff --git a/dandiapi/api/tests/test_upload.py b/dandiapi/api/tests/test_upload.py
@@ -17,7 +17,6 @@ def mb(bytes_size: int) -> int:
 
 @pytest.mark.django_db
 def test_blob_read(api_client, asset_blob):
-
     assert api_client.post(
         '/api/blobs/digest/',
         {'algorithm': 'dandi:dandi-etag', 'value': asset_blob.etag},
@@ -32,7 +31,6 @@ def test_blob_read(api_client, asset_blob):
 
 @pytest.mark.django_db
 def test_blob_read_sha256(api_client, asset_blob):
-
     assert api_client.post(
         '/api/blobs/digest/',
         {'algorithm': 'dandi:sha2-256', 'value': asset_blob.sha256},
@@ -47,7 +45,6 @@ def test_blob_read_sha256(api_client, asset_blob):
 
 @pytest.mark.django_db
 def test_blob_read_bad_algorithm(api_client, asset_blob):
-
     resp = api_client.post(
         '/api/blobs/digest/',
         {'algorithm': 'sha256', 'value': asset_blob.sha256},
@@ -59,7 +56,6 @@ def test_blob_read_bad_algorithm(api_client, asset_blob):
 
 @pytest.mark.django_db
 def test_blob_read_does_not_exist(api_client):
-
     resp = api_client.post(
         '/api/blobs/digest/',
         {'algorithm': 'dandi:dandi-etag', 'value': 'not etag'},

diff --git a/dandiapi/zarr/migrations/0001_initial.py b/dandiapi/zarr/migrations/0001_initial.py
@@ -11,7 +11,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

diff --git a/tox.ini b/tox.ini
@@ -23,7 +23,7 @@ commands =
 skipsdist = true
 skip_install = true
 deps =
-    black >= 22.1.0
+    black >= 23.1.0
     isort
 commands =
     isort {posargs:.}