From 9f8c8ab9623935efb95e16744b97a93a61d4e9a0 Mon Sep 17 00:00:00 2001 From: jlbegin Date: Wed, 24 Dec 2025 10:11:58 -0500 Subject: [PATCH 1/3] Update tests.yaml --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 296fa88c..d902991b 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13, macos-latest, windows-latest] + os: [ubuntu-latest, macos-15-intel, macos-latest, windows-latest] python-version: ["3.9", "3.13"] include: From fce3dc80b26d961ea7b6e7815a16364d967fd000 Mon Sep 17 00:00:00 2001 From: jlbegin Date: Wed, 24 Dec 2025 10:24:25 -0500 Subject: [PATCH 2/3] Update testCLFresnel.py --- pytissueoptics/rayscattering/tests/opencl/src/testCLFresnel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytissueoptics/rayscattering/tests/opencl/src/testCLFresnel.py b/pytissueoptics/rayscattering/tests/opencl/src/testCLFresnel.py index afcaef63..dbc09bb7 100644 --- a/pytissueoptics/rayscattering/tests/opencl/src/testCLFresnel.py +++ b/pytissueoptics/rayscattering/tests/opencl/src/testCLFresnel.py @@ -169,7 +169,7 @@ def _getReflectionCoefficient(self, rayDirection: Vector) -> float: N=N, arguments=[np.float32(self.n1), np.float32(self.n2), np.float32(thetaIn), coefficientBuffer], ) - return float(self.program.getData(coefficientBuffer)[0]) + return float(self.program.getData(coefficientBuffer)[0][0]) def _getFresnelResult(self, fresnelBuffer) -> FresnelResult: fresnelIntersection = self.program.getData(fresnelBuffer)[0] From 04be695a2c843c35758c12c355456b520c7b4dcb Mon Sep 17 00:00:00 2001 From: jlbegin Date: Wed, 24 Dec 2025 10:34:51 -0500 Subject: [PATCH 3/3] Update testScatteringScene.py --- .../rayscattering/tests/testScatteringScene.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pytissueoptics/rayscattering/tests/testScatteringScene.py b/pytissueoptics/rayscattering/tests/testScatteringScene.py index 739eedbc..2910aeef 100644 --- a/pytissueoptics/rayscattering/tests/testScatteringScene.py +++ b/pytissueoptics/rayscattering/tests/testScatteringScene.py @@ -1,6 +1,5 @@ import math import unittest -from unittest.mock import patch from mockito import mock, verify, when @@ -11,12 +10,6 @@ from pytissueoptics.scene.viewer import Abstract3DViewer -def patchMayaviShow(func): - for module in ["show", "gcf", "figure", "clf", "triangular_mesh"]: - func = patch("mayavi.mlab." + module)(func) - return func - - class TestScatteringScene(unittest.TestCase): def testWhenAddingASolidWithAScatteringMaterial_shouldAddSolidToTheScene(self): scene = ScatteringScene([Cuboid(1, 1, 1, material=ScatteringMaterial())]) @@ -37,13 +30,6 @@ def testWhenAddToViewer_shouldAddAllSolidsToViewer(self): verify(viewer).add(*scene.solids, ...) - @patchMayaviShow - def testWhenShow_shouldShowInside3DViewer(self, mockShow, *args): - scene = ScatteringScene([Cuboid(1, 1, 1, material=ScatteringMaterial())]) - scene.show() - - mockShow.assert_called_once() - def testShouldHaveIPPEstimationUsingMeanAlbedoInInfiniteMedium(self): material1 = ScatteringMaterial(mu_s=1, mu_a=0.7, g=0.9) material2 = ScatteringMaterial(mu_s=8, mu_a=1, g=0.9)