Skip to content

Commit

Permalink
Merge branch 'release/0.10.0' into release_develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	.pre-commit-config.yaml
#	docs/conf.py
#	geoh5py/shared/utils.py
#	geoh5py/ui_json/input_file.py
  • Loading branch information
domfournier committed Jan 9, 2025
2 parents a3163a4 + 25300f8 commit 40dae1f
Show file tree
Hide file tree
Showing 212 changed files with 4,299 additions and 5,006 deletions.
6 changes: 4 additions & 2 deletions .idea/copyright/MiraGeoscience.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/scopes/sources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ repos:
- id: poetry-check
args: [--lock]
- repo: https://github.com/hadialqattan/pycln
rev: v2.4.0
rev: v2.5.0
hooks:
- id: pycln
args: [--config=pyproject.toml]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.1
rev: v0.8.6
hooks:
- id: ruff
args:
Expand All @@ -31,7 +31,7 @@ repos:
# - --unsafe-fixes
- id: ruff-format
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.13.0
rev: v1.14.1
hooks:
- id: mypy
additional_dependencies: [
Expand Down Expand Up @@ -63,10 +63,10 @@ repos:
- id: relint
args: [-W] # to fail on warnings
- repo: https://github.com/MiraGeoscience/pre-commit-hooks
rev: v1.0.1
rev: v1.0.2
hooks:
- id: check-copyright
files: (^LICENSE|^README(|-dev).rst|\.py|\.pyi)$
files: (^package\.rst|^LICENSE|^README(|-dev)\.rst|\.py|\.pyi)$
exclude: (^\.|^docs/)
- id: prepare-commit-msg
- id: check-commit-msg
Expand Down
1 change: 1 addition & 0 deletions .rstcheck.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[rstcheck]
ignore_directives=automodule,include
report_level=WARNING
ignore_substitutions = copyright_notice
2 changes: 1 addition & 1 deletion README-dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -454,4 +454,4 @@ To build the api docs using autodocs
Copyright
^^^^^^^^^
Copyright (c) 2024 Mira Geoscience Ltd.
Copyright (c) 2025 Mira Geoscience Ltd.
8 changes: 2 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ Documentation

`Online documentation <https://mirageoscience-geoh5py.readthedocs-hosted.com/en/latest/>`_

See also documentation for the `geoh5 file format`_.

.. _geoh5 file format: docs/content/geoh5_file_format.textile


Installation
^^^^^^^^^^^^
Expand Down Expand Up @@ -100,12 +96,12 @@ The use of Third Party Software is governed by the terms of such software licens
Third Party Software notices and/or additional terms and conditions are located in the
`THIRD_PARTY_SOFTWARE.rst`_ file.

.. _THIRD_PARTY_SOFTWARE.rst: THIRD_PARTY_SOFTWARE.rst
.. _THIRD_PARTY_SOFTWARE.rst: docs/THIRD_PARTY_SOFTWARE.rst


Copyright
^^^^^^^^^
Copyright (c) 2024 Mira Geoscience Ltd.
Copyright (c) 2025 Mira Geoscience Ltd.


Citing geoh5py
Expand Down
Loading

0 comments on commit 40dae1f

Please sign in to comment.