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
22 changes: 11 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ default_language_version:
repos:

- repo: https://github.com/asottile/pyupgrade
rev: v3.15.0
rev: v3.20.0
hooks:
- id: pyupgrade
args: ['--py38-plus']

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -24,35 +24,35 @@ repos:
exclude: '.ipynb'

- repo: https://github.com/pappasam/toml-sort
rev: v0.23.1
rev: v0.24.2
hooks:
- id: toml-sort-fix

- repo: https://github.com/adrienverge/yamllint.git
rev: v1.32.0
rev: v1.37.1
hooks:
- id: yamllint
args: ['--config-file=.yamllint.yaml']

- repo: https://github.com/psf/black
rev: 23.10.1
rev: 25.1.0
hooks:
- id: black

- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 6.0.1
hooks:
- id: isort
args: ['--settings-file=pyproject.toml']

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.4
rev: v0.12.2
hooks:
- id: ruff
args: ["--show-fixes", "--fix"]

- repo: https://github.com/nbQA-dev/nbQA
rev: 1.7.0
rev: 1.9.1
hooks:
- id: nbqa-black
- id: nbqa-ruff
Expand All @@ -63,18 +63,18 @@ repos:
args: ['--settings-file=pyproject.toml']

- repo: https://github.com/keewis/blackdoc
rev: v0.3.9
rev: v0.4.1
hooks:
- id: blackdoc
additional_dependencies: ['black==23.10.1']

- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.10.1
rev: 25.1.0
hooks:
- id: black

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.27.1
rev: 0.33.2
hooks:
- id: check-github-workflows
- id: check-readthedocs
Expand Down
1 change: 1 addition & 0 deletions mdf_reader/cli.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Console script for mdf_reader."""

import argparse
import sys

Expand Down
6 changes: 3 additions & 3 deletions mdf_reader/data_models/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ def read_schema(schema_name=None, ext_schema_path=None):
"header"
].get("delimiter")
schema["header"].pop("delimiter", None)
schema["sections"][properties.dummy_level]["header"][
"field_layout"
] = schema["header"].get("field_layout")
schema["sections"][properties.dummy_level]["header"]["field_layout"] = (
schema["header"].get("field_layout")
)
schema["header"].pop("field_layout", None)
# 3.3. Make parsing order explicit
if not schema["header"].get("parsing_order"): # assume sequential
Expand Down
20 changes: 11 additions & 9 deletions mdf_reader/reader/read_sections.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,17 @@ def extract_fixed_width(section_serie_bf, section_schema):
)
)
section_missing = {
i: section_schema["elements"][i].get("missing_value")
if section_schema["elements"][i].get("disable_white_strip") is True
else [
section_schema["elements"][i].get("missing_value"),
" "
* section_schema["elements"][i].get(
"field_length", properties.MAX_FULL_REPORT_WIDTH
),
]
i: (
section_schema["elements"][i].get("missing_value")
if section_schema["elements"][i].get("disable_white_strip") is True
else [
section_schema["elements"][i].get("missing_value"),
" "
* section_schema["elements"][i].get(
"field_length", properties.MAX_FULL_REPORT_WIDTH
),
]
)
for i in section_names
}
section_elements = pd.read_fwf(
Expand Down
8 changes: 5 additions & 3 deletions mdf_reader/validator/validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ def validate_codes(elements, data, code_tables_path, schema, supp=False):
key_elements = [(element[0], x) for x in key_elements]
else:
key_elements = [
(properties.dummy_level, x)
if not isinstance(x, tuple)
else x
(
(properties.dummy_level, x)
if not isinstance(x, tuple)
else x
)
for x in key_elements
]
dtypes = {
Expand Down
Loading