Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/python_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
with:
package-manager: 'poetry'
app-name: 'las_geoh5'
python-version: '3.10'
python-version: '3.12'
call-workflow-pytest:
name: Pytest
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@v2
Expand All @@ -42,10 +42,10 @@ jobs:
pull-requests: read
with:
package-manager: 'poetry'
python-versions: '["3.10", "3.11", "3.12"]'
python-versions: '["3.12", "3.13", "3.14"]'
os: '["ubuntu-latest", "windows-latest"]'
cache-number: 1
codecov-reference-python-version: '3.10'
codecov-reference-python-version: '3.12'
codecov-reference-os: '["windows-latest"]'
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/python_deploy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
contents: write
with:
package-name: 'las-geoh5'
python-version: '3.10'
python-version: '3.12'
source-repo-names: '["public-noremote-conda-dev"]'
conda-channels: '["conda-forge"]'
publish-repo-names: '["public-noremote-conda-dev"]'
Expand All @@ -35,7 +35,7 @@ jobs:
package-manager: 'poetry'
package-name: 'las-geoh5'
version-tag: ${{ github.ref_name }}
python-version: '3.10'
python-version: '3.12'
virtual-repo-names: '["public-pypi-dev", "test-pypi"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repos:
- id: poetry-check
args: [--lock, --no-plugins]
- repo: https://github.com/hadialqattan/pycln
rev: v2.5.0
rev: v2.6.0
hooks:
- id: pycln
args: [--config=pyproject.toml]
Expand All @@ -35,8 +35,8 @@ repos:
hooks:
- id: mypy
additional_dependencies: [
numpy==1.26.*,
pydantic==2.5.*,
numpy==2.4.*,
pydantic==2.12.*,
tomli, # to read config from pyproject.toml
types-toml,
types-PyYAML,
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,4 @@ Third Party Software notices and/or additional terms and conditions are located
Copyright
---------

Copyright (c) 2026 Mira Geoscience
Copyright (c) 2024-2026 Mira Geoscience
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.10
- python=3.12
- pip
- pip:
- sphinx
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ Third Party Software notices and/or additional terms and conditions are located

Copyright
^^^^^^^^^
Copyright (c) 2024 Mira Geoscience Ltd.
Copyright (c) 2023-2026 Mira Geoscience Ltd.
4 changes: 2 additions & 2 deletions package.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ and a ui.json that parameterizes the driver and renders a UI for use within `Geo

Installation
^^^^^^^^^^^^
**las-geoh5** is currently written for Python 3.10 or higher.
**las-geoh5** is currently written for Python 3.12–3.14.

Install **las-geoh5** from PyPI::

Expand Down Expand Up @@ -62,4 +62,4 @@ Third Party Software notices and/or additional terms and conditions are located

Copyright
^^^^^^^^^
Copyright (c) 2026 Mira Geoscience Ltd.
Copyright (c) 2023-2026 Mira Geoscience Ltd.
464 changes: 187 additions & 277 deletions poetry.lock

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build-backend = "poetry_dynamic_versioning.backend"

[project]
name = "las-geoh5"
requires-python = ">=3.10,<4.0"
requires-python = ">=3.12,<3.15"

description = "Las/Geoh5 conversion"
license = "MIT"
Expand Down Expand Up @@ -65,9 +65,9 @@ version = "0.0.0.dev0"


[tool.poetry.dependencies]
lasio = "0.31.*"
numpy = "~1.26.0" # also in geoh5py
pydantic = "^2.5.2" # also in geoh5py
lasio = "0.32.*"
numpy = "~2.4.0"
pydantic = "~2.12.0"
tqdm = "^4.66.1"

## dependencies from Git repositories
Expand Down Expand Up @@ -116,7 +116,7 @@ initial-content = """
persistent-substitution = true

[tool.ruff]
target-version = "py310"
target-version = "py312"

[tool.ruff.lint]
ignore = [
Expand Down Expand Up @@ -161,7 +161,6 @@ show_column_numbers = true
check_untyped_defs = true

plugins = [
"numpy.typing.mypy_plugin",
"pydantic.mypy",
]

Expand Down
12 changes: 6 additions & 6 deletions recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema_version: 1
context:
name: "las-geoh5"
version: "0.0.0.dev0" # This will be replaced by the actual version in the build process
python_min: "3.10"
python_min: "3.12"
module_name: ${{ name|lower|replace("-", "_") }}

package:
Expand All @@ -27,19 +27,19 @@ build:
requirements:
host:
- pip
- python 3.10.*
- python ${{ python_min }}.*
- poetry-core >=1.8.0
- poetry-dynamic-versioning >=1.9, 1.*
- setuptools
- setuptools_scm
run:
- python >=${{ python_min }}
- python >=${{ python_min }},<3.15
# Mira packages
- geoh5py >=0.12.0b5, 0.12.*
- geoh5py >=0.13.0a2, 0.13.*
# direct dependencies
- lasio 0.31.*
- numpy 1.26.*
- pydantic >=2.5.2, 2.*
- numpy >=2.4.0, 2.4.*
- pydantic 2.12.*
- tqdm >=4.66.1, 4.*

tests:
Expand Down
2 changes: 1 addition & 1 deletion tests/import_las_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ def test_handle_no_group(tmp_path: Path):
module.run(filepath)

with Workspace(tmp_path / "import.geoh5") as workspace:
dh_group = workspace.get_entity("Drillhole Group")[0]
dh_group = workspace.get_entity("Drillholes")[0]
assert "123" in [k.name for k in dh_group.children]


Expand Down
4 changes: 4 additions & 0 deletions zizmor.yml
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
rules:
unpinned-uses:
config:
policies:
MiraGeoscience/*: any
Loading