Skip to content

Commit 96e343e

Browse files
sebhmgsebhmg
authored
Merge pull request #74 from MiraGeoscience/release/0.3.0
Release/0.3.0
2 parents 02f48e4 + eccd142 commit 96e343e

Some content is hidden

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

48 files changed

+1202
-815
lines changed

‎.github/workflows/issue_to_jira.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ jobs:
99
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-issue_to_jira.yml@main
1010
secrets: inherit
1111
with:
12-
project_key: 'GEOPY'
12+
project-key: 'GEOPY'

‎.github/workflows/python_analysis.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,18 @@ jobs:
2626
name: Static analysis
2727
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-static_analysis.yml@main
2828
with:
29-
package_manager: 'poetry'
30-
app_name: 'las_geoh5'
31-
python_vers: '3.10'
32-
call-workflow-pytest-on-windows:
33-
name: Pytest on Windows
34-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest_windows.yml@main
29+
package-manager: 'poetry'
30+
app-name: 'las_geoh5'
31+
python-version: '3.10'
32+
call-workflow-pytest:
33+
name: Pytest
34+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
3535
with:
36-
package_manager: 'poetry'
37-
python_ver: '["3.10"]'
38-
cache_number: 1
39-
codecov_reference_python_ver: '3.10'
36+
package-manager: 'poetry'
37+
python-versions: '["3.10", "3.11", "3.12"]'
38+
os: '["ubuntu-latest", "windows-latest"]'
39+
cache-number: 1
40+
codecov-reference-python-version: '3.10'
41+
codecov-reference-os: '["windows-latest"]'
4042
secrets:
4143
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
42-
call-workflow-pytest-on-unix-os:
43-
name: Pytest on Unix OS
44-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest_unix_os.yml@main
45-
with:
46-
package_manager: 'poetry'
47-
python_ver: '["3.10"]'
48-
os: '["ubuntu-latest"]'
49-
cache_number: 1

‎.github/workflows/python_deploy_dev.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Deploy python package in development
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*' # Push events to every version tag (eg. v1.0.0)
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
call-workflow-conda-publish:
14+
name: Publish development conda package on JFrog Artifactory
15+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@main
16+
with:
17+
package-name: 'las-geoh5'
18+
python-version: '3.10'
19+
virtual-repo-names: '["public-conda-dev"]'
20+
secrets:
21+
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
22+
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
23+
call-workflow-pypi-publish:
24+
name: Publish development pypi package (JFrog Artifactory, TestPyPI)
25+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main
26+
with:
27+
package-manager: 'poetry'
28+
package-name: 'las-geoh5'
29+
version-tag: ${{ github.ref_name }}
30+
python-version: '3.10'
31+
virtual-repo-names: '["public-pypi-dev", "test-pypi"]'
32+
secrets:
33+
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
34+
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
35+
PYPI_TOKEN: ${{ secrets.TEST_PYPI_TOKEN }}

‎.github/workflows/python_deploy_prod.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Deploy python package in production
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
inputs:
8+
release-tag:
9+
description: 'Tag for the existing (draft) release to publish assets from'
10+
required: true
11+
publish-conda:
12+
description: 'Publish Conda package'
13+
required: false
14+
default: true
15+
publish-pypi:
16+
description: 'Publish PyPI package'
17+
required: false
18+
default: true
19+
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.event.release.tag_name || github.event.inputs.release-tag || github.run_id }}
22+
cancel-in-progress: true
23+
24+
jobs:
25+
call-workflow-conda-release:
26+
name: Publish production Conda package on JFrog Artifactory
27+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
28+
if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
29+
with:
30+
virtual-repo-names: '["public-conda-prod"]'
31+
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
32+
secrets:
33+
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
34+
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
35+
call-workflow-pypi-release:
36+
name: Publish production PyPI package (JFrog Artifactory, PyPI)
37+
if: ${{ github.event_name == 'release' || github.event.inputs.publish-pypi == 'true' }}
38+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_pypi_assets.yml@main
39+
with:
40+
package-name: 'las-geoh5'
41+
virtual-repo-names: '["public-pypi-prod", "pypi"]'
42+
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
43+
secrets:
44+
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
45+
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
46+
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

