Skip to content

Commit 8e0dfc0

Browse files
andrewg-miraandrewg-mira
authored
Merge pull request #490 from MiraGeoscience/hotfix/0.9.2
GEOPY-825 release 0.9.2
2 parents b0dde9d + 4a5a6ac commit 8e0dfc0

File tree

221 files changed

+316
-258
lines changed

Some content is hidden

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

221 files changed

+316
-258
lines changed

‎.github/workflows/create_env_file.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
8585
release-env:
8686
needs: [create-env-file, draft-release]
87-
if: ${{ needs.create-env-file.outputs.releaseFullEnv }}
87+
if: ${{ needs.create-env-file.outputs.releaseFullEnv == true }}
8888
runs-on: ubuntu-latest
8989
steps:
9090
- uses: actions/checkout@v3

‎Install_or_Update.bat

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ setlocal EnableDelayedExpansion
33

44
call "%~dp0get_conda_exec.bat"
55
if !errorlevel! neq 0 (
6+
pause
67
exit /B !errorlevel!
78
)
89

@@ -11,8 +12,11 @@ set PY_VER=3.9
1112
set MY_CONDA=!MY_CONDA_EXE:"=!
1213
cd %~dp0
1314
set PYTHONUTF8=1
14-
call "!MY_CONDA!" remove --name geoapps --all --yes
15-
call "!MY_CONDA!" env create -f environments\conda-py-%PY_VER%-win-64.lock.yml -n geoapps
16-
call "!MY_CONDA!" activate geoapps && python -m pip install -e . --no-deps
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
20+
1721
pause
1822
cmd /k

‎README.md

Lines changed: 1 addition & 1 deletion

‎Start_applications.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ setlocal EnableDelayedExpansion
33

44
call "%~dp0get_conda_exec.bat"
55
if !errorlevel! neq 0 (
6+
pause
67
exit /B !errorlevel!
78
)
89

‎devtools/add_url_tag_sha256.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
# Copyright (c) 2022 Mira Geoscience Ltd.
3+
# Copyright (c) 2023 Mira Geoscience Ltd.
44
#
55
# This file is part of geoapps.
66
#

‎devtools/check-copyright.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
# Copyright (c) 2022 Mira Geoscience Ltd.
3+
# Copyright (c) 2023 Mira Geoscience Ltd.
44
#
55
# This file is part of geoapps.
66
#

‎devtools/create_application_env_files.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
# Copyright (c) 2022 Mira Geoscience Ltd.
3+
# Copyright (c) 2023 Mira Geoscience Ltd.
44
#
55
# This file is part of geoapps.
66
#
@@ -62,7 +62,9 @@ def create_standalone_lock(git_url: str, extras=[], suffix=""):
6262

6363
def add_application(git_url: str, lock_file: Path, output_file: Path):
6464
print(f"# Patching {lock_file} for standalone environment ...")
65-
pip_dependency_re = re.compile(r"^\s*- (geoh5py|mira-simpeg|simpeg-archive)\s")
65+
pip_dependency_re = re.compile(
66+
r"^\s*- (geoh5py|mira-simpeg|simpeg-archive|param-sweeps)\s"
67+
)
6668
sha_re = re.compile(r"(.*)\s--hash=\S*")
6769
pip_dependency_lines = []
6870
with open(lock_file) as input_file:

‎devtools/run_conda_lock.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ set project_dir=%~dp0..
1313
cd %project_dir%
1414
call get_conda_exec.bat
1515
if !errorlevel! neq 0 (
16+
pause
1617
exit /B !errorlevel!
1718
)
1819

‎devtools/run_conda_lock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
# Copyright (c) 2022 Mira Geoscience Ltd.
3+
# Copyright (c) 2023 Mira Geoscience Ltd.
44
#
55
# This file is part of geoapps.
66
#

‎devtools/setup-conda-base.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ setlocal EnableDelayedExpansion
1111
set project_dir=%~dp0..
1212
call %project_dir%\get_conda_exec.bat
1313
if !errorlevel! neq 0 (
14+
pause
1415
exit /B !errorlevel!
1516
)
1617

1718
call !MY_CONDA_EXE! install -n base -c conda-forge mamba -y
1819
call !MY_CONDA_EXE! activate base
19-
call pip install conda-lock[pip_support]
20+
pip install conda-lock[pip_support]
2021

2122
pause
2223
cmd /k

‎devtools/setup-dev.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ setlocal EnableDelayedExpansion
1414
set project_dir=%~dp0..
1515
call %project_dir%\get_conda_exec.bat
1616
if !errorlevel! neq 0 (
17+
pause
1718
exit /B !errorlevel!
1819
)
1920

@@ -24,7 +25,7 @@ call !MY_CONDA_EXE! activate
2425
call mamba env update -p %env_path% -f %project_dir%\environments\conda-py-%PY_VER%-win-64-dev.lock.yml
2526
call conda activate %env_path%
2627
if exist %project_dir%\..\geoh5py\ (
27-
call pip install --upgrade --force-reinstall -e %project_dir%\..\geoh5py --no-deps
28+
pip install --upgrade --force-reinstall -e %project_dir%\..\geoh5py --no-deps
2829
)
2930

3031
pause

‎devtools/start-app.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ setlocal EnableDelayedExpansion
44
set project_dir=%~dp0..
55
call %project_dir%\get_conda_exec.bat
66
if !errorlevel! neq 0 (
7+
pause
78
exit /B !errorlevel!
89
)
910

‎docs/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@
9292
master_doc = "index"
9393

9494
# General information about the project.
95-
project = "geoapps"
95+
project = "geoapps v0.9.2"
9696

