Skip to content

Commit 7d65c34

Browse files
andrewg-miraandrewg-mira
authored
Merge pull request #562 from MiraGeoscience/release/0.10.0
Release/0.10.0
2 parents f6d743a + cc45010 commit 7d65c34

File tree

179 files changed

+15331
-11092
lines changed

Some content is hidden

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

179 files changed

+15331
-11092
lines changed

‎.github/workflows/create_env_file.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: windows-latest
1818
env:
1919
releaseFullEnv: false
20-
python_ver: '3.9'
20+
python_ver: '3.10'
2121
PYTHONUTF8: 1
2222
ARTIFACT_NAME: geoapps.conda-env
2323
CONDA_ENV_FILE_GLOB_PATTERN: conda-py-*-geoapps*.lock.yml
@@ -27,8 +27,6 @@ jobs:
2727
artifact: ${{ env.ARTIFACT_NAME }}.${{ steps.git-info.outputs.git_ref_suffix }}
2828
steps:
2929
- uses: actions/checkout@v3
30-
with:
31-
lfs: true
3230
- name: git info
3331
id: git-info
3432
run: |

‎.github/workflows/issue_to_jira.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
2020
- name: Jira Create issue
2121
id: create_jira_issue
22-
uses: atlassian/gajira-create@v2.0.1
22+
uses: atlassian/gajira-create@v3.0.1
2323
with:
2424
project: GEOPY
2525
issuetype: Story

‎.github/workflows/pytest-unix-os.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ on:
1616
- feature/**
1717
- hotfix/**
1818

19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
21+
cancel-in-progress: true
22+
1923
env:
2024
source_dir: geoapps
2125

@@ -36,6 +40,8 @@ jobs:
3640
CONDA_LOCK_ENV_FILE: environments/conda-py-${{ matrix.python_ver }}-${{ startsWith(matrix.os, 'macos') && 'osx' || 'linux' }}-64-dev.lock.yml
3741
steps:
3842
- uses: actions/checkout@v3
43+
with:
44+
lfs: true
3945
- name: Setup conda env
4046
uses: mamba-org/provision-with-micromamba@main
4147
with:

‎.github/workflows/pytest-windows.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ on:
1616
- feature/**
1717
- hotfix/**
1818

19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
21+
cancel-in-progress: true
22+
1923
env:
2024
source_dir: geoapps
2125

@@ -35,6 +39,8 @@ jobs:
3539
CONDA_LOCK_ENV_FILE: environments/conda-py-${{ matrix.python_ver }}-win-64-dev.lock.yml
3640
steps:
3741
- uses: actions/checkout@v3
42+
with:
43+
lfs: true
3844
- name: Setup conda env
3945
uses: mamba-org/provision-with-micromamba@main
4046
with:

‎.github/workflows/static-analysis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ on:
1616
- feature/**
1717
- hotfix/**
1818

19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
21+
cancel-in-progress: true
22+
1923
env:
2024
source_dir: geoapps
2125

‎.gitignore

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ get_custom_conda.bat
142142

143143
# cleanup after tests
144144
*.lock
145-
/assets/EM1DInversion_.json
146-
/assets/Inversion_.json
147-
/assets/SimPEG_PFInversion/
148-
/assets/Temp/
149-
/assets/dask-worker-space/
150-
/assets/sensitivity/
151-
/assets/test_*
145+
/geoapps-assets/EM1DInversion_.json
146+
/geoapps-assets/Inversion_.json
147+
/geoapps-assets/SimPEG_PFInversion/
148+
/geoapps-assets/Temp/
149+
/geoapps-assets/dask-worker-space/
150+
/geoapps-assets/sensitivity/
151+
/geoapps-assets/test_*
152152
/tests/**/*ui.json
153153
/tests/GEOSCIENCEtemp
154154
/tests/Gravity*