‎.idea/copyright/MiraGeoscience.xml

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/copyright/profiles_settings.xml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/scopes/sources.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.pre-commit-config.yaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
default_language_version:
33
python: python3
44
exclude: ^docs/(source/conf.py|_ext/)
5-
default_stages: [commit,push]
5+
default_stages: [pre-commit,pre-push]
66
fail_fast: false
77

88
ci:
@@ -17,12 +17,12 @@ repos:
1717
- id: poetry-check
1818
args: [--lock]
1919
- repo: https://github.com/hadialqattan/pycln
20-
rev: v2.4.0
20+
rev: v2.5.0
2121
hooks:
2222
- id: pycln
2323
args: [--config=pyproject.toml]
2424
- repo: https://github.com/astral-sh/ruff-pre-commit
25-
rev: v0.5.5
25+
rev: v0.9.0
2626
hooks:
2727
- id: ruff
2828
args:
@@ -31,26 +31,27 @@ repos:
3131
# - --unsafe-fixes
3232
- id: ruff-format
3333
- repo: https://github.com/pre-commit/mirrors-mypy
34-
rev: v1.11.0
34+
rev: v1.14.1
3535
hooks:
3636
- id: mypy
3737
additional_dependencies: [
38-
numpy==1.26.*, # pre-commit CI does not provide numpy 1.23.*
38+
numpy==1.26.*,
3939
pydantic==2.5.*,
4040
tomli, # to read config from pyproject.toml
4141
types-toml,
42+
types-PyYAML,
4243
]
4344
exclude: ^(docs|las_geoh5-assets)/
4445
- repo: https://github.com/codingjoe/relint
45-
rev: 3.1.1
46+
rev: 3.3.1
4647
hooks:
4748
- id: relint
4849
args: [-W] # to fail on warnings
4950
- repo: http://github.com/MiraGeoscience/pre-commit-hooks
50-
rev: v1.0.1
51+
rev: v1.0.2
5152
hooks:
5253
- id: check-copyright
53-
files: (^LICENSE|^README(|-dev).rst|\.py|\.pyi)$
54+
files: (^package\.rst|^LICENSE|^README(|-dev)\.rst|\.py|\.pyi)$
5455
exclude: (^\.|^docs/)
5556
- id: prepare-commit-msg
5657
- id: check-commit-msg
@@ -70,15 +71,16 @@ repos:
7071
exclude: (\.lock|\.ipynb|^THIRD_PARTY_SOFTWARE\.rst)$
7172
entry: codespell -I .codespellignore
7273
- repo: https://github.com/pre-commit/pre-commit-hooks
73-
rev: v4.6.0
74+
rev: v5.0.0
7475
hooks:
7576
- id: trailing-whitespace
7677
exclude: \.mdj$
7778
- id: check-json
7879
exclude_types: [jupyter]
7980
- id: check-toml
8081
- id: check-yaml
81-
# - id: check-added-large-files # crashing on some configuration. To be investigated
82+
exclude: ^meta.yaml$
83+
- id: check-added-large-files
8284
- id: check-case-conflict
8385
- id: check-merge-conflict
8486
- id: debug-statements

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ MIT License
111111

112112
Permission is hereby granted, free of charge, to any person obtaining a
113113
copy of this software and associated documentation files (the
114-
“Software”), to deal in the Software without restriction, including
114+
"Software"), to deal in the Software without restriction, including
115115
without limitation the rights to use, copy, modify, merge, publish,
116116
distribute, sublicense, and/or sell copies of the Software, and to
117117
permit persons to whom the Software is furnished to do so, subject to
@@ -131,7 +131,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
131131
Third Party Software
132132
--------------------
133133

134-
The curve-apps Software may provide links to third party libraries or code (collectively “Third Party Software”)
134+
The curve-apps Software may provide links to third party libraries or code (collectively "Third Party Software")
135135
to implement various functions. Third Party Software does not comprise part of the Software.
136136
The use of Third Party Software is governed by the terms of such software license(s).
137137
Third Party Software notices and/or additional terms and conditions are located in the
@@ -142,4 +142,4 @@ Third Party Software notices and/or additional terms and conditions are located
142142
Copyright
143143
---------
144144

145-
Copyright (c) 2024 Mira Geoscience
145+
Copyright (c) 2023-2025 Mira Geoscience