9797
# The short X.Y version.
98-
version = "0.9.1"
98+
version = "0.9.2"
9999
# The full version, including alpha/beta/rc tags.
100-
release = "0.9.1"
100+
release = "0.9.2"
101101

102102

103103
# List of patterns, relative to source directory, that match files and

‎docs/content/applications.rst

Lines changed: 4 additions & 0 deletions

‎docs/content/applications/base_application.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:4cdf1594d7de1bf7318c74713784d42901e9bcf727c2e1ef944f259ecf5b8025
3-
size 1038771
2+
oid sha256:43d22f47e5758b56cfd90d39465f74e29778c540a1d829a605c4eec25d78fe4b
3+
size 1094406

‎docs/content/applications/create_octree.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d0eb2bd0236781d17f7949261e46d2ef266241cf710c30536dd6dc14fcc89ff0
3-
size 994061
2+
oid sha256:97cfe3dd7c93076b6c8db6d6134fe8167d3e818bd556d0ef8d473a9253dee0eb
3+
size 1058208

‎docs/content/applications/dcip_inversion.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:05cda728ee117dab5089c551180d567820456589400da18cf8ca254a3d4db285
3-
size 17753784
2+
oid sha256:37930cb962be82b8e6b8d92c07e00a76b67a3afad53ff0be536258f554c64df1
3+
size 19088984

‎docs/content/applications/grav_mag_inversion.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:4cbf01fd96f26fe41032dd8b8a520eb738fd30040aa14b598c4662ff53431f17
3-
size 1972381
2+
oid sha256:cd8d354d600cff24f0c00ecc71f3597c9bafdb018df3fe3e9fff282a8db20e93
3+
size 2627940

‎docs/content/applications/images/block_model/block_model_application.PNG renamed to ‎docs/content/applications/images/block_model/block_model_application.png

File renamed without changes.

‎docs/content/applications/images/block_model/block_model_dropdown.PNG renamed to ‎docs/content/applications/images/block_model/block_model_dropdown.png

File renamed without changes.

‎docs/content/applications/images/block_model/block_model_export.PNG renamed to ‎docs/content/applications/images/block_model/block_model_export.png

File renamed without changes.

‎docs/content/applications/images/block_model/block_model_upload.PNG renamed to ‎docs/content/applications/images/block_model/block_model_upload.png

File renamed without changes.

‎docs/content/applications/images/cluster/cluster_app.PNG renamed to ‎docs/content/applications/images/cluster/cluster_app.png

File renamed without changes.

‎docs/content/applications/images/cluster/cluster_colorselect.PNG renamed to ‎docs/content/applications/images/cluster/cluster_colorselect.png

File renamed without changes.

‎docs/content/applications/images/cluster/cluster_nclusters.PNG renamed to ‎docs/content/applications/images/cluster/cluster_nclusters.png

File renamed without changes.

‎docs/content/applications/images/cluster/cluster_output.PNG renamed to ‎docs/content/applications/images/cluster/cluster_output.png

File renamed without changes.

‎docs/content/applications/images/cluster/cluster_stats.PNG renamed to ‎docs/content/applications/images/cluster/cluster_stats.png

File renamed without changes.

‎docs/content/applications/images/dash_upload.PNG renamed to ‎docs/content/applications/images/dash_upload.png

File renamed without changes.

‎docs/content/applications/images/scatter/scatter_app.PNG renamed to ‎docs/content/applications/images/scatter/scatter_app.png

File renamed without changes.

‎docs/content/applications/images/scatter/scatter_downsampling.PNG renamed to ‎docs/content/applications/images/scatter/scatter_downsampling.png

File renamed without changes.

‎docs/content/applications/images/scatter/scatter_export.PNG renamed to ‎docs/content/applications/images/scatter/scatter_export.png

File renamed without changes.

‎docs/content/applications/images/scatter/scatter_size.PNG renamed to ‎docs/content/applications/images/scatter/scatter_size.png

File renamed without changes.

‎docs/content/applications/images/scatter/scatter_xpanel.PNG renamed to ‎docs/content/applications/images/scatter/scatter_xpanel.png

File renamed without changes.

‎docs/content/applications/peak_finder.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:805a0096be9b7b3ad723e366f6dc58be21c735096cb47c735d0666500b617624
3-
size 5651768
2+
oid sha256:1adb8f24c69c70d4b42f7a31c530df61fd4d33e97db616c1c681c4f4db43485b
3+
size 6254284

‎docs/content/installation.rst

Lines changed: 1 addition & 0 deletions

‎docs/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ dependencies:
1414
- sphinx==3.5.4
1515
- sphinx_issues
1616
- nbsphinx
17-
- sphinx-gallery
17+
- sphinx-gallery==0.10
1818
- jupyter_sphinx
1919
- plotly==4.9.0

‎geoapps/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#
55
# geoapps is distributed under the terms and conditions of the MIT License
66
# (see LICENSE file at the root of this source code package).
77

8-
__version__ = "0.9.1"
8+
__version__ = "0.9.2"

‎geoapps/base/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/base/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/base/dash_application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/base/plot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/base/selection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/block_model_creation/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/block_model_creation/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/block_model_creation/driver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/block_model_creation/layout.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/block_model_creation/params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/calculator/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/calculator/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/clustering/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/clustering/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/clustering/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/clustering/driver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/clustering/layout.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/clustering/params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/clustering/plot_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/contours/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/contours/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/contours/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/contours/driver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/contours/params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/coordinate_transformation/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/coordinate_transformation/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/coordinate_transformation/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

‎geoapps/driver_base/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Mira Geoscience Ltd.
1+
# Copyright (c) 2023 Mira Geoscience Ltd.
22
#
33
# This file is part of geoapps.
44
#

0 commit comments

Comments
 (0)