Merge branch 'master' of github.com:Loop3D/LoopStructural

Loop3D · Aug 13, 2024 · 7c43eeb · 7c43eeb
2 parents 4af60f9 + 4e72bbc
commit 7c43eeb
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 14 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -100,14 +100,12 @@ jobs:
     strategy:
       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
         #       shell: bash -l {0}
@@ -121,17 +119,17 @@ jobs:
           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  --python ${{matrix.python-version}}
           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-$${{ matrix.python-version }}
           path: conda
 
   make_sdist:
     needs: ["documentation-test", "continuous-integration", "release-please"]
     name: Make SDist
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
 
@@ -146,18 +144,17 @@ jobs:
           path: dist/
 
   upload_to_conda:
+    runs-on: ubuntu-latest
     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
         with:
-          name: conda-${{ matrix.os }}-${{ matrix.python-version }}
+          name: conda-build-$${{ matrix.python-version }}
           path: conda
       - uses: conda-incubator/setup-miniconda@v3
       - name: upload all files to conda-forge

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # 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)
+
+
+### 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/utils/_surface.py b/LoopStructural/utils/_surface.py
@@ -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:

diff --git 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

diff --git a/LoopStructural/version.py b/LoopStructural/version.py
@@ -1 +1 @@
-__version__ = "1.6.0"
+__version__ = "1.6.2"
diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
@@ -1,2 +1,8 @@
 numpy:
-  - 1.24
+  - 1.24
+python:
+  - 3.8
+  - 3.9
+  - 3.10
+  - 3.11
+  - 3.12
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -13,14 +13,14 @@ build:
 
 requirements:
   host:
-    - python >=3.8
+    - python 
     - setuptools
     - pip
   run:
-    - python >=3.8
+    - python 
     - numpy >=1.18
     - pandas
-    - scipy
+    - scipy >=1.10
     - scikit-image
     - scikit-learn
     - tqdm