‎docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
html_static_path = ["_static"]
2828

2929
# The short X.Y version.
30-
version = "0.2.2"
30+
version = "0.3.0"
3131
# The full version, including alpha/beta/rc tags.
32-
release = "0.2.2"
32+
release = "0.3.0"

‎docs/source/getting_started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ and its few dependencies together.
4949

5050
This is as simple opening a miniforge terminal and running the following commands
5151

52-
.. code-block::
52+
.. code-block:: bash
5353
5454
conda create -n "las-geoh5" python=3.10
5555
conda activate las-geoh5

‎docs/source/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Basic usage
66
The main entry points to the various modules are ``ui.json`` file (stored under the ``las_geoh5-assets`` directory).
77
The ``ui.json`` has the dual purpose of (1) rendering a user-interface from Geoscience ANALYST and (2) storing the input
88
parameters chosen by the user for the program to run. To learn more about the ui.json interface visit the
9-
`UIJson documentation <https://geoh5py.readthedocs.io/en/v0.8.0-rc.1/content/uijson_format/usage.html#usage-with-geoscience-analyst-pro>`_ page.
9+
`UIJson documentation <https://mirageoscience-geoh5py.readthedocs-hosted.com/en/stable/content/uijson_format/usage.html#usage-with-geoscience-analyst-pro>`_ page.
1010

1111

1212
User-interface

‎las_geoh5-assets/__init__.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# Copyright (c) 2024 Mira Geoscience Ltd.
2-
#
3-
# This file is part of las-geoh5 package.
4-
#
5-
# All rights reserved.
6-
#
1+
# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
2+
# Copyright (c) 2023-2025 Mira Geoscience Ltd. '
3+
# '
4+
# This file is part of las-geoh5 package. '
5+
# '
6+
# las-geoh5 is distributed under the terms and conditions of the MIT License '
7+
# (see LICENSE file at the root of this source code package). '
8+
# '
9+
# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

‎las_geoh5-assets/uijson/export_las_files.ui.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"main": true
1212
},
1313
"conda_environment_boolean": false,
14-
"workspace": "",
1514
"drillhole_group": {
1615
"main": true,
1716
"label": "Drillhole group",

‎las_geoh5-assets/uijson/import_las_directories.ui.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"main": true
1212
},
1313
"conda_environment_boolean": false,
14-
"workspace": "",
1514
"drillhole_group": {
1615
"main": true,
1716
"label": "Drillhole group",

‎las_geoh5-assets/uijson/import_las_files.ui.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"tooltip": "Warning: launches process to run python model on save"
1212
},
1313
"conda_environment_boolean": false,
14-
"workspace": "",
1514
"drillhole_group": {
1615
"main": true,
1716
"label": "Drillhole group",
@@ -50,27 +49,27 @@
5049
"collar_x_name": {
5150
"main": true,
5251
"label": "Easting",
53-
"tooltip": "Name of header field containing the collar easting.",
52+
"tooltip": "Name of the mnemonic (MNEM column) in ~Well header section of las file that provides the collar easting. Does not include the .UNIT extension.",
5453
"value": "X",
55-
"group": "Collar",
54+
"group": "Collar mnemonics",
5655
"optional": true,
5756
"enabled": false
5857
},
5958
"collar_y_name": {
6059
"main": true,
6160
"label": "Northing",
62-
"tooltip": "Name of header field containing the collar northing.",
61+
"tooltip": "Name of the mnemonic (MNEM column) in ~Well header section of las file that provides the collar northing. Does not include the .UNIT extension.",
6362
"value": "Y",
64-
"group": "Collar",
63+
"group": "Collar mnemonics",
6564
"optional": true,
6665
"enabled": false
6766
},
6867
"collar_z_name": {
6968
"main": true,
70-
"tooltip": "Name of header field containing the collar elevation.",
69+
"tooltip": "Name of the mnemonic (MNEM column) in ~Well header section of las file that provides the collar elevation. Does not include the .UNIT extension.",
7170
"label": "Elevation",
7271
"value": "ELEV",
73-
"group": "Collar",
72+
"group": "Collar mnemonics",
7473
"optional": true,
7574
"enabled": false
7675
},

0 commit comments

Comments
 (0)