Skip to content

Commit adf7f9f

Browse files
feature: stable version (#3)
* style: style fixes by ruff and autoformatting by black * doc: added example notebook * doc: added docstrings and fixes * fix: added correct imports * fix: use correct function name * style: style fixes by ruff and autoformatting by black * test: use correct function name * chore: updated gitignore * chore: .pyc files * test: added NTGS test data and example of use * chore: added test structure data * fix: added structure table handling to dip conversion * chore: updated init file * fix: converts correctly shapefiles * fix: reads correctly input files * ci: integrate only master branch * style: style fixes by ruff and autoformatting by black * fix: corrected column names * ci: add mamba solver to requirements * fix: added import of ntgs m2l config * ci: use conda classic solver * fix: use correct import name * style: style fixes by ruff and autoformatting by black * fix: corrected imports * fix: corrected file saving method * style: style fixes by ruff and autoformatting by black * fix: ignore "Unknown" formation names * fix: Remove 'Pertatataka_Formation' from ignore_codes in NtgsConfig * style: style fixes by ruff and autoformatting by black * chore: add new data files of Henbury dataset * chore: add notebook example 1 for Henbury dataset * chore: clean up cells * style: style fixes by ruff and autoformatting by black * chore: clean output * chore: update cells * chore: remove unused code cell * chore: add Henbury fault data * chore: added new Henbury dataset * feat: add FaultConnector * chore: added docstrings and logging * style: style fixes by ruff and autoformatting by black * refactor: Refactor code structure for improved readability and maintainability * style: style fixes by ruff and autoformatting by black * Fix conversion utilities for fold data (#4) * Fix conversion utilities * style: style fixes by ruff and autoformatting by black * fix: remove ignore_codes from geology_config * fix: remove unused columns from fault and structure configurations * fix: update conda solver to libmamba * fix: update conda install command * fix: update conda upload steps * fix: update steps for conda package building * fix: restore conda upload steps * fix: switch libmamba to classic * fix: update conda configuration * fix: switch conda solver to libmamba * fix: change build name * fix: update python version matrix to include 3.13 * fix: update artifact name to include python version in conda upload * fix: correct syntax error in artifact name for conda upload * fix: update artifact name for conda build * fix: update numpy version constraint * fix: update numpy >=2.1.0 * fix: numpy version conda config * fix: numpy version in meta.yaml * fix: conda min python version to 3.10 * fix: update numpy version * fix: improved ci workflow --------- Co-authored-by: rabii-chaarani <rabii-chaarani@users.noreply.github.com>
1 parent e474fa5 commit adf7f9f

File tree

104 files changed

+10499
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+10499
-246
lines changed

.github/workflows/release-please.yml

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
os: ${{ fromJSON(vars.BUILD_OS)}}
30-
python-version: ["3.9", "3.10", "3.11", "3.12"]
30+
python-version: ["3.10", "3.11", "3.12", "3.13"]
3131
steps:
3232
- uses: actions/checkout@v4
3333
- uses: conda-incubator/setup-miniconda@v3
@@ -37,7 +37,7 @@ jobs:
3737
- name: Installing dependencies
3838
shell: bash -l {0}
3939
run: |
40-
conda install -c conda-forge numpy scipy pytest dill beartype pandas geopandas shapely validators sqlite -y
40+
conda install -c conda-forge 'numpy>=2.1.0' scipy pytest dill beartype pandas geopandas shapely validators sqlite -y
4141
- name: Building and install
4242
shell: bash -l {0}
4343
run: |
@@ -49,7 +49,7 @@ jobs:
4949
5050
release-please:
5151
runs-on: ubuntu-latest
52-
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
52+
if: github.ref == 'refs/heads/master'
5353
steps:
5454
- uses: GoogleCloudPlatform/release-please-action@v4
5555
id: release
@@ -61,20 +61,14 @@ jobs:
6161
release_created: ${{ steps.release.outputs.release_created }}
6262
# if a release is created then run the deploy scripts for github.io, conda, pypi and docker
6363

64-
conda-deploy:
65-
name: Building conda package for python ${{ matrix.os }})
64+
conda-build:
65+
name: Building conda package for python
6666
needs: "continuous-integration"
67-
runs-on: ${{matrix.os}}
68-
strategy:
69-
fail-fast: false
70-
matrix:
71-
os: ["ubuntu-latest"]
72-
python-version: ["3.9", "3.10", "3.11", "3.12"]
67+
runs-on: ubuntu-latest
7368
steps:
7469
- uses: conda-incubator/setup-miniconda@v3
7570
with:
7671
auto-update-conda: true
77-
python-version: ${{ matrix.python-version }}
7872

7973
- uses: actions/checkout@v4
8074
- name: update submodules
@@ -86,16 +80,15 @@ jobs:
8680
ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
8781
shell: bash -l {0}
8882
run: |
89-
conda install -c conda-forge conda-build pytest numpy scipy pandas geopandas sqlite shapely validators anaconda-client -y
90-
conda build -c anaconda -c conda-forge --output-folder conda conda
91-
conda convert -p all conda/linux-64/*.tar.bz2 -f -o conda
92-
conda install anaconda-client -y
83+
conda config --set solver libmamba
84+
conda install -c conda-forge conda-build pytest 'numpy>=2.1.0' scipy pandas geopandas sqlite shapely validators anaconda-client conda-libmamba-solver -y
85+
conda build -c conda-forge --output-folder conda conda
86+
9387
- name: upload artifacts
9488
uses: actions/upload-artifact@v4
9589
with:
96-
name: conda-${{ matrix.os }}-${{ matrix.python-version }}
90+
name: conda-build
9791
path: conda
98-
9992
make_sdist:
10093
needs: "continuous-integration"
10194
name: Make SDist
@@ -114,18 +107,13 @@ jobs:
114107
path: dist/
115108

116109
upload_to_conda:
117-
needs: ["release-please", "conda-deploy"]
118-
runs-on: ${{matrix.os}}
119-
strategy:
120-
fail-fast: false
121-
matrix:
122-
os: ["ubuntu-latest"]
123-
python-version: ["3.9", "3.10", "3.11", "3.12"]
110+
needs: ["release-please", "conda-build"]
111+
runs-on: ubuntu-latest
124112
if: ${{ needs.release-please.outputs.release_created }}
125113
steps:
126114
- uses: actions/download-artifact@v4
127115
with:
128-
name: conda-${{ matrix.os }}-${{ matrix.python-version }}
116+
name: conda
129117
path: conda
130118
- uses: conda-incubator/setup-miniconda@v3
131119
- name: upload all files to conda-forge
@@ -134,10 +122,10 @@ jobs:
134122
ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
135123
run: |
136124
conda install -c anaconda anaconda-client -y
137-
anaconda upload --label main conda/*/*.tar.bz2
125+
anaconda upload --label main conda/*/*.conda
138126
139127
upload_to_pypi:
140-
needs: ["release-please", "conda-deploy"]
128+
needs: ["release-please", "conda-build"]
141129
runs-on: "ubuntu-latest"
142130

143131
if: ${{ needs.release-please.outputs.release_created }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ LoopDataConverter.egg-info/requires.txt
33
LoopDataConverter.egg-info/SOURCES.txt
44
LoopDataConverter.egg-info/PKG-INFO
55
LoopDataConverter.egg-info/dependency_links.txt
6+
examples/.ipynb_checkpoints/ntgs_example_1-checkpoint.ipynb

LoopDataConverter/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from .converters import LoopConverter
2+
from .input import InputData
3+
from .datatypes import SurveyName, Datatype
4+
from .fields import NtgsConfig
5+
from .geometry_correction import FaultConnector
259 Bytes
Binary file not shown.
Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
from .base_converter import BaseConverter
22
from .ntgs_converter import NTGSConverter
3+
from .loop_converter import LoopConverter
34
from ..datatypes import SurveyName
4-
5-
converter_map = {
6-
SurveyName.NTGS: NTGSConverter,
7-
SurveyName.GA: "",
8-
SurveyName.GSQ: "",
9-
SurveyName.GSWA: "",
10-
SurveyName.GSSA: "",
11-
SurveyName.GSV: "",
12-
SurveyName.MRT: "",
13-
SurveyName.GSNSW: "",
14-
}
456 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)