diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 930fc1ef..18510fba 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.7.0 + 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: [ @@ -44,13 +44,13 @@ repos: files: ^(omf/fileio/geoh5\.py$|omf/scripts/|tests/) exclude: ^docs/ - repo: https://github.com/codingjoe/relint - rev: 3.2.0 + rev: 3.3.1 hooks: - id: relint args: [-W] # to fail on warnings files: ^(omf/fileio/geoh5\.py$|omf/scripts/|tests/) - repo: https://github.com/MiraGeoscience/pre-commit-hooks - rev: v1.0.1 + rev: v1.0.2 hooks: # - id: check-copyright # no copyright nor license notice: differ to upstream repo # files: ^(omf/fileio/geoh5\.py$|omf/scripts/|tests/) diff --git a/README.rst b/README.rst index dac50313..95c7b8c0 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ omf :alt: pytest -Version: 3.3.0-beta.2 +Version: 3.3.0-rc.1 API library for Open Mining Format, a new standard for mining data backed by the `Global Mining Standards & Guidelines Group `_. diff --git a/docs/conf.py b/docs/conf.py index a2ca2f53..a720c1e6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -64,7 +64,7 @@ # The short X.Y version. version = u'3.3.0' # The full version, including alpha/beta/rc tags. -release = u'3.3.0-beta.2' +release = u'3.3.0-rc.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/meta.yaml b/meta.yaml index d32bc215..f9f0702a 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mira-omf" %} -{% set version = "3.3.0b2" %} +{% set version = "3.3.0rc1" %} package: name: {{ name|lower }} diff --git a/omf/__init__.py b/omf/__init__.py index ab041f45..cc5c7b13 100644 --- a/omf/__init__.py +++ b/omf/__init__.py @@ -30,7 +30,7 @@ from .volume import VolumeElement, VolumeGridGeometry -__version__ = "3.3.0-beta.2" +__version__ = "3.3.0-rc.1" __author__ = "Global Mining Standards and Guidelines Group" __license__ = "MIT License" __copyright__ = "Copyright 2017 Global Mining Standards and Guidelines Group" diff --git a/poetry.lock b/poetry.lock index 6cc93ff2..aa71f3a4 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" @@ -305,13 +305,13 @@ test = ["pytest (>=6)"] [[package]] name = "geoh5py" -version = "0.10.0b4" +version = "0.10.0rc1" description = "Python API for geoh5, an open file format for geoscientific data" optional = false python-versions = "<4.0,>=3.10" files = [ - {file = "geoh5py-0.10.0b4-py3-none-any.whl", hash = "sha256:debf979f0e5ef2ac3dee51a50fc44eb3a5eb9ef5ff18d1de7b2fd6b5e76734f6"}, - {file = "geoh5py-0.10.0b4.tar.gz", hash = "sha256:8695cc1b75cb5194729354e9dcd6c67487fc6ecc5aeb12df6c717b20d4fef67f"}, + {file = "geoh5py-0.10.0rc1-py3-none-any.whl", hash = "sha256:50a6b8f52a0dafd9cff1706155c50262d66d193a063822f32837e0e424ead9f2"}, + {file = "geoh5py-0.10.0rc1.tar.gz", hash = "sha256:19d5a89f4d340e937ae6741af086df8ac3048905457dc405dcc60472a24aa1c0"}, ] [package.dependencies] diff --git a/pyproject.toml b/pyproject.toml index eb7bd8f4..d32c0416 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "mira-omf" -version = "3.3.0-beta.2" +version = "3.3.0-rc.1" description = "API Library for Open Mining Format" license = "MIT" authors = [ diff --git a/tests/script_omf_to_geoh5_test.py b/tests/script_omf_to_geoh5_test.py index 8ea40236..65d4bb79 100644 --- a/tests/script_omf_to_geoh5_test.py +++ b/tests/script_omf_to_geoh5_test.py @@ -1,3 +1,4 @@ +import re from pathlib import Path from unittest.mock import patch @@ -144,7 +145,4 @@ def test_omf_to_geoh5_with_gzip_level_too_high(capsys, tmp_path: Path): assert not output_path.exists() assert captured_exception.value.code == 2 captured_err = capsys.readouterr().err - assert any( - "error: argument --gzip: invalid choice: 10" in line - for line in captured_err.splitlines() - ) + assert re.search(r"error: argument --gzip: invalid choice:", captured_err)