Skip to content

Commit b4de0da

Browse files
dsotirho-ucscdsotirho-ucsc
committed
Remove files.version from HCA response (#6793)
1 parent 4ef3ad2 commit b4de0da

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

‎src/azul/plugins/metadata/hca/service/response.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@ def make_file(self, file: JSON) -> JSON:
411411
'size': file.get('size'),
412412
'fileSource': file.get('file_source'),
413413
self.plugin.special_fields.file_uuid.name_in_hit: file.get('uuid'),
414-
'version': file.get('version'),
415414
'matrixCellCount': file.get('matrix_cell_count'),
416415
'drs_uri': file.get('drs_uri'),
417416
'azul_url': self._file_url(uuid=json_str(file['uuid']),

‎test/service/test_response.py‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ def test_response_stage_files(self):
244244
f'?catalog=test&version=2018-11-02T11%3A33%3A44.698028Z',
245245
'drs_uri': f'drs://{self._drs_domain_name}/'
246246
f'7b07f99e-4a8a-4ad0-bd4f-db0d7a00c7bb?version=2018-11-02T11%3A33%3A44.698028Z',
247-
'uuid': '7b07f99e-4a8a-4ad0-bd4f-db0d7a00c7bb',
248-
'version': '2018-11-02T11:33:44.698028Z'
247+
'uuid': '7b07f99e-4a8a-4ad0-bd4f-db0d7a00c7bb'
249248
}
250249
],
251250
'organoids': [
@@ -997,8 +996,7 @@ def test_response_stage_files_file(self):
997996
f'?catalog=test&version=2019-10-09T17%3A22%3A51.560099Z',
998997
'drs_uri': f'drs://{self._drs_domain_name}/'
999998
f'a8b8479d-cfa9-4f74-909f-49552439e698?version=2019-10-09T17%3A22%3A51.560099Z',
1000-
'uuid': 'a8b8479d-cfa9-4f74-909f-49552439e698',
1001-
'version': '2019-10-09T17:22:51.560099Z'
999+
'uuid': 'a8b8479d-cfa9-4f74-909f-49552439e698'
10021000
}
10031001
file = one(one(response['hits'])['files'])
10041002
self.assertElasticEqual(file, expected_file)
@@ -2964,7 +2962,6 @@ def test_matrices_tree(self):
29642962
'fileSource': 'DCP/2 Analysis',
29652963
'matrixCellCount': None,
29662964
'uuid': 'bd98f428-881e-501a-ac16-24f27a68ce2f',
2967-
'version': '2021-02-11T23:11:45.000000Z',
29682965
'contentDescription': ['Count Matrix'],
29692966
'format': 'loom',
29702967
'isIntermediate': False,
@@ -2996,7 +2993,6 @@ def test_matrices_tree(self):
29962993
'fileSource': 'DCP/1 Matrix Service',
29972994
'matrixCellCount': None,
29982995
'uuid': '538faa28-3235-5e4b-a998-5672e2d964e8',
2999-
'version': '2020-12-03T10:39:17.144517Z',
30002996
'contentDescription': ['Matrix'],
30012997
'format': 'zip',
30022998
'isIntermediate': False,
@@ -3018,7 +3014,6 @@ def test_matrices_tree(self):
30183014
'fileSource': 'DCP/1 Matrix Service',
30193015
'matrixCellCount': None,
30203016
'uuid': '6c142250-567c-5b63-bd4f-0d78499863f8',
3021-
'version': '2020-12-03T10:39:17.144517Z',
30223017
'contentDescription': ['Matrix'],
30233018
'format': 'zip',
30243019
'isIntermediate': False,
@@ -3040,7 +3035,6 @@ def test_matrices_tree(self):
30403035
'fileSource': 'DCP/1 Matrix Service',
30413036
'matrixCellCount': None,
30423037
'uuid': '8d2ba1c1-bc9f-5c2a-a74d-fe5e09bdfb18',
3043-
'version': '2020-12-03T10:39:17.144517Z',
30443038
'contentDescription': ['Matrix'],
30453039
'format': 'loom',
30463040
'isIntermediate': False,
@@ -3081,7 +3075,6 @@ def test_matrices_tree(self):
30813075
'fileSource': 'ArrayExpress',
30823076
'matrixCellCount': None,
30833077
'uuid': '87f31102-ebbc-5875-abdf-4fa5cea48e8d',
3084-
'version': '2021-02-10T16:56:40.419579Z',
30853078
'contentDescription': ['Matrix'],
30863079
'format': 'zip',
30873080
'isIntermediate': False,
@@ -3103,7 +3096,6 @@ def test_matrices_tree(self):
31033096
'fileSource': 'ArrayExpress',
31043097
'matrixCellCount': None,
31053098
'uuid': '733318e0-19c2-51e8-9ad6-d94ad562dd46',
3106-
'version': '2021-02-10T16:56:40.419579Z',
31073099
'contentDescription': ['Matrix'],
31083100
'format': 'zip',
31093101
'isIntermediate': False,
@@ -3125,7 +3117,6 @@ def test_matrices_tree(self):
31253117
'fileSource': 'ArrayExpress',
31263118
'matrixCellCount': None,
31273119
'uuid': 'c59e2de5-01fe-56eb-be56-679ed14161bf',
3128-
'version': '2021-02-10T16:56:40.419579Z',
31293120
'contentDescription': ['Matrix'],
31303121
'format': 'zip',
31313122
'isIntermediate': False,
@@ -3147,7 +3138,6 @@ def test_matrices_tree(self):
31473138
'fileSource': 'ArrayExpress',
31483139
'matrixCellCount': None,
31493140
'uuid': '68bda896-3b3e-5f2a-9212-f4030a0f37e2',
3150-
'version': '2021-02-10T16:56:40.419579Z',
31513141
'contentDescription': ['Matrix'],
31523142
'format': 'zip',
31533143
'isIntermediate': False,
@@ -3169,7 +3159,6 @@ def test_matrices_tree(self):
31693159
'fileSource': 'ArrayExpress',
31703160
'matrixCellCount': None,
31713161
'uuid': '0c5ab869-da2d-5c11-b4ae-f978a052899f',
3172-
'version': '2021-02-10T16:56:40.419579Z',
31733162
'contentDescription': ['Matrix'],
31743163
'format': 'zip',
31753164
'isIntermediate': False,
@@ -3191,7 +3180,6 @@ def test_matrices_tree(self):
31913180
'fileSource': 'ArrayExpress',
31923181
'matrixCellCount': None,
31933182
'uuid': 'cade4593-bfba-56ed-80ab-080d0de7d5a4',
3194-
'version': '2021-02-10T16:56:40.419579Z',
31953183
'contentDescription': ['Matrix'],
31963184
'format': 'zip',
31973185
'isIntermediate': False,
@@ -3213,7 +3201,6 @@ def test_matrices_tree(self):
32133201
'fileSource': 'ArrayExpress',
32143202
'matrixCellCount': None,
32153203
'uuid': '5b465aad-0981-5152-b468-e615e20f5884',
3216-
'version': '2021-02-10T16:56:40.419579Z',
32173204
'contentDescription': ['Matrix'],
32183205
'format': 'zip',
32193206
'isIntermediate': False,
@@ -3235,7 +3222,6 @@ def test_matrices_tree(self):
32353222
'fileSource': 'HCA Release',
32363223
'matrixCellCount': None,
32373224
'uuid': 'b905c8be-2e2d-592c-8481-3eb7a87c6484',
3238-
'version': '2021-02-10T16:56:40.419579Z',
32393225
'contentDescription': ['Matrix'],
32403226
'format': 'csv',
32413227
'isIntermediate': False,
@@ -3785,7 +3771,6 @@ def test_contributed_analyses_matrix(self):
37853771
'size': 107958959,
37863772
'fileSource': None,
37873773
'uuid': '780846a0-dbc5-4bdc-ab3a-0da14b3ed551',
3788-
'version': '2022-07-26T00:16:47.748000Z',
37893774
'matrixCellCount': None,
37903775
'drs_uri': 'drs://data.terra.bio/v1'
37913776
'_541cc0bb-c54f-4a7e-8cdd-1a70cbd2f20c'

0 commit comments

Comments
 (0)