‎.pre-commit-config.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ ci:
1313
repos:
1414
- repo: https://github.com/psf/black
1515
rev: 23.3.0
16+
1617
hooks:
1718
- id: black
18-
- repo: https://github.com/asottile/seed-isort-config
19-
rev: v2.2.0
20-
hooks:
21-
- id: seed-isort-config
2219
- repo: https://github.com/PyCQA/isort
2320
rev: 5.12.0
2421
hooks:
@@ -34,6 +31,7 @@ repos:
3431
# - id: flake8
3532
- repo: https://github.com/asottile/pyupgrade
3633
rev: v3.3.2
34+
3735
hooks:
3836
- id: pyupgrade
3937
args: [--py39-plus]
@@ -51,15 +49,17 @@ repos:
5149
language: system
5250
require_serial: true # pylint does its own parallelism
5351
types: [python]
54-
exclude: (devtools|docs)/
52+
exclude: docs/
5553
- id: check-copyright
5654
name: Check copyright
5755
entry: python devtools/check-copyright.py
5856
language: python
59-
types: [python]
60-
exclude: (^setup.py$|(docs|assets)/)
57+
files: (^LICENSE|README.rst|\.py|\.pyi)$
58+
types: [text]
59+
exclude: (^setup.py$|^\.|\b(docs|geoapps-assets)/)
6160
- repo: https://github.com/codespell-project/codespell
6261
rev: v2.2.4
62+
6363
hooks:
6464
- id: codespell
6565
exclude: (-lock\.ya?ml|\benvironments/.*\.ya?ml|\.ipynb)$
@@ -82,6 +82,7 @@ repos:
8282
- id: name-tests-test
8383
- repo: https://github.com/rstcheck/rstcheck
8484
rev: v6.1.2
85+
8586
hooks:
8687
- id: rstcheck
8788
additional_dependencies: [sphinx]

‎Install_or_Update.bat

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,32 @@ if !errorlevel! neq 0 (
77
exit /B !errorlevel!
88
)
99

10-
set PY_VER=3.9
10+
set PY_VER=3.10
1111

12+
set ENV_NAME=geoapps
1213
set MY_CONDA=!MY_CONDA_EXE:"=!
1314
cd %~dp0
1415
set PYTHONUTF8=1
15-
call "!MY_CONDA!" activate
16-
call conda remove --name geoapps --all --yes
17-
call conda env create -f environments\conda-py-%PY_VER%-win-64.lock.yml -n geoapps
18-
call conda activate geoapps
19-
pip install -e . --no-deps
16+
17+
:: all dependencies are installed from conda
18+
set PIP_NO_DEPS=1
19+
20+
set MY_CONDA_ENV_FILE=environments\conda-py-%PY_VER%-win-64.lock.yml
21+
if not exist %MY_CONDA_ENV_FILE% (
22+
echo "** ERROR: Could not find the conda environment specification file '%MY_CONDA_ENV_FILE%' **"
23+
pause
24+
exit /B 0
25+
)
26+
27+
call "!MY_CONDA!" activate base ^
28+
&& call "!MY_CONDA!" env create --force -n %ENV_NAME% --file %MY_CONDA_ENV_FILE% ^
29+
&& call "!MY_CONDA!" run -n %ENV_NAME% pip install -e .[core,apps]
30+
31+
if !errorlevel! neq 0 (
32+
echo "** ERROR: Installation failed **"
33+
pause
34+
exit /B !errorlevel!
35+
)
2036

