diff --git a/.github/workflows/docs_deployment.yaml b/.github/workflows/docs_deployment.yaml index f63343554..7d4015a76 100644 --- a/.github/workflows/docs_deployment.yaml +++ b/.github/workflows/docs_deployment.yaml @@ -49,7 +49,7 @@ jobs: - name: Build Docs run: cd ./docs; make html - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: path: './docs/build/html' - name: Deploy to GitHub Pages diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index ba90aa8b6..7672341a2 100644 --- a/.github/workflows/testing.yaml +++ b/.github/workflows/testing.yaml @@ -20,7 +20,7 @@ jobs: os: - ubuntu-latest python-version: - - "3.10" + - "3.12" - "3.11" runs-on: ${{ matrix.os }} steps: @@ -85,7 +85,7 @@ jobs: os: - ubuntu-latest python-version: - - "3.10" + - "3.12" - "3.11" runs-on: ${{ matrix.os }} steps: @@ -136,7 +136,7 @@ jobs: os: - ubuntu-latest python-version: - - "3.10" + - "3.12" - "3.11" runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/testing_integration.yaml b/.github/workflows/testing_integration.yaml index 2c42a17db..4f65b883f 100644 --- a/.github/workflows/testing_integration.yaml +++ b/.github/workflows/testing_integration.yaml @@ -13,8 +13,8 @@ jobs: os: - ubuntu-latest python-version: - - "3.10" - "3.11" + - "3.12" runs-on: ${{ matrix.os }} steps: - name: Get token from Github App diff --git a/tests/unit/layer/test_layer_set.py b/tests/unit/layer/test_layer_set.py index 76ddae1f0..6b9fd25a7 100644 --- a/tests/unit/layer/test_layer_set.py +++ b/tests/unit/layer/test_layer_set.py @@ -10,8 +10,8 @@ def test_read(mocker): idx = mocker.MagicMock() result = layer_set[idx] assert result == {"a": "a", "b": "b"} - layer_a.read_with_procs.called_with(idx=idx) - layer_b.read_with_procs.called_with(idx=idx) + layer_a.read_with_procs.assert_called_with(idx) + layer_b.read_with_procs.assert_called_with(idx) def test_write(mocker): @@ -22,5 +22,5 @@ def test_write(mocker): layer_set = build_layer_set(layers={"a": layer_a, "b": layer_b}) idx = mocker.MagicMock() layer_set[idx] = {"a": 1, "b": 2} - layer_a.write_with_procs.called_with(idx=idx, data=1) - layer_b.write_with_procs.called_with(idx=idx, data=2) + layer_a.write_with_procs.assert_called_with(idx, 1) + layer_b.write_with_procs.assert_called_with(idx, 2) diff --git a/tests/unit/layer/volumetric/test_layer_set.py b/tests/unit/layer/volumetric/test_layer_set.py index 8eb39035b..f362e58c4 100644 --- a/tests/unit/layer/volumetric/test_layer_set.py +++ b/tests/unit/layer/volumetric/test_layer_set.py @@ -13,8 +13,8 @@ def test_read(mocker): idx = VolumetricIndex(bbox=BBox3D(bounds=((0, 1), (0, 1), (0, 1))), resolution=Vec3D(1, 1, 1)) result = layer_set[idx] assert result == {"a": np.array([1]), "b": np.array([2])} - layer_a.read_with_procs.called_with(idx=idx) - layer_b.read_with_procs.called_with(idx=idx) + layer_a.read_with_procs.assert_called_with(idx) + layer_b.read_with_procs.assert_called_with(idx) def test_write(mocker): @@ -25,5 +25,5 @@ def test_write(mocker): layer_set = build_volumetric_layer_set(layers={"a": layer_a, "b": layer_b}) idx = VolumetricIndex(bbox=BBox3D(bounds=((0, 1), (0, 1), (0, 1))), resolution=Vec3D(1, 1, 1)) layer_set[idx] = {"a": 1, "b": 2} - layer_a.write_with_procs.called_with(idx=idx, data=1) - layer_b.write_with_procs.called_with(idx=idx, data=2) + layer_a.write_with_procs.assert_called_with(idx, 1) + layer_b.write_with_procs.assert_called_with(idx, 2) diff --git a/zetta_utils/internal b/zetta_utils/internal index 75b4f829e..313e60c3e 160000 --- a/zetta_utils/internal +++ b/zetta_utils/internal @@ -1 +1 @@ -Subproject commit 75b4f829ec0f23e6cd8ae479ad04dda04d759560 +Subproject commit 313e60c3ec75e6c9777f1598681c613231af48bf