Skip to content

Test fixes #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RussTorres merged 3 commits into from
Mar 20, 2025
Merged

Test fixes #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e342c4
test: use imagepyramid in test_imagepyramid
RussTorres Mar 20, 2025
50db212
test: update to imagepyramid
RussTorres Mar 20, 2025
5d7e85b
transform: update to new numpy.linalg error method
RussTorres Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions integration_tests/test_stack_integrated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def render():

@pytest.fixture
def simpletilespec():
mml = renderapi.image_pyramid.MipMapLevel(0, '/not/a/path.jpg')
mm = renderapi.image_pyramid.MipMap(imageUrl='file://not/a/path.jpg')
ip = renderapi.image_pyramid.ImagePyramid({0: mm})
tform = renderapi.transform.AffineModel(labels=['simple'])
layout = renderapi.tilespec.Layout(sectionId="section0",
scopeId="testscope",
Expand All @@ -45,7 +46,7 @@ def simpletilespec():
ts = renderapi.tilespec.TileSpec(tileId="1000",
width=2048,
height=2048,
mipMapLevels=[mml],
imagePyramid=ip,
z=0,
tforms=[tform],
layout=layout)
Expand Down
4 changes: 2 additions & 2 deletions renderapi/transform/leaf/polynomial_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
logger.info(e)
logger.info('scipy-based linalg may or may not lead '
'to better parameter fitting')
from numpy.linalg import svd
from numpy.linalg.linalg import LinAlgError
from numpy.linalg import svd, LinAlgError

__all__ = [
'Polynomial2DTransform', 'NonLinearCoordinateTransform',
'NonLinearTransform', 'LensCorrection']
Expand Down
14 changes: 8 additions & 6 deletions test/test_imagepyramid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,20 @@ def test_pyramid_deserialize():


def test_mipmaplevel_deprecated():
mml = image_pyramid.MipMapLevel(0,
imageUrl=image_filename,
maskUrl=mask_filename)
with pytest.deprecated_call():
mml = image_pyramid.MipMapLevel(
0,
imageUrl=image_filename,
maskUrl=mask_filename)
assert(mml['imageUrl'] == image_filename)
assert(mml['maskUrl'] == mask_filename)
with pytest.raises(KeyError):
mml['not_a_key']

assert(mml == mml)

mml2 = image_pyramid.MipMapLevel(0,
imageUrl=image_filename)
with pytest.deprecated_call():
mml2 = image_pyramid.MipMapLevel(0,
imageUrl=image_filename)
assert(mml != mml2)
assert(len([k for k, v in mml]) == 2)

Expand Down