Skip to content

Commit 73de829

Browse files
committed
Cleanup unnecessary changes
1 parent a04eb74 commit 73de829

File tree

6 files changed

+7
-10
lines changed

6 files changed

+7
-10
lines changed

dandiapi/api/services/embargo/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ def unembargo_dandiset(ds: Dandiset, user: User):
7474
validate_version_metadata(version=v)
7575
logger.info('Version metadata validated')
7676

77-
7877
# Notify owners of completed unembargo
7978
send_dandiset_unembargoed_message(ds)
8079
logger.info('Dandiset owners notified.')
@@ -84,6 +83,7 @@ def unembargo_dandiset(ds: Dandiset, user: User):
8483
audit.unembargo_dandiset(dandiset=ds, user=user)
8584
transaction.on_commit(lambda: create_dandiset_draft_doi_task.delay(v.id))
8685

86+
8787
def remove_asset_blob_embargoed_tag(asset_blob: AssetBlob) -> None:
8888
"""Remove the embargoed tag of an asset blob."""
8989
if asset_blob.embargoed:

dandiapi/api/services/publish/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ def _build_publishable_version_from_draft(draft_version: Version) -> Version:
106106
return publishable_version
107107

108108

109-
110-
111109
def _publish_dandiset(dandiset_id: int, user_id: int) -> None:
112110
"""
113111
Publish a dandiset.

dandiapi/api/tests/test_asset_paths.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ def test_asset_path_search_asset_paths(draft_version_factory, asset_factory):
298298

299299

300300
@pytest.mark.django_db
301-
def test_asset_path_publish_version(draft_version_factory, asset_factory, user, mocker):
301+
def test_asset_path_publish_version(draft_version_factory, asset_factory, user):
302302
version: Version = draft_version_factory()
303303
asset = asset_factory(path='foo/bar.txt', status=Asset.Status.VALID)
304304
version.assets.add(asset)

dandiapi/api/tests/test_audit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def user_info(u):
118118

119119

120120
@pytest.mark.django_db
121-
def test_audit_update_metadata(api_client, draft_version, user, mocker):
121+
def test_audit_update_metadata(api_client, draft_version, user):
122122
# Create a Dandiset.
123123
dandiset = draft_version.dandiset
124124
add_dandiset_owner(dandiset, user)

dandiapi/api/tests/test_dandiset.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ def test_dandiset_rest_create(api_client, user):
363363
response = api_client.post(
364364
'/api/dandisets/', {'name': name, 'metadata': metadata}, format='json'
365365
)
366-
367366
assert response.data == {
368367
'identifier': DANDISET_ID_RE,
369368
'created': TIMESTAMP_RE,
@@ -629,7 +628,7 @@ def test_dandiset_rest_create_with_contributor(api_client, admin_user):
629628

630629

631630
@pytest.mark.django_db
632-
def test_dandiset_rest_create_embargoed(api_client, user, mocker):
631+
def test_dandiset_rest_create_embargoed(api_client, user):
633632
user.first_name = 'John'
634633
user.last_name = 'Doe'
635634
user.save()
@@ -782,7 +781,6 @@ def test_dandiset_rest_delete(api_client, draft_version_factory, user, embargo_s
782781
else:
783782
assert response.status_code >= 400
784783
assert Dandiset.objects.count() == 1
785-
# Verify that delete_or_hide_doi was not called
786784
mock_delete_doi.assert_not_called()
787785

788786

dandiapi/api/tests/test_version.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,15 +719,15 @@ def test_version_rest_update_not_an_owner(api_client, user, version):
719719

720720

721721
@pytest.mark.parametrize(
722-
'access',
722+
('access'),
723723
[
724724
'some value',
725725
123,
726726
None,
727727
[],
728728
['a', 'b'],
729729
['a', 'b', {}],
730-
[{'schemaKey': 'AccessRequirements', 'status': 'foobar'}]
730+
[{'schemaKey': 'AccessRequirements', 'status': 'foobar'}],
731731
],
732732
)
733733
@pytest.mark.django_db
@@ -741,6 +741,7 @@ def test_version_rest_update_access_values(api_client, user, draft_version, acce
741741
{'metadata': new_metadata, 'name': draft_version.name},
742742
format='json',
743743
)
744+
assert resp.status_code == 200
744745
draft_version.refresh_from_db()
745746

746747
access = draft_version.metadata['access']

0 commit comments

Comments
 (0)