Skip to content

Commit fec6783

Browse files
authored
Merge pull request #329 from MiraGeoscience/release-4.7-to-develop
GEOPY-2640: Release 4.7 to develop (including GEOPY-2640)
2 parents b2e0fe5 + 816ce7d commit fec6783

275 files changed

Lines changed: 3587 additions & 3283 deletions

File tree

Some content is hidden

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

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) 2023-2025 Mira Geoscience Ltd.
3+
Copyright (c) 2023-2026 Mira Geoscience Ltd.
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-dev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,4 +334,4 @@ Here is a suggestion for some plugins you can install in PyCharm.
334334

335335
Copyright
336336
^^^^^^^^^
337-
Copyright (c) 2023-2025 Mira Geoscience Ltd.
337+
Copyright (c) 2023-2026 Mira Geoscience Ltd.

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,4 @@ Third Party Software notices and/or additional terms and conditions are located
168168

169169
Copyright
170170
^^^^^^^^^
171-
Copyright (c) 2023-2025 Mira Geoscience Ltd.
171+
Copyright (c) 2023-2026 Mira Geoscience Ltd.

docs/THIRD_PARTY_SOFTWARE.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ compatibly licensed. We list these here.
1717
* - `discretize <https://simpeg.xyz/>`_
1818
- MIT
1919
- Discretization tools for finite volume and inverse problems
20+
* - `geoapps-utils <https://github.com/MiraGeoscience/geoapps-utils>`_
21+
- MIT
22+
- Collection of utilities for creating applications and manipulating geoh5 objects
2023
* - `geoh5py <https://github.com/MiraGeoscience/geoh5py>`_
2124
- LGPL-3.0-or-later
2225
- Python API for geoh5, an open file format for geoscientific data
26+
* - `grid-apps <https://github.com/MiraGeoscience/grid-apps>`_
27+
- MIT
28+
- Grid creation and manipulation using GEOH5 format.
2329
* - `numpy <https://github.com/numpy/numpy>`_
2430
- BSD-3-Clause
2531
- Fundamental package for array computing in Python
@@ -32,6 +38,9 @@ compatibly licensed. We list these here.
3238
* - `pymatsolver <https://github.com/simpeg/pymatsolver/>`_
3339
- MIT
3440
- Matrix Solvers for Python.
41+
* - `Rtree <https://github.com/Toblerity/rtree>`_
42+
- MIT
43+
- Spatial index for Python GIS
3544
* - `scikit-learn <https://github.com/scikit-learn/scikit-learn/>`_
3645
- BSD-3-Clause
3746
- A set of python modules for machine learning and data mining
@@ -41,6 +50,12 @@ compatibly licensed. We list these here.
4150
* - `simpeg <https://simpeg.xyz/>`_
4251
- MIT
4352
- SimPEG: Simulation and Parameter Estimation in Geophysics
53+
* - `threadpoolctl <https://github.com/joblib/threadpoolctl>`_
54+
- BSD-3-Clause
55+
- helpers to limit the number of threads used in the threadpool-backed of common native libraries used for scientific computing and data science
4456
* - `tqdm <https://github.com/tqdm>`_
4557
- MPL-2.0 or MIT
4658
- A Fast, Extensible Progress Bar for Python and CLI
59+
* - `trimesh <https://trimesh.org/>`_
60+
- MIT
61+
- Python library for loading and using triangular meshes

docs/_toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,10 @@ chapters:
3434
- file: case_studies/Forrestania/python_code/unconstrained_gravity_inv_training
3535
- file: case_studies/Forrestania/python_code/unconstrained_magnetics_inv_training
3636
- file: case_studies/Forrestania/python_code/joint_grav_mag
37+
- file: plate-simulation/index
38+
sections:
39+
- file: plate-simulation/usage
40+
title: Basic Usage
41+
- file: plate-simulation/methodology
42+
title: Methodology
3743
- file: THIRD_PARTY_SOFTWARE

docs/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- discretize
1616
- pip
1717
- ipykernel
18-
- jupyter-book
18+
- jupyter-book=1.0
1919
- jupytext
2020
- notebook
2121
- zarr
29.1 KB
Loading
180 KB
Loading
66 KB
Loading
56.2 KB
Loading

0 commit comments

Comments
 (0)