diff --git a/.github/workflows/python-package-mac.yml b/.github/workflows/python-package-mac.yml index 4b5e6ce3..0bce2ce5 100644 --- a/.github/workflows/python-package-mac.yml +++ b/.github/workflows/python-package-mac.yml @@ -56,19 +56,19 @@ jobs: include: - os: "macos-11" arch: "arch -x86_64" - deployment_target: "11.0" + deployment_target: "12.0" - os: "macos-12" arch: "arch -x86_64" - deployment_target: "12.0" + deployment_target: "13.0" - os: "macos-13" arch: "arch -x86_64" - deployment_target: "13.0" + deployment_target: "14.0" # - os: "macos-14" # arch: "arch -arm64" # deployment_target: "14.0" - env: - MACOSX_DEPLOYMENT_TARGET: ${{ matrix.deployment_target }} + #env: + # MACOSX_DEPLOYMENT_TARGET: ${{ matrix.deployment_target }} steps: - name: Echo MACOSX_DEPLOYMENT_TARGET @@ -81,7 +81,7 @@ jobs: python-version: ${{matrix.python-version}} - name: Checkout main repository - uses: actions/checkout@v4 + uses: actions/checkout@v4 with: submodules: recursive lfs: false @@ -103,7 +103,7 @@ jobs: - name: Install dependencies (pip) run: | ${{matrix.arch}} pip install --upgrade pip - ${{matrix.arch}} pip install meson meson-python ninja pytest twine wheel delocate + ${{matrix.arch}} pip install meson meson-python ninja pytest twine wheel delocate==0.10 ${{matrix.arch}} pip install -r requirements.txt - name: Debug pip diff --git a/python/stubs/themachinethatgoesping/gridding/forwardgridder.py b/python/stubs/themachinethatgoesping/gridding/forwardgridder.py index 8d279d80..0d9bc764 100644 --- a/python/stubs/themachinethatgoesping/gridding/forwardgridder.py +++ b/python/stubs/themachinethatgoesping/gridding/forwardgridder.py @@ -3,8 +3,8 @@ Simple gridder class that can create quantitative 3D images from x,z,y,val from some custom data. """ from __future__ import annotations -import numpy as np import numpy +import numpy as np from themachinethatgoesping.gridding.functions import gridfunctions as grdf import typing __all__ = ['ArrayLike', 'ForwardGridder', 'grdf', 'np'] diff --git a/python/stubs/themachinethatgoesping/pingprocessing/watercolumn/helper/make_image_helper.py b/python/stubs/themachinethatgoesping/pingprocessing/watercolumn/helper/make_image_helper.py index 13104107..e4553b49 100644 --- a/python/stubs/themachinethatgoesping/pingprocessing/watercolumn/helper/make_image_helper.py +++ b/python/stubs/themachinethatgoesping/pingprocessing/watercolumn/helper/make_image_helper.py @@ -1,6 +1,6 @@ from __future__ import annotations -import numpy as np import numpy +import numpy as np from themachinethatgoesping.algorithms import geoprocessing as gp import themachinethatgoesping.algorithms.geoprocessing.datastructures from themachinethatgoesping import echosounders as es diff --git a/subprojects/algorithms b/subprojects/algorithms index af5d9add..2a21b952 160000 --- a/subprojects/algorithms +++ b/subprojects/algorithms @@ -1 +1 @@ -Subproject commit af5d9add5ad5a48027757f6cd5648ecf574643d7 +Subproject commit 2a21b9522e96550022e9b4b1e3011988aade6c5a diff --git a/subprojects/echosounders b/subprojects/echosounders index 6872f4e4..14603e13 160000 --- a/subprojects/echosounders +++ b/subprojects/echosounders @@ -1 +1 @@ -Subproject commit 6872f4e410119bba31394c766253cb42e210c765 +Subproject commit 14603e13f506985d5104079d95e65f2b051a2c89 diff --git a/subprojects/gridding b/subprojects/gridding index dec89795..89c0f1db 160000 --- a/subprojects/gridding +++ b/subprojects/gridding @@ -1 +1 @@ -Subproject commit dec89795dcd0d4cd1df056d5bb717cdce48a12bb +Subproject commit 89c0f1db24ab7e6d46c69a4fb9863db2b2f06054 diff --git a/subprojects/meta b/subprojects/meta index c78e99b6..b16bc3f3 160000 --- a/subprojects/meta +++ b/subprojects/meta @@ -1 +1 @@ -Subproject commit c78e99b618e3d0fc5c35b628ce4cd9389cd3e143 +Subproject commit b16bc3f3cdc7d6ad9bb3a1dd2eaee32e9a7ed054 diff --git a/subprojects/navigation b/subprojects/navigation index bc1b7c3c..38ed5d6e 160000 --- a/subprojects/navigation +++ b/subprojects/navigation @@ -1 +1 @@ -Subproject commit bc1b7c3c908ca6374086e4118506f75fe37fd43c +Subproject commit 38ed5d6ef082d83f78c325a6875d5438e953c97f diff --git a/subprojects/pingprocessing b/subprojects/pingprocessing index 56d5c69e..10c2eebe 160000 --- a/subprojects/pingprocessing +++ b/subprojects/pingprocessing @@ -1 +1 @@ -Subproject commit 56d5c69e65dc46d294a1b848799598b34d766b56 +Subproject commit 10c2eebe5b6a12fa23f86c694675a9711721a8a6 diff --git a/subprojects/tools b/subprojects/tools index b2ec3a82..5a6ecfa5 160000 --- a/subprojects/tools +++ b/subprojects/tools @@ -1 +1 @@ -Subproject commit b2ec3a82433c4abdc64b0c5b096ae2fe73c0da53 +Subproject commit 5a6ecfa5481487bf0d666656a0ea58065caac0c5