Skip to content

Commit

Permalink
Merge pull request #50 from jumanjiman/ruamel_breaking_change
Browse files Browse the repository at this point in the history
Ruamel breaking change
  • Loading branch information
jumanjiman authored May 4, 2023
2 parents d0cf8a7 + 7c741e5 commit 8d1b9ca
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
build:
docker:
# https://github.com/jumanjihouse/cci/pulls?q=is%3Apr+is%3Aclosed
- image: jumanjiman/cci:20200411.1724
- image: jumanjiman/cci:20220712.1639

working_directory: ~/workdir/

Expand Down
19 changes: 10 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ fail_fast: false

repos:
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.26.3
rev: v1.31.0
hooks:
- id: yamllint
args: [--format, parsable, --strict]
exclude: ^.pre-commit-hooks.yaml$

- repo: local
hooks:
Expand All @@ -36,7 +37,7 @@ repos:
args: [--mapping, '2', --sequence, '2', --offset, '0']

- repo: https://github.com/jumanjihouse/pre-commit-hooks
rev: 2.1.6
rev: 3.0.0
hooks:
- id: check-mailmap
- id: forbid-binary
Expand All @@ -52,27 +53,27 @@ repos:
args: [-d, -i 4, -ci]

- repo: https://github.com/PyCQA/bandit
rev: 1.7.4
rev: 1.7.5
hooks:
- id: bandit

- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
rev: 6.0.0
hooks:
- id: flake8

- repo: https://github.com/PyCQA/pydocstyle
rev: 6.1.1
rev: 6.3.0
hooks:
- id: pydocstyle

- repo: https://github.com/PyCQA/pylint
rev: v2.13.8
rev: v3.0.0a6
hooks:
- id: pylint

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-byte-order-marker
Expand All @@ -91,7 +92,7 @@ repos:
- id: sort-simple-yaml

- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.13
rev: v1.5.1
hooks:
- id: forbid-crlf
- id: forbid-tabs
Expand All @@ -111,7 +112,7 @@ repos:
stages: [manual]

- repo: https://github.com/Yelp/detect-secrets
rev: v1.2.0
rev: v1.4.0
hooks:
- id: detect-secrets
args: [--baseline, ci/secrets.baseline]
6 changes: 3 additions & 3 deletions ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
md-toc==6.0.2
pre-commit==2.2.0
ruamel.yaml==0.16.10
md-toc==8.1.9
pre-commit==3.3.1
ruamel.yaml==0.17.21
2 changes: 1 addition & 1 deletion ci/toc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ readonly INDENT=" "
trap 'echo [ERROR] in ${FILENAME}' ERR
while read -r FILENAME; do
# We expect line 1 to be the L1 heading.
md_toc --skip-lines 1 --in-place "${FILENAME}" github -l 4
md_toc --skip-lines 1 --in-place github -l 4 "${FILENAME}"
echo "${INDENT}${FILENAME} OK"
done < <(find . -name '*.md' -type f -exec grep -l '<!--TOC-->' {} +)
2 changes: 1 addition & 1 deletion pre_commit_hooks/yamlfmt
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class Formatter:
if not path:
path = self.path
print(path, end="")
FORMATTER.parse_file(path)
FORMATTER.parse_file(path) # pylint: disable=E0601
FORMATTER.write_file(path)
print(" Done")

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
version='0.0.0',

install_requires=[
'ruamel.yaml>=0.16.10',
'ruamel.yaml >=0.16.10, <=0.17.21',
],

scripts=[
Expand Down

0 comments on commit 8d1b9ca

Please sign in to comment.