2137
pause
22-
cmd /k
38+
cmd /k "!MY_CONDA!" activate base

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 Mira Geoscience
3+
Copyright (c) 2023 Mira Geoscience
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎README.rst

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
|coverage| |precommit_ci| |docs| |style| |version| |pyversions|
2+
3+
4+
.. |docs| image:: https://readthedocs.org/projects/geoapps/badge/
5+
:alt: Documentation Status
6+
:target: https://geoapps.readthedocs.io/en/latest/?badge=latest
7+
8+
.. |coverage| image:: https://codecov.io/gh/MiraGeoscience/geoapps/branch/main/graph/badge.svg
9+
:alt: Code coverage
10+
:target: https://codecov.io/gh/MiraGeoscience/geoapps
11+
12+
.. |style| image:: https://img.shields.io/badge/code%20style-black-000000.svg
13+
:alt: Coding style
14+
:target: https://github.com/pf/black
15+
16+
.. |version| image:: https://img.shields.io/pypi/v/geoapps.svg
17+
:alt: version on PyPI
18+
:target: https://pypi.python.org/pypi/geoapps/
19+
20+
.. |pyversions| image:: https://img.shields.io/pypi/pyversions/geoapps.svg
21+
:alt: Python versions
22+
:target: https://pypi.python.org/pypi/geoapps/
23+
24+
.. |precommit_ci| image:: https://results.pre-commit.ci/badge/github/MiraGeoscience/geoapps/main.svg
25+
:target: https://results.pre-commit.ci/latest/github/MiraGeoscience/geoapps/main
26+
:alt: pre-commit.ci status
27+
28+
29+
Welcome to **geoapps** - Open-source applications in geosciences
30+
================================================================
31+
32+
.. image:: https://github.com/MiraGeoscience/geoapps/raw/v0.10.0-rc.3/docs/images/index_page.png
33+
:align: right
34+
:width: 50%
35+
36+
In short
37+
^^^^^^^^
38+
39+
The **geoapps** project has been created by `Mira Geoscience`_ for the development and sharing of open-source
40+
applications in geoscience. Users will be able to directly leverage the powerful visualization capabilities of
41+
`Geoscience ANALYST`_ along with open-source code from the Python ecosystem.
42+
43+
.. _Mira Geoscience: https://mirageoscience.com/
44+
.. _Geoscience ANALYST: https://mirageoscience.com/mining-industry-software/geoscience-analyst/
45+
46+
47+
Links
48+
^^^^^
49+
50+
- `Download the latest <https://github.com/MiraGeoscience/geoapps/archive/main.zip>`_
51+
- `Getting started <https://geoapps.readthedocs.io/en/latest/content/installation.html#installation>`_
52+
- `Documentation <https://geoapps.readthedocs.io/en/latest/index.html>`_
53+
54+
55+
Current sponsors
56+
^^^^^^^^^^^^^^^^
57+
58+
- `Anglo American <http://www.angloamerican.ca/>`_
59+
- `Barrick <https://www.barrick.com/English/home/default.aspx>`_
60+
- `BHP <https://www.bhp.com/>`_
61+
- `Cameco <https://www.cameco.com/>`_
62+
- `Glencore <https://www.glencore.com/>`_
63+
- `Mira Geoscience`_
64+
- `Rio Tinto <https://www.riotinto.com/en>`_
65+
- `Teck <https://www.teck.com/>`_
66+
- `Vale <https://www.vale.com/canada>`_
67+
68+
69+
License
70+
^^^^^^^
71+
MIT License
72+
73+
Copyright (c) 2023 Mira Geoscience
74+
75+
Permission is hereby granted, free of charge, to any person obtaining a copy
76+
of this software and associated documentation files (the "Software"), to deal
77+
in the Software without restriction, including without limitation the rights
78+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
79+
copies of the Software, and to permit persons to whom the Software is
80+
furnished to do so, subject to the following conditions:
81+
82+
The above copyright notice and this permission notice shall be included in all
83+
copies or substantial portions of the Software.
84+
85+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
86+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
87+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
88+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
89+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
90+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
91+
SOFTWARE.

‎Start_applications.bat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ if !errorlevel! neq 0 (
77
exit /B !errorlevel!
88
)
99

10+
set ENV_NAME=geoapps
11+
1012
set MY_CONDA=!MY_CONDA_EXE:"=!
11-
call "!MY_CONDA!" activate geoapps && jupyter notebook geoapps\index.ipynb
12-
cmd /k
13+
call "!MY_CONDA!" run --live-stream -n %ENV_NAME% python -m geoapps.scripts.start_notebook
14+
cmd /k "!MY_CONDA!" activate %ENV_NAME%

‎assets/FlinFlon.geoh5

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎assets/FlinFlon_dcip.geoh5

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)