diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index 0aba9ba..1294b3e 100644 --- a/.github/workflows/python_deploy_dev.yml +++ b/.github/workflows/python_deploy_dev.yml @@ -21,7 +21,7 @@ jobs: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} call-workflow-pypi-publish: - name: Publish development pypi package (JFrog Artifactory and TestPyPI) + name: Publish development pypi package (JFrog Artifactory, TestPyPI) uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main with: package-manager: 'poetry' diff --git a/.github/workflows/python_deploy_prod.yml b/.github/workflows/python_deploy_prod.yml index 14d5b14..90127b4 100644 --- a/.github/workflows/python_deploy_prod.yml +++ b/.github/workflows/python_deploy_prod.yml @@ -33,7 +33,7 @@ jobs: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} call-workflow-pypi-release: - name: Publish production PyPI package (JFrog Artifactory and PyPI) + name: Publish production PyPI package (JFrog Artifactory, PyPI) if: ${{ github.event_name == 'release' || github.event.inputs.publish-pypi == 'true' }} uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_pypi_assets.yml@main with: diff --git a/.idea/copyright/MiraGeoscience.xml b/.idea/copyright/MiraGeoscience.xml index dd8d054..58c8df4 100644 --- a/.idea/copyright/MiraGeoscience.xml +++ b/.idea/copyright/MiraGeoscience.xml @@ -1,6 +1,8 @@ <component name="CopyrightManager"> <copyright> - <option name="notice" value="Copyright (c) &#36;originalComment.match("Copyright \(c\) (\d+)", 1, "-", "&#36;today.year")&#36;today.year Mira Geoscience Ltd. This file is part of las-geoh5 package. All rights reserved. " /> + <option name="allowReplaceRegexp" value="Copyright .*Mira Geoscience" /> + <option name="keyword" value="Copyright .*" /> + <option name="notice" value="Copyright (c) &#36;originalComment.match("Copyright \(c\) (\d+)", 1, "-", "&#36;today.year")&#36;today.year Mira Geoscience Ltd. This file is part of las-geoh5 package. las-geoh5 is distributed under the terms and conditions of the MIT License (see LICENSE file at the root of this source code package). " /> <option name="myName" value="MiraGeoscience" /> </copyright> -</component> +</component> \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml index a129283..423841e 100644 --- a/.idea/copyright/profiles_settings.xml +++ b/.idea/copyright/profiles_settings.xml @@ -3,5 +3,19 @@ <module2copyright> <element module="sources" copyright="MiraGeoscience" /> </module2copyright> + <LanguageOptions name="Python"> + <option name="fileTypeOverride" value="3" /> + <option name="block" value="false" /> + <option name="separateBefore" value="true" /> + <option name="separateAfter" value="true" /> + <option name="box" value="true" /> + <option name="filler" value="'" /> + </LanguageOptions> + <LanguageOptions name="__TEMPLATE__"> + <option name="separateBefore" value="true" /> + <option name="separateAfter" value="true" /> + <option name="box" value="true" /> + <option name="filler" value="'" /> + </LanguageOptions> </settings> </component> diff --git a/.idea/scopes/sources.xml b/.idea/scopes/sources.xml index 23bac7f..c5d7336 100644 --- a/.idea/scopes/sources.xml +++ b/.idea/scopes/sources.xml @@ -1,3 +1,3 @@ <component name="DependencyValidationManager"> - <scope name="sources" pattern="(file:las_geoh5//*||file:devtools/*||file:tests//*||file:README*.rst)&&!file:*//htmlcov//*&&!file:*//.coverage&&!file:*//.*//*" /> -</component> + <scope name="sources" pattern="(file:las_geoh5//*||file:devtools/*||file:tests//*||file:las_geoh5-assets/__init__.py||file:meta.yaml||file:package.rst||file:pyproject.toml||file:README*.rst)&&!file:*//htmlcov//*&&!file:*//.coverage&&!file:*//.*//*" /> +</component> \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0042ffc..34a5273 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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.6.9 + rev: v0.9.0 hooks: - id: ruff args: @@ -31,7 +31,7 @@ repos: # - --unsafe-fixes - id: ruff-format - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.12.0 + rev: v1.14.1 hooks: - id: mypy additional_dependencies: [ @@ -43,15 +43,15 @@ repos: ] exclude: ^(docs|las_geoh5-assets)/ - repo: https://github.com/codingjoe/relint - rev: 3.2.0 + rev: 3.3.1 hooks: - id: relint args: [-W] # to fail on warnings - repo: http://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 diff --git a/LICENSE b/LICENSE index 8148138..9c6ee51 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Mira Geoscience +Copyright (c) 2023-2025 Mira Geoscience Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.rst b/README.rst index 620b9a1..c668276 100644 --- a/README.rst +++ b/README.rst @@ -142,4 +142,4 @@ Third Party Software notices and/or additional terms and conditions are located Copyright --------- -Copyright (c) 2024 Mira Geoscience +Copyright (c) 2023-2025 Mira Geoscience diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst index 6f75183..4e21727 100644 --- a/docs/source/getting_started.rst +++ b/docs/source/getting_started.rst @@ -49,7 +49,7 @@ and its few dependencies together. This is as simple opening a miniforge terminal and running the following commands -.. code-block:: +.. code-block:: bash conda create -n "las-geoh5" python=3.10 conda activate las-geoh5 diff --git a/docs/source/usage.rst b/docs/source/usage.rst index eae7f89..1953bf5 100644 --- a/docs/source/usage.rst +++ b/docs/source/usage.rst @@ -6,7 +6,7 @@ Basic usage The main entry points to the various modules are ``ui.json`` file (stored under the ``las_geoh5-assets`` directory). The ``ui.json`` has the dual purpose of (1) rendering a user-interface from Geoscience ANALYST and (2) storing the input parameters chosen by the user for the program to run. To learn more about the ui.json interface visit the -`UIJson documentation <https://geoh5py.readthedocs.io/en/v0.8.0-rc.1/content/uijson_format/usage.html#usage-with-geoscience-analyst-pro>`_ page. +`UIJson documentation <https://mirageoscience-geoh5py.readthedocs-hosted.com/en/stable/content/uijson_format/usage.html#usage-with-geoscience-analyst-pro>`_ page. User-interface diff --git a/las_geoh5-assets/__init__.py b/las_geoh5-assets/__init__.py index 4bc0221..9e69a8a 100644 --- a/las_geoh5-assets/__init__.py +++ b/las_geoh5-assets/__init__.py @@ -1,6 +1,9 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 package. -# -# All rights reserved. -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2023-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/las_geoh5-assets/uijson/import_las_files.ui.json b/las_geoh5-assets/uijson/import_las_files.ui.json index 287327a..9d63ff7 100644 --- a/las_geoh5-assets/uijson/import_las_files.ui.json +++ b/las_geoh5-assets/uijson/import_las_files.ui.json @@ -49,7 +49,7 @@ "collar_x_name": { "main": true, "label": "Easting", - "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.", + "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.", "value": "X", "group": "Collar mnemonics", "optional": true, @@ -58,7 +58,7 @@ "collar_y_name": { "main": true, "label": "Northing", - "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.", + "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.", "value": "Y", "group": "Collar mnemonics", "optional": true, @@ -66,7 +66,7 @@ }, "collar_z_name": { "main": true, - "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.", + "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.", "label": "Elevation", "value": "ELEV", "group": "Collar mnemonics", diff --git a/las_geoh5/__init__.py b/las_geoh5/__init__.py index 1401e90..5a6b78d 100644 --- a/las_geoh5/__init__.py +++ b/las_geoh5/__init__.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las_geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2023-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations diff --git a/las_geoh5/export_files/__init__.py b/las_geoh5/export_files/__init__.py index 65350bf..1cbd505 100644 --- a/las_geoh5/export_files/__init__.py +++ b/las_geoh5/export_files/__init__.py @@ -1,7 +1,9 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/las_geoh5/export_files/driver.py b/las_geoh5/export_files/driver.py index 947e910..ab9b469 100644 --- a/las_geoh5/export_files/driver.py +++ b/las_geoh5/export_files/driver.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations diff --git a/las_geoh5/export_files/uijson.py b/las_geoh5/export_files/uijson.py index f7435b2..053a8f6 100644 --- a/las_geoh5/export_files/uijson.py +++ b/las_geoh5/export_files/uijson.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from copy import deepcopy diff --git a/las_geoh5/export_las.py b/las_geoh5/export_las.py index c314aa7..3c4b938 100644 --- a/las_geoh5/export_las.py +++ b/las_geoh5/export_las.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations diff --git a/las_geoh5/import_directories/__init__.py b/las_geoh5/import_directories/__init__.py index 7e12cfd..05f36e6 100644 --- a/las_geoh5/import_directories/__init__.py +++ b/las_geoh5/import_directories/__init__.py @@ -1,7 +1,9 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/las_geoh5/import_directories/driver.py b/las_geoh5/import_directories/driver.py index f508b9c..3014898 100644 --- a/las_geoh5/import_directories/driver.py +++ b/las_geoh5/import_directories/driver.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations diff --git a/las_geoh5/import_directories/uijson.py b/las_geoh5/import_directories/uijson.py index c25f423..9ac0e50 100644 --- a/las_geoh5/import_directories/uijson.py +++ b/las_geoh5/import_directories/uijson.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from copy import deepcopy diff --git a/las_geoh5/import_files/__init__.py b/las_geoh5/import_files/__init__.py index 7e12cfd..05f36e6 100644 --- a/las_geoh5/import_files/__init__.py +++ b/las_geoh5/import_files/__init__.py @@ -1,7 +1,9 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/las_geoh5/import_files/driver.py b/las_geoh5/import_files/driver.py index feb6f65..bad1f5e 100644 --- a/las_geoh5/import_files/driver.py +++ b/las_geoh5/import_files/driver.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations diff --git a/las_geoh5/import_files/params.py b/las_geoh5/import_files/params.py index 21d0187..5279cba 100644 --- a/las_geoh5/import_files/params.py +++ b/las_geoh5/import_files/params.py @@ -1,9 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 package. -# -# All rights reserved. -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from pydantic import BaseModel, ConfigDict, model_validator diff --git a/las_geoh5/import_files/uijson.py b/las_geoh5/import_files/uijson.py index d4af609..285fe2c 100644 --- a/las_geoh5/import_files/uijson.py +++ b/las_geoh5/import_files/uijson.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from copy import deepcopy diff --git a/las_geoh5/import_las.py b/las_geoh5/import_las.py index bbd5ab1..db1d6cc 100644 --- a/las_geoh5/import_las.py +++ b/las_geoh5/import_las.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations @@ -318,8 +320,7 @@ def create_or_append_drillhole( name = str(name) if not name and logger is not None: logger.warning( - "No well name provided for LAS file. " - "Saving drillhole with name 'Unknown'." + "No well name provided for LAS file. Saving drillhole with name 'Unknown'." ) collar = get_collar(lasfile, translator, logger) diff --git a/las_geoh5/scripts/__init__.py b/las_geoh5/scripts/__init__.py index 0882ce5..1cbd505 100644 --- a/las_geoh5/scripts/__init__.py +++ b/las_geoh5/scripts/__init__.py @@ -1,6 +1,9 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/las_geoh5/scripts/geoh5_to_las.py b/las_geoh5/scripts/geoh5_to_las.py index b7cf0ce..560013f 100644 --- a/las_geoh5/scripts/geoh5_to_las.py +++ b/las_geoh5/scripts/geoh5_to_las.py @@ -1,9 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' import argparse import logging diff --git a/las_geoh5/scripts/las_to_geoh5.py b/las_geoh5/scripts/las_to_geoh5.py index a8ec2cc..bfd4b48 100644 --- a/las_geoh5/scripts/las_to_geoh5.py +++ b/las_geoh5/scripts/las_to_geoh5.py @@ -1,9 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' import argparse import logging diff --git a/las_geoh5/uijson/__init__.py b/las_geoh5/uijson/__init__.py index e13fe34..05f36e6 100644 --- a/las_geoh5/uijson/__init__.py +++ b/las_geoh5/uijson/__init__.py @@ -1,6 +1,9 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# All rights reserved. -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/las_geoh5/uijson/write_uijson.py b/las_geoh5/uijson/write_uijson.py index a267a0e..64eb8e7 100644 --- a/las_geoh5/uijson/write_uijson.py +++ b/las_geoh5/uijson/write_uijson.py @@ -1,14 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# All rights reserved. -# -# -# This file is part of las-geoh5 project. -# -# All rights reserved. -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations diff --git a/meta.yaml b/meta.yaml index a33cae9..9388b56 100644 --- a/meta.yaml +++ b/meta.yaml @@ -21,13 +21,13 @@ build: requirements: host: - pip - - python >=3.10.0,<3.11 + - python >=3.10.0,<4.0.0 - poetry-core >=1.0.0 - setuptools - setuptools_scm run: - python >=3.9.0,<3.11 - - geoh5py >=0.10.0a1,<0.11.0 + - geoh5py >=0.10.0b1,<0.11.0a.dev - lasio >=0.31 - numpy >=1.26.0,<1.27.0 - pydantic >=2.5.2,<2.6.0 diff --git a/poetry.lock b/poetry.lock index a4763bd..421f022 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "alabaster" @@ -1257,4 +1257,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "0491e66528e81491cc2606803f0faf5befec0d0354e3ec232ceb06ac5fc7f949" +content-hash = "5491b7a247cce366526b98a14a8e1da83cd89a86c9946a1fb47da6776a931e35" diff --git a/pyproject.toml b/pyproject.toml index 31fc790..2f2635d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,12 +31,12 @@ packages = [ ] include = [ - { path = "COPYING", format = ["sdist", "wheel"] }, - { path = "COPYING.LESSER", format = ["sdist", "wheel"] }, - { path = "LICENSE", format = ["sdist", "wheel"] }, - { path = "README.rst", format = ["sdist", "wheel"] }, - { path = "THIRD_PARTY_SOFTWARE.rst", format = ["sdist", "wheel"] }, - { path = "docs/**/THIRD_PARTY_SOFTWARE.rst", format = ["sdist", "wheel"] }, + { path = "COPYING" }, + { path = "COPYING.LESSER" }, + { path = "LICENSE" }, + { path = "README.rst" }, + { path = "THIRD_PARTY_SOFTWARE.rst" }, + { path = "docs/**/THIRD_PARTY_SOFTWARE.rst" }, ] [tool.poetry.scripts] @@ -46,7 +46,7 @@ las_to_geoh5 = 'las_geoh5.scripts.las_to_geoh5:main' [tool.poetry.dependencies] python = "^3.10" -lasio = "~0.31" +lasio = "0.31.*" numpy = "~1.26.0" # also in geoh5py pydantic = "^2.5.2" # also in geoh5py tqdm = "^4.66.1" diff --git a/tests/__init__.py b/tests/__init__.py index d9afd62..1cbd505 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,9 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las_geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/tests/assets_path_test.py b/tests/assets_path_test.py index d872d61..9145d4b 100644 --- a/tests/assets_path_test.py +++ b/tests/assets_path_test.py @@ -1,9 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from las_geoh5 import assets_path diff --git a/tests/conftest.py b/tests/conftest.py index 7d1c0e5..a2ce78e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las_geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations diff --git a/tests/geoh5_to_las_test.py b/tests/geoh5_to_las_test.py index c1674bb..81a5921 100644 --- a/tests/geoh5_to_las_test.py +++ b/tests/geoh5_to_las_test.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' import logging import random diff --git a/tests/helpers.py b/tests/helpers.py index a994483..622235b 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -1,9 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from pathlib import Path diff --git a/tests/import_las_test.py b/tests/import_las_test.py index b4912a4..0a0b4ce 100644 --- a/tests/import_las_test.py +++ b/tests/import_las_test.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations diff --git a/tests/script_geoh5_to_las_test.py b/tests/script_geoh5_to_las_test.py index 0cdefbe..4d2cb76 100644 --- a/tests/script_geoh5_to_las_test.py +++ b/tests/script_geoh5_to_las_test.py @@ -1,9 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from pathlib import Path from unittest.mock import patch diff --git a/tests/script_las_to_geoh5_test.py b/tests/script_las_to_geoh5_test.py index 13a7f0a..88e7967 100644 --- a/tests/script_las_to_geoh5_test.py +++ b/tests/script_las_to_geoh5_test.py @@ -1,9 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from pathlib import Path from unittest.mock import patch diff --git a/tests/version_test.py b/tests/version_test.py index fd777ba..85e1c70 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las_geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from __future__ import annotations @@ -19,7 +21,7 @@ import las_geoh5 -def get_version(): +def get_pyproject_version(): path = Path(__file__).resolve().parents[1] / "pyproject.toml" with open(str(path), encoding="utf-8") as file: @@ -43,7 +45,10 @@ def get_conda_recipe_version(): def test_version_is_consistent(): - assert las_geoh5.__version__ == get_version() + assert las_geoh5.__version__ == get_pyproject_version() + normalized_conda_version = Version(get_conda_recipe_version()) + normalized_version = Version(las_geoh5.__version__) + assert normalized_conda_version == normalized_version def test_conda_version_is_pep440(): diff --git a/tests/write_uijson_test.py b/tests/write_uijson_test.py index 5e3d863..6e3a9bc 100644 --- a/tests/write_uijson_test.py +++ b/tests/write_uijson_test.py @@ -1,10 +1,12 @@ -# Copyright (c) 2024 Mira Geoscience Ltd. -# -# This file is part of las-geoh5 project. -# -# las-geoh5 is distributed under the terms and conditions of the MIT License -# (see LICENSE file at the root of this source code package). -# +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' +# ' +# This file is part of las-geoh5 package. ' +# ' +# las-geoh5 is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from las_geoh5.uijson.write_uijson import main