diff --git a/.github/workflows/buildAndUploadPyPi.yml b/.github/workflows/buildAndUploadPyPi.yml index 7b9bc757c..c70b57972 100644 --- a/.github/workflows/buildAndUploadPyPi.yml +++ b/.github/workflows/buildAndUploadPyPi.yml @@ -13,8 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # macos-13 is an intel runner, macos-14 is apple silicon - os: [ ubuntu-latest, windows-latest, macos-14 ] + os: [ ubuntu-latest, windows-latest, macos-latest ] # os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-14] steps: diff --git a/avaframe/in3Utils/geoTrans.py b/avaframe/in3Utils/geoTrans.py index 15860c00c..c813bbae3 100644 --- a/avaframe/in3Utils/geoTrans.py +++ b/avaframe/in3Utils/geoTrans.py @@ -1753,8 +1753,8 @@ def snapPtsToLine(dbData, projstr, lineName, pointsList): """ for pt in pointsList: - dbData[pt + "_" + projstr + "_snapped"] = np.empty(len(dbData)) - dbData["distanceXY"] = np.empty(len(dbData)) + # object dtype as the column holds shapely points + dbData[pt + "_" + projstr + "_snapped"] = np.empty(len(dbData), dtype=object) for index, row in dbData.iterrows(): xycoor = np.asarray(dbData.loc[index, ("%s_%s_resampled" % (lineName, projstr))].coords.xy) diff --git a/avaframe/tests/test_aimecTools.py b/avaframe/tests/test_aimecTools.py index c3b8e006c..011ecc061 100644 --- a/avaframe/tests/test_aimecTools.py +++ b/avaframe/tests/test_aimecTools.py @@ -188,8 +188,8 @@ def test_analyzeDiffsRunoutLines(tmp_path): resAnalysisDF = pd.DataFrame( data={ "runoutLineDiff_line": [np.nan], - "runoutLineDiff_line_pointsNotFoundInSim": [np.nan], - "runoutLineDiff_line_pointsNotFoundInRef": [np.nan], + "runoutLineDiff_line_pointsNotFoundInSim": [""], + "runoutLineDiff_line_pointsNotFoundInRef": [""], "runoutLineDiff_line_RMSE": [np.nan], "simName": ["simA"], }