Skip to content

Commit

Permalink
Merge pull request #2215 from marshmallow-code/pre-commit_update
Browse files Browse the repository at this point in the history
Pre commit update
  • Loading branch information
lafrech authored Dec 20, 2023
2 parents 988f700 + 24855ac commit 2ef3f44
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
rev: 6.1.0
hooks:
- id: flake8
additional_dependencies: [flake8-bugbear==22.12.6]
additional_dependencies: [flake8-bugbear==23.12.2]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.7.1
hooks:
Expand Down
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
EXTRAS_REQUIRE = {
"tests": ["pytest", "pytz", "simplejson"],
"lint": [
"mypy==1.7.1",
"flake8==6.1.0",
"flake8-bugbear==23.12.2",
"pre-commit>=2.4,<4.0",
],
"docs": [
Expand Down
8 changes: 5 additions & 3 deletions src/marshmallow/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,8 @@ class Boolean(Field):
"YES",
"1",
1,
True,
# Equal to 1
# True,
}
#: Default falsy values.
falsy = {
Expand All @@ -1161,8 +1162,9 @@ class Boolean(Field):
"NO",
"0",
0,
0.0,
False,
# Equal to 0
# 0.0,
# False,
}

#: Default error messages.
Expand Down
1 change: 1 addition & 0 deletions src/marshmallow/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ def __init__(self, meta, ordered: bool = False):
warnings.warn(
"The json_module class Meta option is deprecated. Use render_module instead.",
RemovedInMarshmallow4Warning,
stacklevel=2,
)
render_module = getattr(meta, "json_module", json)
else:
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ extras = tests
commands = pytest {posargs}

[testenv:lint]
deps = pre-commit~=2.4
deps = pre-commit~=3.5
skip_install = true
commands = pre-commit run --all-files --show-diff-on-failure

Expand Down

0 comments on commit 2ef3f44

Please sign in to comment.