From 3d87fa41a6504507272d6a446728602a80046ae3 Mon Sep 17 00:00:00 2001 From: Paloma Martinez <104762252+paloma-martinez@users.noreply.github.com> Date: Wed, 16 Apr 2025 13:55:45 +0200 Subject: [PATCH 1/2] update python-package and typing check CI --- .github/workflows/python-package.yml | 6 +++--- .github/workflows/typing-check.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6529c9197..456fddd20 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -34,7 +34,7 @@ jobs: echo "This is not a Pull-Request, skipping" build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false max-parallel: 3 @@ -43,10 +43,10 @@ jobs: package-name: ["geos-ats", "geos-mesh", "geos-posp", "geos-timehistory", "geos-trame", "geos-utils", "geos-xml-tools", "geos-xml-viewer", "hdf5-wrapper", "pygeos-tools"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: mpi4py/setup-mpi@v1 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' diff --git a/.github/workflows/typing-check.yml b/.github/workflows/typing-check.yml index 553404730..9675e778f 100644 --- a/.github/workflows/typing-check.yml +++ b/.github/workflows/typing-check.yml @@ -10,7 +10,7 @@ concurrency: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false max-parallel: 3 @@ -19,10 +19,10 @@ jobs: package-name: ["geos-geomechanics", "geos-posp", "geos-timehistory", "geos-utils", "geos-xml-tools", "hdf5-wrapper"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: mpi4py/setup-mpi@v1 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.10" cache: 'pip' From 227b53495eba5e4aa8c33f44b510261b62c3c5a6 Mon Sep 17 00:00:00 2001 From: Paloma Martinez <104762252+paloma-martinez@users.noreply.github.com> Date: Wed, 16 Apr 2025 15:16:20 +0200 Subject: [PATCH 2/2] Fixing typo in CI typing check --- .github/workflows/typing-check.yml | 2 +- geos-geomechanics/src/geos/geomechanics/model/MohrCircle.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/typing-check.yml b/.github/workflows/typing-check.yml index 9675e778f..1ac277103 100644 --- a/.github/workflows/typing-check.yml +++ b/.github/workflows/typing-check.yml @@ -40,4 +40,4 @@ jobs: - name: Format and linting check with ruff # working-directory: ./${{ matrix.package-name }} run: | - python -m ruff check --config .ruff.toml ./geos-utils + python -m ruff check --config .ruff.toml ./${{ matrix.package-name }} \ No newline at end of file diff --git a/geos-geomechanics/src/geos/geomechanics/model/MohrCircle.py b/geos-geomechanics/src/geos/geomechanics/model/MohrCircle.py index f1abab3c5..a917c3de5 100644 --- a/geos-geomechanics/src/geos/geomechanics/model/MohrCircle.py +++ b/geos-geomechanics/src/geos/geomechanics/model/MohrCircle.py @@ -38,7 +38,6 @@ p1, p2, p3 :float = mohrCircle.getPrincipalComponents() radius :float = mohrCircle.getCircleRadius() center :float = mohrCircle.getCircleCenter() - """