Merge branch 'devel' into Issue956_NCAMWrongSide

ToFuProject · Sep 5, 2024 · bab1f89 · bab1f89
2 parents bca4448 + c5ff23b
commit bab1f89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/test-complete-matrix.yml b/.github/workflows/test-complete-matrix.yml
@@ -13,11 +13,14 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-latest] 
         python-version: ['3.8', '3.9', '3.10']
         include:
           - python-version: '3.7.11'
             os: ubuntu-20.04
+        exclude:
+          - python-version: '3.10'
+            os: windows-latest
 
     steps:
     - uses: actions/checkout@v2

diff --git a/tofu/geom/_core.py b/tofu/geom/_core.py
@@ -5240,7 +5240,7 @@ def _prepare_inputs_kInOut(self, D=None, u=None, indStruct=None):
                 else:
                     num_tot_structs += len(ss.Lim)
 
-            lsnvert = np.asarray(lsnvert, dtype=int)
+            lsnvert = np.asarray(lsnvert, dtype=np.int_)
             lSPolyx = np.asarray(lSPolyx)
             lSPolyy = np.asarray(lSPolyy)
             lSVInx = np.asarray(lSVInx)
@@ -5252,7 +5252,7 @@ def _prepare_inputs_kInOut(self, D=None, u=None, indStruct=None):
                         lstruct_polyx=lSPolyx,
                         lstruct_polyy=lSPolyy,
                         lstruct_lims=lSLim,
-                        lstruct_nlim=np.asarray(lSnLim, dtype=int),
+                        lstruct_nlim=np.asarray(lSnLim, dtype=np.int_),
                         lstruct_normx=lSVInx,
                         lstruct_normy=lSVIny,
                         lnvert=lsnvert,