Skip to content

Commit

Permalink
Merge pull request #1476 from girder/multi-axes
Browse files Browse the repository at this point in the history
Allow alternate name axes in the multi source schema
  • Loading branch information
manthey authored Mar 18, 2024
2 parents d60f719 + 8934cf9 commit ee305f9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Bug Fixes
- Fix an issue with single band on multi source with non uniform sources ([#1474](../../pull/1474))
- Allow alternate name axes in the multi source schema ([#1475](../../pull/1475))

## 1.27.4

Expand Down
2 changes: 1 addition & 1 deletion sources/multi/large_image_source_multi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

SourceEntrySchema = {
'type': 'object',
'additionalProperties': False,
'additionalProperties': True,
'properties': {
'name': {'type': 'string'},
'description': {'type': 'string'},
Expand Down
8 changes: 5 additions & 3 deletions test/test_source_multi.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,12 @@ def testTilesFromMultiString():


def testTilesFromNonschemaMultiString():
sourceString = json.dumps({'sources': [{
'sourceName': 'test', 'path': '__none__',
sourceString = json.dumps({
'sources': [{
'sourceName': 'test', 'path': '__none__',
'params': {'sizeX': 10000, 'sizeY': 10000}}],
'notAKnownKey': 'X',
'params': {'sizeX': 10000, 'sizeY': 10000}}]})
})
with pytest.raises(large_image.exceptions.TileSourceError):
large_image_source_multi.open(sourceString)

Expand Down

0 comments on commit ee305f9

Please sign in to comment.