Skip to content

Commit 40669b9

Browse files
committed
Merge branch 'release/0.12.0-dev.1' into develop
# Conflicts: # docs/conf.py # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # geoapps/clustering/application.py # geoapps/inversion/base_inversion_application.py # geoapps/inversion/components/preprocessing.py # geoapps/inversion/electricals/application.py # geoapps/shared_utils/utils.py # geoapps/triangulated_surfaces/application.py # geoapps/utils/testing.py # py-3.10.conda-lock.yml # pyproject.toml # tests/utils_test.py
2 parents 3c9980d + 74a2dec commit 40669b9

29 files changed

Lines changed: 1998 additions & 1741 deletions

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ The use of Third Party Software is governed by the terms of such software licens
161161
Third Party Software notices and/or additional terms and conditions are located in the
162162
`THIRD_PARTY_SOFTWARE.rst`_ file.
163163

164-
.. _THIRD_PARTY_SOFTWARE.rst: THIRD_PARTY_SOFTWARE.rst
164+
.. _THIRD_PARTY_SOFTWARE.rst: docs/THIRD_PARTY_SOFTWARE.rst
165165

166166
License
167167
^^^^^^^

THIRD_PARTY_SOFTWARE.rst

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

deps-lock-config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include_dev: True
2+
py_versions:
3+
- "3.10"

docs/THIRD_PARTY_SOFTWARE.rst

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
Third Party Software
2+
====================
3+
4+
The geoapps repository and source distributions bundle several libraries that are
5+
compatibly licensed. We list these here.
6+
7+
.. list-table::
8+
:widths: 30 30 60
9+
:header-rows: 1
10+
11+
* - Name
12+
- License
13+
- Description
14+
* - `Dask <https://github.com/dask/dask/>`_
15+
- BSD-3-Clause
16+
- Parallel PyData with Task Scheduling
17+
* - `dash-daq <https://github.com/plotly/dash-daq>`_
18+
- MIT
19+
- DAQ components for Dash
20+
* - `discretize <https://simpeg.xyz/>`_
21+
- MIT
22+
- Discretization tools for finite volume and inverse problems
23+
* - `Distributed <https://distributed.dask.org/>`_
24+
- BSD-3-Clause
25+
- Distributed scheduler for Dask
26+
* - `Fiona <https://github.com/Toblerity/Fiona>`_
27+
- BSD 3-Clause
28+
- Fiona reads and writes spatial data files
29+
* - `fsspec <https://github.com/fsspec/filesystem_spec>`_
30+
- BSD-3-Clause
31+
- File-system specification
32+
* - `GDAL <https://github.com/OSGeo/gdal>`_
33+
- MIT
34+
- GDAL: Geospatial Data Abstraction Library
35+
* - `geoh5py <https://github.com/MiraGeoscience/geoh5py>`_
36+
- LGPL-3.0-or-later
37+
- Python API for geoh5, an open file format for geoscientific data
38+
* - `ipyfilechooser <https://github.com/crahan/ipyfilechooser>`_
39+
- MIT
40+
- Python file chooser widget for use in Jupyter/IPython in conjunction with ipywidgets
41+
* - `ipywidgets <https://github.com/jupyter-widgets/ipywidgets>`_
42+
- BSD 3-Clause
43+
- Jupyter interactive widgets
44+
* - `jupyter-dash <https://github.com/plotly/jupyter-dash>`_
45+
- MIT
46+
- Dash support for the Jupyter notebook interface
47+
* - `libhwloc <https://github.com/conda-forge/libhwloc-feedstock>`_
48+
- BSD-3-Clause
49+
- Portable Hardware Locality (hwloc)
50+
* - `matplotlib <https://github.com/matplotlib/matplotlib>`_
51+
- LicenseRef-PSF-based
52+
- Python plotting package
53+
* - `numpy <https://github.com/numpy/numpy>`_
54+
- BSD-3-Clause
55+
- Fundamental package for array computing in Python
56+
* - `omf <https://github.com/gmggroup/omf>`_
57+
- MIT
58+
- API Library for Open Mining Format
59+
* - `pandas <https://github.com/pandas-dev/pandas>`_
60+
- BSD-3-Clause
61+
- Powerful data structures for data analysis, time series, and statistics
62+
* - `param-sweeps <https://github.com/MiraGeoscience/param-sweeps>`_
63+
- MIT
64+
- Parameter sweeper for ui.json powered applications
65+
* - `plotly <https://github.com/plotly/plotly.py>`_
66+
- MIT
67+
- An open-source, interactive data visualization library for Python
68+
* - `pydiso <https://github.com/simpeg/pydiso>`_
69+
- MIT
70+
- Wrapper for intel's pardiso implementation in the MKL
71+
* - `pymatsolver <https://github.com/simpeg/pymatsolver>`_
72+
- MIT
73+
- Matrix Solvers for Python
74+
* - `scikit-image <https://github.com/scikit-image/scikit-image>`_
75+
- BSD-3-Clause
76+
- Image processing in Python
77+
* - `scikit-learn <https://github.com/scikit-learn/scikit-learn>`_
78+
- BSD-3-Clause
79+
- A set of python modules for machine learning and data mining
80+
* - `scipy <https://github.com/scipy/scipy>`_
81+
- BSD-3-Clause
82+
- Fundamental algorithms for scientific computing in Python
83+
* - `simpeg <http://simpeg.xyz/>`_
84+
- MIT
85+
- SimPEG: Simulation and Parameter Estimation in Geophysics
86+
* - `tqdm <https://github.com/tqdm>`_
87+
- MPL-2.0 or MIT
88+
- A Fast, Extensible Progress Bar for Python and CLI

docs/conf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import shutil
1818
import plotly.io as pio
1919
from datetime import datetime
20+
from importlib.metadata import version
2021
from packaging.version import Version
2122

2223
pio.renderers.default = "sphinx_gallery"
@@ -100,8 +101,8 @@
100101
author = "Mira Geoscience Ltd."
101102

102103
# The full version, including alpha/beta/rc tags.
103-
release = "0.13.0-alpha.1"
104-
# The shorter X.Y.Z version.
104+
release = version("geoapps")
105+
# The short X.Y.Z version.
105106
version = Version(release).base_version
106107

107108
# List of patterns, relative to source directory, that match files and
@@ -406,7 +407,6 @@
406407
def get_copyright_notice():
407408
return f"Copyright {datetime.now().strftime(project_copyright)}"
408409

409-
410410
rst_epilog = f"""
411411
.. |copyright_notice| replace:: {get_copyright_notice()}.
412-
"""
412+
"""

docs/index.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
geoapps: Python applications for geoscientific problems
1+
Geoapps: Python applications for geoscientific problems
22
=======================================================
33

44

5-
Welcome to **geoapps**! Where geoscientists meet to share open-source applications.
5+
Welcome to **Geoapps**! Where geoscientists meet to share open-source applications.
66

77
In short
88
^^^^^^^^
@@ -30,6 +30,7 @@ Contents:
3030
content/howto.rst
3131
content/release_notes.rst
3232
content/feedback.rst
33+
THIRD_PARTY_SOFTWARE
3334

3435

3536
License

0 commit comments

Comments
 (0)