Skip to content

Commit cc8cab7

Browse files
authored
Ruff fixes
1 parent 4bfe2d2 commit cc8cab7

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ extend-exclude = [
108108
#supported for python 3.10
109109
target-version = "py310"
110110

111+
# Always autofix
112+
fix = true
113+
111114
[tool.uv]
112115
dev-dependencies = [
113116
"ruff",

src/mkdocs_table_reader_plugin/markdown.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import re
2-
from typing import Dict
3-
import pandas as pd
42
import textwrap
53

4+
import pandas as pd
5+
66

77
def replace_unescaped_pipes(text: str) -> str:
88
"""
@@ -19,7 +19,7 @@ def replace_unescaped_pipes(text: str) -> str:
1919
return re.sub(r"(?<!\\)\|", "\\|", text)
2020

2121

22-
def convert_to_md_table(df: pd.DataFrame, **markdown_kwargs: Dict) -> str:
22+
def convert_to_md_table(df: pd.DataFrame, **markdown_kwargs: dict) -> str:
2323
"""
2424
Convert dataframe to markdown table using tabulate.
2525
"""

src/mkdocs_table_reader_plugin/plugin.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import re
22

3-
from mkdocs.plugins import BasePlugin, get_plugin_logger
43
from mkdocs.config import config_options
54
from mkdocs.exceptions import ConfigurationError
5+
from mkdocs.plugins import BasePlugin, get_plugin_logger
66

7+
from mkdocs_table_reader_plugin.markdown import add_indentation, convert_to_md_table, fix_indentation
8+
from mkdocs_table_reader_plugin.readers import MACROS, READERS
79
from mkdocs_table_reader_plugin.safe_eval import parse_argkwarg
8-
from mkdocs_table_reader_plugin.readers import READERS, MACROS
9-
from mkdocs_table_reader_plugin.markdown import fix_indentation, add_indentation, convert_to_md_table
1010

1111
logger = get_plugin_logger("table-reader")
1212

@@ -138,7 +138,7 @@ def on_page_markdown(self, markdown, page, config, files, **kwargs):
138138
# match group 0: to extract any leading whitespace
139139
# match group 1: to extract the arguments (positional and keywords)
140140
tag_pattern = re.compile(
141-
r"( *)\{\{\s+%s\((.+)\)\s+\}\}" % reader, flags=re.IGNORECASE
141+
r"( *)\{\{\s+%s\((.+)\)\s+\}\}" % reader, flags=re.IGNORECASE # noqa: UP031
142142
)
143143
matches = re.findall(tag_pattern, markdown)
144144

src/mkdocs_table_reader_plugin/readers.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import pandas as pd
2-
import yaml
1+
import functools
2+
import logging
33
import os
44
from pathlib import Path
5-
import logging
65

7-
import functools
6+
import pandas as pd
7+
import yaml
88

9-
from mkdocs_table_reader_plugin.utils import kwargs_in_func, kwargs_not_in_func
109
from mkdocs_table_reader_plugin.markdown import convert_to_md_table
10+
from mkdocs_table_reader_plugin.utils import kwargs_in_func, kwargs_not_in_func
1111

1212
logger = logging.getLogger("mkdocs.plugins")
1313

@@ -134,14 +134,14 @@ def read_excel(*args, **kwargs) -> str:
134134
@ParseArgs
135135
def pd_read_yaml(*args, **kwargs) -> str:
136136
json_kwargs = kwargs_in_func(kwargs, pd.json_normalize)
137-
with open(args[0], "r") as f:
137+
with open(args[0]) as f:
138138
df = pd.json_normalize(yaml.safe_load(f), **json_kwargs)
139139
return df
140140

141141
@ParseArgs
142142
def read_yaml(*args, **kwargs) -> str:
143143
json_kwargs = kwargs_in_func(kwargs, pd.json_normalize)
144-
with open(args[0], "r") as f:
144+
with open(args[0]) as f:
145145
df = pd.json_normalize(yaml.safe_load(f), **json_kwargs)
146146

147147
markdown_kwargs = kwargs_not_in_func(kwargs, pd.json_normalize)
@@ -170,7 +170,7 @@ def read_raw(*args, **kwargs) -> str:
170170
Returns:
171171
str: file contents
172172
"""
173-
with open(args[0], "r") as f:
173+
with open(args[0]) as f:
174174
return f.read()
175175

176176

src/mkdocs_table_reader_plugin/safe_eval.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ def parse_argkwarg(input_str: str):
111111
else:
112112
if len(kwargs) != 0:
113113
raise AssertionError(
114-
"[table-reader-plugin] Make sure the python in your reader tag is correct: Positional arguments follow keyword arguments in '%s'"
115-
% input_str
114+
f"[table-reader-plugin] Make sure the python in your reader tag is correct: Positional arguments follow keyword arguments in '{input_str}'"
116115
)
117116
args.append(literal_eval(i))
118117

0 commit comments

Comments
 (0)