Skip to content

Commit 01bfb52

Browse files
jjnesbittjjnesbitt
committed
Replace settings.DANDI_SCHEMA_VERSION with import
Simply import `DANDI_SCHEMA_VERSION` from dandischema.consts
1 parent 1aed085 commit 01bfb52

File tree

13 files changed

+57
-61
lines changed

13 files changed

+57
-61
lines changed

‎dandiapi/api/management/commands/create_dev_dandiset.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from uuid import uuid4
44

55
from dandischema.conf import get_instance_config
6-
from django.conf import settings
6+
from dandischema.consts import DANDI_SCHEMA_VERSION
77
from django.contrib.auth.models import User
88
from django.core.files.uploadedfile import SimpleUploadedFile
99
import djclick as click
@@ -69,7 +69,7 @@ def create_dev_dandiset(*, name: str, email: str, num_extra_owners: int):
6969
calculate_sha256(blob_id=asset_blob.blob_id)
7070
asset_blob.refresh_from_db()
7171
asset_metadata = {
72-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
72+
'schemaVersion': DANDI_SCHEMA_VERSION,
7373
'encodingFormat': 'text/plain',
7474
'schemaKey': 'Asset',
7575
'path': 'foo/bar.txt',

‎dandiapi/api/services/version/metadata.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from django.conf import settings
3+
from dandischema.consts import DANDI_SCHEMA_VERSION
44

55
from dandiapi.api.models.version import Version
66

@@ -18,7 +18,7 @@ def _normalize_version_metadata(raw_version_metadata: dict, name: str, email: st
1818
# not specified in the version_metadata
1919
return {
2020
'schemaKey': 'Dandiset',
21-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
21+
'schemaVersion': DANDI_SCHEMA_VERSION,
2222
'contributor': [
2323
{
2424
'name': name,

‎dandiapi/api/tests/factories.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
from allauth.socialaccount.models import SocialAccount
77
from dandischema.conf import get_instance_config
8+
from dandischema.consts import DANDI_SCHEMA_VERSION
89
from dandischema.models import AccessType
9-
from django.conf import settings
1010
from django.contrib.auth.models import User
1111
import factory
1212
import faker
@@ -118,7 +118,7 @@ def metadata(self) -> dict:
118118

119119
metadata = {
120120
**faker.Faker().pydict(value_types=['str', 'float', 'int']),
121-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
121+
'schemaVersion': DANDI_SCHEMA_VERSION,
122122
'schemaKey': 'Dandiset',
123123
'description': faker.Faker().sentence(),
124124
'access': [
@@ -234,7 +234,7 @@ class Meta:
234234
def metadata(self) -> dict:
235235
metadata = {
236236
**faker.Faker().pydict(value_types=['str', 'float', 'int']),
237-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
237+
'schemaVersion': DANDI_SCHEMA_VERSION,
238238
'encodingFormat': 'application/x-nwb',
239239
'schemaKey': 'Asset',
240240
}

‎dandiapi/api/tests/test_asset.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import json
44
from uuid import uuid4
55

6+
from dandischema.consts import DANDI_SCHEMA_VERSION
67
from dandischema.models import AccessType
78
from django.conf import settings
89
from django.db.utils import IntegrityError
@@ -179,7 +180,7 @@ def test_asset_total_size(asset_factory, asset_blob_factory, zarr_archive_factor
179180
def test_asset_full_metadata(draft_asset_factory):
180181
raw_metadata = {
181182
'foo': 'bar',
182-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
183+
'schemaVersion': DANDI_SCHEMA_VERSION,
183184
}
184185
asset: Asset = draft_asset_factory(metadata=raw_metadata)
185186

@@ -199,7 +200,7 @@ def test_asset_full_metadata(draft_asset_factory):
199200
'contentUrl': [download_url, blob_url],
200201
'contentSize': asset.blob.size,
201202
'digest': asset.blob.digest,
202-
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{settings.DANDI_SCHEMA_VERSION}/context.json',
203+
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{DANDI_SCHEMA_VERSION}/context.json',
203204
}
204205

205206

@@ -208,7 +209,7 @@ def test_asset_full_metadata_zarr(draft_asset_factory):
208209
zarr_archive = ZarrArchiveFactory.create()
209210
raw_metadata = {
210211
'foo': 'bar',
211-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
212+
'schemaVersion': DANDI_SCHEMA_VERSION,
212213
}
213214
asset: Asset = draft_asset_factory(metadata=raw_metadata, blob=None, zarr=zarr_archive)
214215

@@ -230,7 +231,7 @@ def test_asset_full_metadata_zarr(draft_asset_factory):
230231
'digest': asset.digest,
231232
# This should be injected on all zarr assets
232233
'encodingFormat': 'application/x-zarr',
233-
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{settings.DANDI_SCHEMA_VERSION}/context.json',
234+
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{DANDI_SCHEMA_VERSION}/context.json',
234235
}
235236

236237

@@ -240,7 +241,7 @@ def test_asset_full_metadata_access(
240241
):
241242
raw_metadata = {
242243
'foo': 'bar',
243-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
244+
'schemaVersion': DANDI_SCHEMA_VERSION,
244245
}
245246
embargoed_zarr_asset: Asset = draft_asset_factory(
246247
metadata=raw_metadata, blob=None, zarr=embargoed_zarr_archive_factory()
@@ -786,7 +787,7 @@ def test_asset_create_path_validation(api_client, asset_blob, path, expected_sta
786787
api_client.force_authenticate(user=user)
787788

788789
metadata = {
789-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
790+
'schemaVersion': DANDI_SCHEMA_VERSION,
790791
'encodingFormat': 'application/x-nwb',
791792
'path': path,
792793
}
@@ -813,7 +814,7 @@ def test_asset_create_conflicting_path(api_client, asset_blob):
813814
asset_blob=asset_blob,
814815
metadata={
815816
'path': 'foo/bar.txt',
816-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
817+
'schemaVersion': DANDI_SCHEMA_VERSION,
817818
},
818819
)
819820

@@ -825,7 +826,7 @@ def test_asset_create_conflicting_path(api_client, asset_blob):
825826
asset_blob=asset_blob,
826827
metadata={
827828
'path': 'foo/bar.txt/baz.txt',
828-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
829+
'schemaVersion': DANDI_SCHEMA_VERSION,
829830
},
830831
)
831832

@@ -837,7 +838,7 @@ def test_asset_create_conflicting_path(api_client, asset_blob):
837838
asset_blob=asset_blob,
838839
metadata={
839840
'path': 'foo',
840-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
841+
'schemaVersion': DANDI_SCHEMA_VERSION,
841842
},
842843
)
843844

@@ -1253,7 +1254,7 @@ def test_asset_rest_rename(api_client, asset_blob):
12531254
api_client.force_authenticate(user=user)
12541255

12551256
# Create asset
1256-
metadata = {'path': 'foo/bar', 'schemaVersion': settings.DANDI_SCHEMA_VERSION}
1257+
metadata = {'path': 'foo/bar', 'schemaVersion': DANDI_SCHEMA_VERSION}
12571258
asset = add_asset_to_version(
12581259
user=user, version=draft_version, asset_blob=asset_blob, metadata=metadata
12591260
)
@@ -1650,7 +1651,7 @@ def test_asset_rest_delete_zarr_modified(
16501651
{
16511652
'metadata': {
16521653
'path': 'sample.zarr',
1653-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
1654+
'schemaVersion': DANDI_SCHEMA_VERSION,
16541655
},
16551656
'zarr_id': zarr_archive.zarr_id,
16561657
},

‎dandiapi/api/tests/test_asset_paths.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from django.conf import settings
3+
from dandischema.consts import DANDI_SCHEMA_VERSION
44
from django.db.models import Q, QuerySet
55
import pytest
66

@@ -383,7 +383,7 @@ def test_asset_path_ordering(asset_blob):
383383
asset_blob=asset_blob,
384384
metadata={
385385
'path': 'a/z',
386-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
386+
'schemaVersion': DANDI_SCHEMA_VERSION,
387387
},
388388
)
389389
add_asset_to_version(
@@ -392,7 +392,7 @@ def test_asset_path_ordering(asset_blob):
392392
asset_blob=asset_blob,
393393
metadata={
394394
'path': 'aa/z',
395-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
395+
'schemaVersion': DANDI_SCHEMA_VERSION,
396396
},
397397
)
398398

‎dandiapi/api/tests/test_dandiset.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from urllib.parse import urlencode
66

77
from dandischema.conf import get_instance_config
8+
from dandischema.consts import DANDI_SCHEMA_VERSION
89
from django.conf import settings
910
from django.contrib.auth.models import AnonymousUser
1011
from django.utils import timezone
@@ -465,8 +466,8 @@ def test_dandiset_rest_create(api_client):
465466
f'{user.last_name}, {user.first_name} ({year}) {name} '
466467
f'(Version draft) [Data set]. DANDI Archive. {url}'
467468
),
468-
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{settings.DANDI_SCHEMA_VERSION}/context.json',
469-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
469+
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{DANDI_SCHEMA_VERSION}/context.json',
470+
'schemaVersion': DANDI_SCHEMA_VERSION,
470471
'schemaKey': 'Dandiset',
471472
'access': [{'schemaKey': 'AccessRequirements', 'status': 'dandi:OpenAccess'}],
472473
'repository': settings.DANDI_WEB_APP_URL,
@@ -548,8 +549,8 @@ def test_dandiset_rest_create_with_identifier(api_client):
548549
f'{user.last_name}, {user.first_name} ({year}) {name} '
549550
f'(Version draft) [Data set]. DANDI Archive. {url}'
550551
),
551-
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{settings.DANDI_SCHEMA_VERSION}/context.json',
552-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
552+
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{DANDI_SCHEMA_VERSION}/context.json',
553+
'schemaVersion': DANDI_SCHEMA_VERSION,
553554
'schemaKey': 'Dandiset',
554555
'access': [{'schemaKey': 'AccessRequirements', 'status': 'dandi:OpenAccess'}],
555556
'repository': settings.DANDI_WEB_APP_URL,
@@ -642,8 +643,8 @@ def test_dandiset_rest_create_with_contributor(api_client):
642643
'url': url,
643644
'dateCreated': UTC_ISO_TIMESTAMP_RE,
644645
'citation': (f'Jane Doe ({year}) {name} (Version draft) [Data set]. DANDI Archive. {url}'),
645-
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{settings.DANDI_SCHEMA_VERSION}/context.json',
646-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
646+
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{DANDI_SCHEMA_VERSION}/context.json',
647+
'schemaVersion': DANDI_SCHEMA_VERSION,
647648
'schemaKey': 'Dandiset',
648649
'access': [{'schemaKey': 'AccessRequirements', 'status': 'dandi:OpenAccess'}],
649650
'repository': settings.DANDI_WEB_APP_URL,
@@ -725,8 +726,8 @@ def test_dandiset_rest_create_embargoed(api_client):
725726
f'{user.last_name}, {user.first_name} ({year}) {name} '
726727
f'(Version draft) [Data set]. DANDI Archive. {url}'
727728
),
728-
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{settings.DANDI_SCHEMA_VERSION}/context.json',
729-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
729+
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{DANDI_SCHEMA_VERSION}/context.json',
730+
'schemaVersion': DANDI_SCHEMA_VERSION,
730731
'schemaKey': 'Dandiset',
731732
'access': [
732733
{

‎dandiapi/api/tests/test_version.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from typing import TYPE_CHECKING
66

77
from dandischema.conf import get_instance_config
8+
from dandischema.consts import DANDI_SCHEMA_VERSION
89
from dandischema.models import AccessType
910
from django.conf import settings
1011
from freezegun import freeze_time
@@ -68,7 +69,7 @@ def test_version_next_published_version_preexisting():
6869
@pytest.mark.django_db
6970
def test_draft_version_metadata_computed():
7071
draft_version = DraftVersionFactory.create()
71-
original_metadata = {'schemaVersion': settings.DANDI_SCHEMA_VERSION}
72+
original_metadata = {'schemaVersion': DANDI_SCHEMA_VERSION}
7273
draft_version.metadata = original_metadata
7374

7475
# Save the version to add computed properties to the metadata
@@ -91,7 +92,7 @@ def test_draft_version_metadata_computed():
9192
'repository': settings.DANDI_WEB_APP_URL,
9293
'dateCreated': draft_version.dandiset.created.isoformat(),
9394
'access': [{'schemaKey': 'AccessRequirements', 'status': AccessType.OpenAccess.value}],
94-
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{settings.DANDI_SCHEMA_VERSION}/context.json',
95+
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{DANDI_SCHEMA_VERSION}/context.json',
9596
'assetsSummary': {
9697
'numberOfBytes': 0,
9798
'numberOfFiles': 0,
@@ -106,7 +107,7 @@ def test_draft_version_metadata_computed():
106107
@pytest.mark.django_db
107108
def test_published_version_metadata_computed():
108109
published_version = PublishedVersionFactory.create()
109-
original_metadata = {'schemaVersion': settings.DANDI_SCHEMA_VERSION}
110+
original_metadata = {'schemaVersion': DANDI_SCHEMA_VERSION}
110111
published_version.metadata = original_metadata
111112

112113
# Save the version to add computed properties to the metadata
@@ -134,7 +135,7 @@ def test_published_version_metadata_computed():
134135
'repository': settings.DANDI_WEB_APP_URL,
135136
'dateCreated': published_version.dandiset.created.isoformat(),
136137
'access': [{'schemaKey': 'AccessRequirements', 'status': AccessType.OpenAccess.value}],
137-
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{settings.DANDI_SCHEMA_VERSION}/context.json',
138+
'@context': f'https://raw.githubusercontent.com/dandi/schema/master/releases/{DANDI_SCHEMA_VERSION}/context.json',
138139
'assetsSummary': {
139140
'numberOfBytes': 0,
140141
'numberOfFiles': 0,
@@ -555,9 +556,9 @@ def test_version_rest_update(api_client):
555556
new_metadata = {
556557
'@context': (
557558
'https://raw.githubusercontent.com/dandi/schema/master/releases/'
558-
f'{settings.DANDI_SCHEMA_VERSION}/context.json'
559+
f'{DANDI_SCHEMA_VERSION}/context.json'
559560
),
560-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
561+
'schemaVersion': DANDI_SCHEMA_VERSION,
561562
'foo': 'bar',
562563
'num': 123,
563564
'list': ['a', 'b', 'c'],
@@ -576,7 +577,7 @@ def test_version_rest_update(api_client):
576577
url = f'{settings.DANDI_WEB_APP_URL}/dandiset/{draft_version.dandiset.identifier}/draft'
577578
saved_metadata = {
578579
**new_metadata,
579-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
580+
'schemaVersion': DANDI_SCHEMA_VERSION,
580581
'manifestLocation': [
581582
f'{settings.DANDI_API_URL}/api/dandisets/{draft_version.dandiset.identifier}/versions/draft/assets/'
582583
],
@@ -646,9 +647,9 @@ def test_version_rest_update_unembargo_in_progress(api_client):
646647
new_metadata = {
647648
'@context': (
648649
'https://raw.githubusercontent.com/dandi/schema/master/releases/'
649-
f'{settings.DANDI_SCHEMA_VERSION}/context.json'
650+
f'{DANDI_SCHEMA_VERSION}/context.json'
650651
),
651-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
652+
'schemaVersion': DANDI_SCHEMA_VERSION,
652653
'num': 123,
653654
}
654655

‎dandiapi/api/tests/test_webdav.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from django.conf import settings
3+
from dandischema.consts import DANDI_SCHEMA_VERSION
44
import pytest
55

66
from dandiapi.api.models.dandiset import Dandiset
@@ -18,7 +18,7 @@ def test_asset_atpath_root_path(api_client, asset_blob):
1818
asset_blob=asset_blob,
1919
metadata={
2020
'path': 'a.txt',
21-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
21+
'schemaVersion': DANDI_SCHEMA_VERSION,
2222
},
2323
)
2424
add_asset_to_version(
@@ -27,7 +27,7 @@ def test_asset_atpath_root_path(api_client, asset_blob):
2727
asset_blob=asset_blob,
2828
metadata={
2929
'path': 'b.txt',
30-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
30+
'schemaVersion': DANDI_SCHEMA_VERSION,
3131
},
3232
)
3333

@@ -73,7 +73,7 @@ def test_asset_atpath_asset(api_client, asset_blob):
7373
asset_blob=asset_blob,
7474
metadata={
7575
'path': path,
76-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
76+
'schemaVersion': DANDI_SCHEMA_VERSION,
7777
},
7878
)
7979

@@ -140,7 +140,7 @@ def test_asset_atpath_folder(api_client, asset_blob):
140140
asset_blob=asset_blob,
141141
metadata={
142142
'path': 'foo/bar.txt',
143-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
143+
'schemaVersion': DANDI_SCHEMA_VERSION,
144144
},
145145
)
146146
add_asset_to_version(
@@ -149,7 +149,7 @@ def test_asset_atpath_folder(api_client, asset_blob):
149149
asset_blob=asset_blob,
150150
metadata={
151151
'path': 'foo/baz.txt',
152-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
152+
'schemaVersion': DANDI_SCHEMA_VERSION,
153153
},
154154
)
155155

@@ -209,7 +209,7 @@ def test_asset_atpath_trailing_slash(api_client, asset_blob):
209209
asset_blob=asset_blob,
210210
metadata={
211211
'path': 'foo',
212-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
212+
'schemaVersion': DANDI_SCHEMA_VERSION,
213213
},
214214
)
215215

@@ -237,7 +237,7 @@ def test_asset_atpath_path_missing(api_client, asset_blob):
237237
asset_blob=asset_blob,
238238
metadata={
239239
'path': 'foo/bar.txt',
240-
'schemaVersion': settings.DANDI_SCHEMA_VERSION,
240+
'schemaVersion': DANDI_SCHEMA_VERSION,
241241
},
242242
)
243243

0 commit comments

Comments
 (0)