8000 CI: Address linting errors in flake8 >= 3.8.1 by mgmarino · Pull Request #34152 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

CI: Address linting errors in flake8 >= 3.8.1 #34152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 13, 2020
Merged

CI: Address linting errors in flake8 >= 3.8.1 #34152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c61bea4
Temporarily ignore linting errors
mgmarino May 13, 2020
8b9ea47
Remove unnecessary f-strings
mgmarino May 13, 2020
5249f8d
Fix f-string in test
mgmarino May 13, 2020
c0145c8
Remove ignore f-string linting errors
mgmarino May 13, 2020
5ef7fb0
Add blank line for PEP8 compliance
mgmarino May 13, 2020
49a038c
Use isinstance instead of comparing types
mgmarino May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unnecessary f-strings
  • Loading branch information
@mgmarino
mgmarino committed May 13, 2020
commit 8b9ea475666125b6936dd53b3dbe04785d77a72b
5 changes: 1 addition & 4 deletions pandas/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2584,10 +2584,7 @@ def append(self, to_append, ignore_index=False, verify_integrity=False):
else:
to_concat = [self, to_append]
if any(isinstance(x, (ABCDataFrame,)) for x in to_concat[1:]):
msg = (
f"to_append should be a Series or list/tuple of Series, "
f"got DataFrame"
)
msg = "to_append should be a Series or list/tuple of Series, got DataFrame"
raise TypeError(msg)
return concat(
to_concat, ignore_index=ignore_index, verify_integrity=verify_integrity
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/groupby/aggregate/test_numba.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ def incorrect_function(x):
{"key": ["a", "a", "b", "b", "a"], "data": [1.0, 2.0, 3.0, 4.0, 5.0]},
columns=["key", "data"],
)
with pytest.raises(NumbaUtilError, match=f"The first 2"):
with pytest.raises(NumbaUtilError, match="The first 2"):
data.groupby("key").agg(incorrect_function, engine="numba")

with pytest.raises(NumbaUtilError, match=f"The first 2"):
with pytest.raises(NumbaUtilError, match="The first 2"):
data.groupby("key")["data"].agg(incorrect_function, engine="numba")


Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/groupby/transform/test_numba.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ def incorrect_function(x):
{"key": ["a", "a", "b", "b", "a"], "data": [1.0, 2.0, 3.0, 4.0, 5.0]},
columns=["key", "data"],
)
with pytest.raises(NumbaUtilError, match=f"The first 2"):
with pytest.raises(NumbaUtilError, match="The first 2"):
data.groupby("key").transform(incorrect_function, engine="numba")

with pytest.raises(NumbaUtilError, match=f"The first 2"):
with pytest.raises(NumbaUtilError, match="The first 2"):
data.groupby("key")["data"].transform(incorrect_function, engine="numba")


Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/io/test_stata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1861,7 +1861,7 @@ def test_writer_118_exceptions(self):
@pytest.mark.parametrize("version", [105, 108, 111, 113, 114])
def test_backward_compat(version, datapath):
data_base = datapath("io", "data", "stata")
ref = os.path.join(data_base, f"stata-compat-118.dta")
ref = os.path.join(data_base, "stata-compat-118.dta")
old = os.path.join(data_base, f"stata-compat-{version}.dta")
expected = pd.read_stata(ref)
old_dta = pd.read_stata(old)
Expand Down
0