From e223482cf7a735f606f2fdee5a1680aaad91ee29 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 04:26:22 +0000 Subject: [PATCH 01/12] chore(master): release 1.6.1 --- CHANGELOG.md | 15 +++++++++++++++ LoopStructural/version.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82585ca2..0b5b495b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [1.6.1](https://github.com/Loop3D/LoopStructural/compare/v1.6.0...v1.6.1) (2024-08-05) + + +### Bug Fixes + +* adding inequality pairs ([ce33ac9](https://github.com/Loop3D/LoopStructural/commit/ce33ac9914d04550192fe621070e3b1b19e7038b)) +* adding loopsolver optional depencency + admm solver option ([26edd3f](https://github.com/Loop3D/LoopStructural/commit/26edd3fa8ee7de429a7cd3682f030dfebf79f40b)) +* adding offset to fault ([b75df73](https://github.com/Loop3D/LoopStructural/commit/b75df73410f2a2662ef90cfb0b15e2413acc7d00)) +* adding omf export ([d03949e](https://github.com/Loop3D/LoopStructural/commit/d03949e109c2d2c3ed35c4b3dcd7893f18179494)) +* linting ([0e75342](https://github.com/Loop3D/LoopStructural/commit/0e75342788624a691755a889db7293b39308eb3c)) +* linting ([ad3bb55](https://github.com/Loop3D/LoopStructural/commit/ad3bb5540dd5a232fd014b8131ffdc4429b6d649)) +* linting ([0d7a052](https://github.com/Loop3D/LoopStructural/commit/0d7a0522bc706f2018bdd642cb2f28db303fd057)) +* rename properties_cell to cell_properties and properties_vertex to properties for the structured grid ([4368eb6](https://github.com/Loop3D/LoopStructural/commit/4368eb60f7e2f170782a91cc6003159fdd98875b)) +* updating point/surface export and constructor ([6b74cfd](https://github.com/Loop3D/LoopStructural/commit/6b74cfd5d5edda5769653be9e3bc3d9dd6cb4415)) + ## [1.6.0](https://github.com/Loop3D/LoopStructural/compare/v1.5.13...v1.6.0) (2024-06-07) diff --git a/LoopStructural/version.py b/LoopStructural/version.py index e4adfb83..f49459c7 100644 --- a/LoopStructural/version.py +++ b/LoopStructural/version.py @@ -1 +1 @@ -__version__ = "1.6.0" +__version__ = "1.6.1" From ff1d17d3f92645b8749583c4794ce26ff482654c Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Mon, 5 Aug 2024 15:06:35 +1000 Subject: [PATCH 02/12] ci: adding python version to conda build config --- .github/workflows/release-please.yml | 9 ++------- conda/conda_build_config.yaml | 8 +++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 91f3c6a8..8c2dc632 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -99,12 +99,10 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest"] - python-version: ${{ fromJSON(vars.PYTHON_VERSIONS)}} steps: - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true - python-version: ${{ matrix.python-version }} - uses: actions/checkout@v4 - name: update submodules @@ -116,14 +114,13 @@ jobs: ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }} shell: bash -l {0} run: | - conda install -c conda-forge conda-build scikit-build numpy cython anaconda-client -y + conda install -c conda-forge conda-build scikit-build numpy cython anaconda-client -y conda build -c anaconda -c conda-forge -c loop3d --output-folder conda conda conda convert -p all conda/linux-64/*.tar.bz2 -f -o conda - conda install anaconda-client -y - name: upload artifacts uses: actions/upload-artifact@v4 with: - name: conda-${{ matrix.os }}-${{ matrix.python-version }} + name: conda-build path: conda make_sdist: @@ -145,12 +142,10 @@ jobs: upload_to_conda: needs: ["release-please", "conda-deploy"] - runs-on: ${{matrix.os}} strategy: fail-fast: false matrix: os: ["ubuntu-latest"] - python-version: ${{ fromJSON(vars.PYTHON_VERSIONS)}} if: ${{ needs.release-please.outputs.release_created }} steps: - uses: actions/download-artifact@v4 diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index 8d4e8195..2424f2a9 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -1,2 +1,8 @@ numpy: - - 1.24 \ No newline at end of file + - 1.24 +python: + - 3.8 + - 3.9 + - 3.10 + - 3.11 + - 3.12 From 1d9bca6e4f2525f406e33c2fae42fde6a97420cc Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Mon, 5 Aug 2024 15:07:40 +1000 Subject: [PATCH 03/12] ci: changing syntax --- .github/workflows/release-please.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 8c2dc632..491b33da 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -92,13 +92,10 @@ jobs: folder: docs/build/html # The folder the action should deploy. conda-deploy: - name: Building conda package for python ${{ matrix.os }}) + name: Building conda package needs: ["documentation-test", "continuous-integration"] - runs-on: ${{matrix.os}} - strategy: - fail-fast: false - matrix: - os: ["ubuntu-latest"] + runs-on: ubuntu-latest + steps: - uses: conda-incubator/setup-miniconda@v3 with: From e85222498e1b94bf85e910621eae0d5bdf76665e Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Mon, 5 Aug 2024 15:08:39 +1000 Subject: [PATCH 04/12] ci: adding run son --- .github/workflows/release-please.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 491b33da..36559bfc 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -138,16 +138,14 @@ jobs: path: dist/ upload_to_conda: + runs-on: ubuntu-latest needs: ["release-please", "conda-deploy"] - strategy: - fail-fast: false - matrix: - os: ["ubuntu-latest"] + if: ${{ needs.release-please.outputs.release_created }} steps: - uses: actions/download-artifact@v4 with: - name: conda-${{ matrix.os }}-${{ matrix.python-version }} + name: conda-buiild path: conda - uses: conda-incubator/setup-miniconda@v3 - name: upload all files to conda-forge From 800733c8c5060e9c9e7b2a96ae60f0ade32bba20 Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Tue, 6 Aug 2024 08:31:37 +1000 Subject: [PATCH 05/12] ci: run separate runners for each python version --- .github/workflows/release-please.yml | 7 +++++-- conda/meta.yaml | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 36559bfc..01d5c13d 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -95,12 +95,15 @@ jobs: name: Building conda package needs: ["documentation-test", "continuous-integration"] runs-on: ubuntu-latest - + strategy: + fail-fast: false + matrix: + python-version: ${{ fromJSON(vars.PYTHON_VERSIONS)}} steps: - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true - + python-version: ${{ matrix.python-version }} - uses: actions/checkout@v4 - name: update submodules # shell: bash -l {0} diff --git a/conda/meta.yaml b/conda/meta.yaml index fcf0c55b..51e14adc 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -13,11 +13,11 @@ build: requirements: host: - - python >=3.8 + - python - setuptools - pip run: - - python >=3.8 + - python - numpy >=1.18 - pandas - scipy From b957474d29fa0b93811c88f5d2f4ec5b479f2c52 Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Tue, 6 Aug 2024 09:06:58 +1000 Subject: [PATCH 06/12] ci: add python version to ci call --- .github/workflows/release-please.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 01d5c13d..7c046535 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -93,7 +93,7 @@ jobs: conda-deploy: name: Building conda package - needs: ["documentation-test", "continuous-integration"] + # needs: ["documentation-test", "continuous-integration"] runs-on: ubuntu-latest strategy: fail-fast: false @@ -115,7 +115,7 @@ jobs: shell: bash -l {0} run: | conda install -c conda-forge conda-build scikit-build numpy cython anaconda-client -y - conda build -c anaconda -c conda-forge -c loop3d --output-folder conda conda + conda build -c anaconda -c conda-forge -c loop3d --output-folder conda conda --python ${{ matrix.python-version }} conda convert -p all conda/linux-64/*.tar.bz2 -f -o conda - name: upload artifacts uses: actions/upload-artifact@v4 From adeb7179be5298154db1fd54242f4d04eeece9db Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Tue, 6 Aug 2024 09:23:16 +1000 Subject: [PATCH 07/12] ci: fixing artifact name --- .github/workflows/release-please.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 7c046535..68aa8f4e 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -120,13 +120,14 @@ jobs: - name: upload artifacts uses: actions/upload-artifact@v4 with: - name: conda-build + name: conda-build-$${{ matrix.python-version }} path: conda make_sdist: needs: ["documentation-test", "continuous-integration"] name: Make SDist runs-on: ubuntu-latest + steps: - uses: actions/checkout@v4 @@ -143,12 +144,15 @@ jobs: upload_to_conda: runs-on: ubuntu-latest needs: ["release-please", "conda-deploy"] - + strategy: + fail-fast: false + matrix: + python-version: ${{ fromJSON(vars.PYTHON_VERSIONS)}} if: ${{ needs.release-please.outputs.release_created }} steps: - uses: actions/download-artifact@v4 with: - name: conda-buiild + name: conda-build-$${{ matrix.python-version }} path: conda - uses: conda-incubator/setup-miniconda@v3 - name: upload all files to conda-forge From e567810e4fafd36da7ccf5696dd9245a904d4462 Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Tue, 6 Aug 2024 10:06:38 +1000 Subject: [PATCH 08/12] fix: tuple to Tuple --- LoopStructural/utils/maths.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LoopStructural/utils/maths.py b/LoopStructural/utils/maths.py index 137e3c57..1d4d8f98 100644 --- a/LoopStructural/utils/maths.py +++ b/LoopStructural/utils/maths.py @@ -1,6 +1,7 @@ from LoopStructural.utils.typing import NumericInput import numpy as np import numbers +from typing import Tuple def strikedip2vector(strike: NumericInput, dip: NumericInput) -> np.ndarray: @@ -177,7 +178,7 @@ def rotate(vector: NumericInput, axis: NumericInput, angle: NumericInput) -> np. # return vector -def get_vectors(normal: NumericInput) -> tuple[np.ndarray, np.ndarray]: +def get_vectors(normal: NumericInput) -> Tuple[np.ndarray, np.ndarray]: """Find strike and dip vectors for a normal vector. Makes assumption the strike vector is horizontal component and the dip is vertical. Found by calculating strike and and dip angle and then finding the appropriate vectors From a0642243fac0bd7e90f28957b95d68e31bac0af7 Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Tue, 6 Aug 2024 10:14:24 +1000 Subject: [PATCH 09/12] fix: updating type hints --- LoopStructural/utils/_surface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LoopStructural/utils/_surface.py b/LoopStructural/utils/_surface.py index 8dbe520b..b6f83f88 100644 --- a/LoopStructural/utils/_surface.py +++ b/LoopStructural/utils/_surface.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Optional, Union, Callable, List +from typing import Optional, Union, Callable, List, Dict import numpy as np import numpy.typing as npt from LoopStructural.utils.logging import getLogger @@ -15,7 +15,7 @@ # from LoopStructural.interpolators._geological_interpolator import GeologicalInterpolator from LoopStructural.datatypes import Surface, BoundingBox -surface_list = dict[str, Surface] +surface_list = List[Surface] class LoopIsosurfacer: From 7d10434eb11631fa501275c14d617ed014f092a7 Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Tue, 6 Aug 2024 10:16:54 +1000 Subject: [PATCH 10/12] fix: extra import --- LoopStructural/utils/_surface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LoopStructural/utils/_surface.py b/LoopStructural/utils/_surface.py index b6f83f88..c7429f97 100644 --- a/LoopStructural/utils/_surface.py +++ b/LoopStructural/utils/_surface.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Optional, Union, Callable, List, Dict +from typing import Optional, Union, Callable, List import numpy as np import numpy.typing as npt from LoopStructural.utils.logging import getLogger From d5df7c289428707c1d77dd93a35d20d484ab0eb9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 00:21:59 +0000 Subject: [PATCH 11/12] chore(master): release 1.6.2 --- CHANGELOG.md | 9 +++++++++ LoopStructural/version.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b5b495b..f9acdfbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.6.2](https://github.com/Loop3D/LoopStructural/compare/v1.6.1...v1.6.2) (2024-08-06) + + +### Bug Fixes + +* extra import ([7d10434](https://github.com/Loop3D/LoopStructural/commit/7d10434eb11631fa501275c14d617ed014f092a7)) +* tuple to Tuple ([e567810](https://github.com/Loop3D/LoopStructural/commit/e567810e4fafd36da7ccf5696dd9245a904d4462)) +* updating type hints ([a064224](https://github.com/Loop3D/LoopStructural/commit/a0642243fac0bd7e90f28957b95d68e31bac0af7)) + ## [1.6.1](https://github.com/Loop3D/LoopStructural/compare/v1.6.0...v1.6.1) (2024-08-05) diff --git a/LoopStructural/version.py b/LoopStructural/version.py index f49459c7..51bbb3f2 100644 --- a/LoopStructural/version.py +++ b/LoopStructural/version.py @@ -1 +1 @@ -__version__ = "1.6.1" +__version__ = "1.6.2" From 2754b47c5d18e6576b849dcc143313f59b85978c Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Tue, 6 Aug 2024 10:34:14 +1000 Subject: [PATCH 12/12] ci: trying to restrict scipy --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 51e14adc..6c139855 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -20,7 +20,7 @@ requirements: - python - numpy >=1.18 - pandas - - scipy + - scipy >=1.10 - scikit-image - scikit-learn - tqdm