Skip to content

Commit 60c7b35

Browse files
authored
Merge pull request #1367 from hackowitz-af/drop-superfluous-back-compatibility
Drop python<3.9 backports
2 parents f199ed8 + d38e3bc commit 60c7b35

File tree

2 files changed

+40
-47
lines changed

2 files changed

+40
-47
lines changed

jsonschema/cli.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@
44

55
from importlib import metadata
66
from json import JSONDecodeError
7+
from pkgutil import resolve_name
78
from textwrap import dedent
89
import argparse
910
import json
1011
import sys
1112
import traceback
1213
import warnings
1314

14-
try:
15-
from pkgutil import resolve_name
16-
except ImportError:
17-
from pkgutil_resolve_name import resolve_name # type: ignore[no-redef]
18-
1915
from attrs import define, field
2016

2117
from jsonschema.exceptions import SchemaError

pyproject.toml

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ requires-python = ">=3.9"
1212
license = "MIT"
1313
license-files = ["COPYING"]
1414
keywords = [
15-
"validation",
16-
"data validation",
17-
"jsonschema",
18-
"json",
19-
"json schema",
15+
"validation",
16+
"data validation",
17+
"jsonschema",
18+
"json",
19+
"json schema",
2020
]
2121
authors = [
2222
{ name = "Julian Berman", email = "[email protected]" },
@@ -42,9 +42,6 @@ dependencies = [
4242
"jsonschema-specifications>=2023.03.6",
4343
"referencing>=0.28.4",
4444
"rpds-py>=0.7.1",
45-
46-
"importlib_resources>=1.4.0;python_version<'3.9'",
47-
"pkgutil_resolve_name>=1.3.10;python_version<'3.9'",
4845
]
4946

5047
[project.optional-dependencies]
@@ -129,8 +126,8 @@ skip_covered = true
129126

130127
[tool.doc8]
131128
ignore = [
132-
"D000", # see PyCQA/doc8#125
133-
"D001", # one sentence per line, so max length doesn't make sense
129+
"D000", # see PyCQA/doc8#125
130+
"D001", # one sentence per line, so max length doesn't make sense
134131
]
135132

136133
[tool.mypy]
@@ -145,53 +142,53 @@ extend-exclude = ["json"]
145142
[tool.ruff.lint]
146143
select = ["ALL"]
147144
ignore = [
148-
"A001", # It's fine to shadow builtins
145+
"A001", # It's fine to shadow builtins
149146
"A002",
150147
"A003",
151148
"A005",
152-
"ARG", # This is all wrong whenever an interface is involved
153-
"ANN", # Just let the type checker do this
154-
"B006", # Mutable arguments require care but are OK if you don't abuse them
155-
"B008", # It's totally OK to call functions for default arguments.
156-
"B904", # raise SomeException(...) is fine.
157-
"B905", # No need for explicit strict, this is simply zip's default behavior
158-
"C408", # Calling dict is fine when it saves quoting the keys
159-
"C901", # Not really something to focus on
160-
"D105", # It's fine to not have docstrings for magic methods.
161-
"D107", # __init__ especially doesn't need a docstring
162-
"D200", # This rule makes diffs uglier when expanding docstrings
163-
"D203", # No blank lines before docstrings.
164-
"D212", # Start docstrings on the second line.
165-
"D400", # This rule misses sassy docstrings ending with ! or ?
166-
"D401", # This rule is too flaky.
167-
"D406", # Section headers should end with a colon not a newline
168-
"D407", # Underlines aren't needed
169-
"D412", # Plz spaces after section headers
170-
"EM101", # These don't bother me.
149+
"ARG", # This is all wrong whenever an interface is involved
150+
"ANN", # Just let the type checker do this
151+
"B006", # Mutable arguments require care but are OK if you don't abuse them
152+
"B008", # It's totally OK to call functions for default arguments.
153+
"B904", # raise SomeException(...) is fine.
154+
"B905", # No need for explicit strict, this is simply zip's default behavior
155+
"C408", # Calling dict is fine when it saves quoting the keys
156+
"C901", # Not really something to focus on
157+
"D105", # It's fine to not have docstrings for magic methods.
158+
"D107", # __init__ especially doesn't need a docstring
159+
"D200", # This rule makes diffs uglier when expanding docstrings
160+
"D203", # No blank lines before docstrings.
161+
"D212", # Start docstrings on the second line.
162+
"D400", # This rule misses sassy docstrings ending with ! or ?
163+
"D401", # This rule is too flaky.
164+
"D406", # Section headers should end with a colon not a newline
165+
"D407", # Underlines aren't needed
166+
"D412", # Plz spaces after section headers
167+
"EM101", # These don't bother me.
171168
"EM102",
172-
"FBT", # It's worth avoiding boolean args but I don't care to enforce it
173-
"FIX", # Yes thanks, if I could it wouldn't be there
174-
"N", # These naming rules are silly
175-
"PERF203", # try/excepts in loops are sometimes needed
176-
"PLR0911", # These metrics are fine to be aware of but not to enforce
169+
"FBT", # It's worth avoiding boolean args but I don't care to enforce it
170+
"FIX", # Yes thanks, if I could it wouldn't be there
171+
"N", # These naming rules are silly
172+
"PERF203", # try/excepts in loops are sometimes needed
173+
"PLR0911", # These metrics are fine to be aware of but not to enforce
177174
"PLR0912",
178175
"PLR0913",
179176
"PLR0915",
180-
"PLR1714", # This makes for uglier comparisons sometimes
181-
"PLW0642", # Shadowing self also isn't a big deal.
182-
"PLW2901", # Shadowing for loop variables is occasionally fine.
183-
"PT", # We use unittest
177+
"PLR1714", # This makes for uglier comparisons sometimes
178+
"PLW0642", # Shadowing self also isn't a big deal.
179+
"PLW2901", # Shadowing for loop variables is occasionally fine.
180+
"PT", # We use unittest
184181
"PYI025", # wat, I'm not confused, thanks.
185182
"RET502", # Returning None implicitly is fine
186183
"RET503",
187184
"RET505", # These push you to use `if` instead of `elif`, but for no reason
188185
"RET506",
189186
"RSE102", # Ha, what, who even knew you could leave the parens off. But no.
190-
"SIM300", # Not sure what heuristic this uses, but it's easily incorrect
187+
"SIM300", # Not sure what heuristic this uses, but it's easily incorrect
191188
"SLF001", # Private usage within this package itself is fine
192-
"TD", # These TODO style rules are also silly
189+
"TD", # These TODO style rules are also silly
193190
"TRY003", # Some exception classes are essentially intended for free-form
194-
"UP007", # We support 3.9
191+
"UP007", # We support 3.9
195192
]
196193

197194
[tool.ruff.lint.flake8-pytest-style]

0 commit comments

Comments
 (0)