specify delocate==0.10

- until matthew-brett/delocate#214 is fixed
themachinethatgoesping · Jul 5, 2024 · df8abe0 · df8abe0
1 parent c96cd6d
commit df8abe0
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/subprojects/echosounders b/subprojects/echosounders
diff --git a/subprojects/gridding b/subprojects/gridding
diff --git a/subprojects/meta b/subprojects/meta
diff --git a/subprojects/navigation b/subprojects/navigation
diff --git a/subprojects/pingprocessing b/subprojects/pingprocessing
diff --git a/subprojects/tools b/subprojects/tools