From a0402c9f9073c5923836b6619f76b41ea2f3dd45 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Wed, 11 Dec 2024 00:18:11 +0100 Subject: [PATCH] build(deps): Bump pre-commit autoupdate Also add pyjson5 as an additional dependency for check-jsonschema pre-commit; I'm hoping that this will fix the following error seen (only) on CI (not locally): Validate Renovate Config.................................................Failed - hook id: check-renovate - exit code: 1 Several files failed to parse. BadFileTypeError: cannot parse .renovaterc.json5 because support is missing for json5 check-jsonschema can only parse json5 files when a json5 parser is installed If you are running check-jsonschema as an installed python package, either pip install json5 or pip install pyjson5 If you are running check-jsonschema as a pre-commit hook, set additional_dependencies: ['json5'] or additional_dependencies: ['pyjson5'] in "/home/runner/.cache/pre-commit/repothldx688/py_env-python3/lib/python3.12/site-packages/check_jsonschema/instance_loader.py", line 48 >>> data: t.Any = self._parsers.parse_data_with_path( I've chosen https://github.com/Kijewski/pyjson5 instead of https://github.com/dpranke/pyjson5 because the former seems to slower than latter with cython. --- .pre-commit-config.yaml | 17 ++++++++++------- docs/concepts/tika.md | 3 +-- tools/protolint/install.bash | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 530f97d73..695bf835e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -87,7 +87,7 @@ repos: - --use-current-year - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.8 + rev: v19.1.5 hooks: - id: clang-format # clang-format can also do e.g. *.java and *.json but we only want proto @@ -100,7 +100,8 @@ repos: - repo: https://github.com/yoheimuta/protolint # This version must be kept in the sync with the one in tools/protolint/install.bash - rev: v0.50.3 + # NB: v0.51.0 requires go v1.23 (so Fedora 41 not 40; TODO check GitHub Runner...) + rev: v0.50.5 hooks: - id: protolint @@ -116,13 +117,14 @@ repos: args: [--autofix, --aosp, --google-java-formatter-version=1.25.1] - repo: https://github.com/DavidAnson/markdownlint-cli2 - rev: v0.13.0 + rev: v0.16.0 hooks: - id: markdownlint-cli2 exclude: (^.github/|test/|docs/use/docgen/docgen.md) # Until https://github.com/DavidAnson/markdownlint/issues/121 - repo: https://github.com/tcort/markdown-link-check + # TODO v3.13.6 causes https://github.com/tcort/markdown-link-check/issues/387 ... rev: v3.12.2 hooks: - id: markdown-link-check @@ -131,7 +133,7 @@ repos: # Alternative: https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md - repo: https://github.com/keith/pre-commit-buildifier - rev: 6.4.0.1 + rev: 7.3.1.1 hooks: - id: buildifier args: &args @@ -169,7 +171,7 @@ repos: exclude: mvnw - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.29.0 + rev: 0.30.0 hooks: - id: check-github-actions args: ["--verbose"] @@ -179,6 +181,7 @@ repos: args: ["--verbose"] - id: check-renovate args: ["--verbose"] + additional_dependencies: ["pyjson5==1.6.7"] - id: check-metaschema files: \.schema\.json$ args: ["--verbose"] @@ -197,7 +200,7 @@ repos: # https://editorconfig.org check should run AFTER all of the formatters (above) - repo: https://github.com/editorconfig-checker/editorconfig-checker.python - rev: 2.7.3 + rev: 3.0.3 hooks: - id: editorconfig-checker exclude: mvnw diff --git a/docs/concepts/tika.md b/docs/concepts/tika.md index 7483d72a6..281657446 100644 --- a/docs/concepts/tika.md +++ b/docs/concepts/tika.md @@ -21,8 +21,7 @@ Enola in addition to RDF 🐢 TTL etc. can also read many other common file formats (see [`enola info`](../use/info/index.md)). This is courtesy of [Apache Tika](https://tika.apache.org), -see its [Supported Document Formats -](https://tika.apache.org/3.0.0-BETA2/formats.html). +see its [Supported Document Formats](https://tika.apache.org/3.0.0-BETA2/formats.html). All of these formats are supported e.g. for conversions with [Rosetta](../use/rosetta/index.md) but also `--load` for [Get](../use/get/index.md), [DocGen](../use/docgen/index.md) and [Server](../use/server/index.md), etc. diff --git a/tools/protolint/install.bash b/tools/protolint/install.bash index 5789df2ca..4d490c8f2 100755 --- a/tools/protolint/install.bash +++ b/tools/protolint/install.bash @@ -25,5 +25,5 @@ set -euo pipefail if ! [ -x "$(command -v "$(go env GOPATH)/bin/protolint")" ]; then # This version must be kept in the sync with the one in .pre-commit-config.yaml - go install github.com/yoheimuta/protolint/cmd/protolint@v0.47.5 + go install github.com/yoheimuta/protolint/cmd/protolint@v0.50.5 fi