Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pypy
Browse files Browse the repository at this point in the history
  • Loading branch information
john-kurkowski committed Feb 27, 2024
2 parents c2b9a1b + 931c001 commit 7a0918e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ strict = true
[tool.pytest.ini_options]
addopts = "--doctest-modules"

[tool.ruff]
[tool.ruff.lint]
select = [
"A",
"B",
Expand All @@ -101,5 +101,5 @@ ignore = [
"E501", # line too long; if Black does its job, not worried about the rare long line
]

[tool.ruff.pydocstyle]
[tool.ruff.lint.pydocstyle]
convention = "pep257"
1 change: 1 addition & 0 deletions tests/test_cache.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Test the caching functionality."""

from __future__ import annotations

import sys
Expand Down
1 change: 1 addition & 0 deletions tests/test_trie.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Trie tests."""

from itertools import permutations

from tldextract.tldextract import Trie
Expand Down
1 change: 0 additions & 1 deletion tldextract/__main__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""tldextract __main__."""


from .cli import main

if __name__ == "__main__":
Expand Down
1 change: 1 addition & 0 deletions tldextract/cache.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Helpers."""

from __future__ import annotations

import errno
Expand Down

0 comments on commit 7a0918e

Please sign in to comment.