From e4424fdff2387aa6a54e6011ca9d7bfbc17b2e01 Mon Sep 17 00:00:00 2001 From: Stefanie Molin <24376333+stefmolin@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:52:24 -0400 Subject: [PATCH] Address numpy 2.0 warning and fix codecov v4 setup (#227) * Address numpy 2.0 warning: https://github.com/numpy/numpy/issues/26620 * Address issue with codecov uploading: https://github.com/codecov/codecov-action/issues/1274 --- .github/workflows/ci.yml | 4 +++- src/data_morph/shapes/bases/line_collection.py | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ce3e967..74aaaefc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,4 +69,6 @@ jobs: run: pytest - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v4.6.0 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/src/data_morph/shapes/bases/line_collection.py b/src/data_morph/shapes/bases/line_collection.py index 2f91fc2f..41af66b9 100644 --- a/src/data_morph/shapes/bases/line_collection.py +++ b/src/data_morph/shapes/bases/line_collection.py @@ -86,8 +86,10 @@ def distance(self, x: Number, y: Number) -> float: ) # row-wise cross products of 2D vectors - perpendicular_distance_component = np.cross( - point - start_points, normalized_tangent_vectors + diff = point - start_points + perpendicular_distance_component = ( + diff[..., 0] * normalized_tangent_vectors[..., 1] + - diff[..., 1] * normalized_tangent_vectors[..., 0] ) return np.min(