Skip to content

Commit

Permalink
Prepare release 0.7.9; update pre-commit & black
Browse files Browse the repository at this point in the history
  • Loading branch information
dalito committed Feb 1, 2024
1 parent a4d5c29 commit c11c08b
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ default_language_version:
python: python3
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: end-of-file-fixer
- id: check-yaml
- id: check-toml
- id: trailing-whitespace
- repo: https://github.com/psf/black
rev: 23.7.0
rev: 24.1.1
hooks:
- id: black
args: ['--target-version', 'py38']
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.283
rev: v0.1.15
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
rev: v2.2.6
hooks:
- id: codespell
additional_dependencies:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change log

## Release 0.7.9 (2024-02-01)

Bug fixes:

- Adjust validation of GitHub user names to allow uppercase. #193, #194

## Release 0.7.8 (2023-10-30)

Bug fixes:
Expand Down
1 change: 1 addition & 0 deletions src/voc4cat/checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
These checks cannot be handled with pydantic model validation.
"""

import glob
import logging
import os
Expand Down
6 changes: 3 additions & 3 deletions src/voc4cat/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,9 @@ def rdf_to_excel(
pref_label=holder["pref_label"],
definition=holder["definition"],
members=holder["members"],
provenance=holder["provenance"]
if holder.get("provenance") is not None
else None,
provenance=(
holder["provenance"] if holder.get("provenance") is not None else None
),
vocab_name=vocab_name,
).to_excel(wb, row_no)
row_no += 1
Expand Down
2 changes: 1 addition & 1 deletion src/voc4cat/dag_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def dag_to_node_levels(termgraph, baselevel=0):

node_levels = []
for subgraph in subgraphs:
# We need a clean subgraph without cylces for creating an indented tree.
# We need a clean subgraph without cycles for creating an indented tree.
subgraph_clean = subgraph.copy()
subgraph_clean.remove_edges_from(broken_edges)
roots = [node for node, degree in subgraph_clean.in_degree() if degree == 0]
Expand Down
2 changes: 1 addition & 1 deletion src/voc4cat/merge_vocab.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def main(ttl_inbox: Path, vocab: Path) -> int:
exists = vocab / Path(new).name
cmd = ["git", "merge-file", "--theirs", str(exists), str(exists), str(new)]
logger.info("Running cmd: %s", " ".join(cmd))
outp = subprocess.run(cmd, capture_output=True) # noqa: S603
outp = subprocess.run(cmd, capture_output=True, check=False) # noqa: S603
logger.info("Cmd output: %s", outp.stdout)
if retcode := outp.returncode != 0:
break
Expand Down

0 comments on commit c11c08b

Please sign in to comment.