Skip to content
Merged
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
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.7.0
rev: v0.9.0
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.12.0
rev: v1.14.1
hooks:
- id: mypy
additional_dependencies: [
Expand All @@ -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/)
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://gmggroup.org/>`_.
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "mira-omf" %}
{% set version = "3.3.0b2" %}
{% set version = "3.3.0rc1" %}

package:
name: {{ name|lower }}
Expand Down
2 changes: 1 addition & 1 deletion omf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions poetry.lock

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

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down
6 changes: 2 additions & 4 deletions tests/script_omf_to_geoh5_test.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import re
from pathlib import Path
from unittest.mock import patch

Expand Down Expand Up @@ -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)
Loading