8000 why are all the git checks failing? · matplotlib/matplotlib@a21c4a8 · GitHub
[go: up one dir, main page]

Skip to content

Commit a21c4a8

Browse files
committed
why are all the git checks failing?
1 parent 394d73a commit a21c4a8

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

lib/matplotlib/tests/test_ticker.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,6 @@ def test_basic(self):
10421042

10431043

10441044
class TestFuncFormatter:
1045-
<<<<<<< HEAD
10461045
tests = [("function, 1 input",
10471046
(lambda x: f"{x}!", [2], "2!")),
10481047
("function 2 inputs",
@@ -1067,31 +1066,6 @@ def test_other_builtins(self):
10671066
with pytest.raises(UserWarning, match=r'max is not'):
10681067
mticker.FuncFormatter(max)
10691068

1070-
=======
1071-
def test_input_x_pos(self):
1072-
def func(x, pos):
1073-
return f"{x}+{pos}"
1074-
funcform = mticker.FuncFormatter(func)
1075-
assert "1+2" == funcform(1, 2)
1076-
1077-
def text_input_x(self):
1078-
def func(x):
1079-
f"hello {x}"
1080-
funcform = mticker.FuncFormatter(func)
1081-
assert "hello 0" == funcform(0)
1082-
1083-
def test_error(self):
1084-
with pytest.raises(TypeError, match=r"FuncFormatter*"):
1085-
def func(x, y, z):
1086-
" ".join([x, y, z])
1087-
funcform = mticker.FuncFormatter(func)
1088-
funcform(1, 2, 3)
1089-
1090-
def test_built_in(self):
1091-
funcform = mticker.FuncFormatter("{} hi!".format)
1092-
assert "42 hi!" == funcform(42)
1093-
>>>>>>> 103314bfb... flake errors
1094-
10951069

10961070
class TestStrMethodFormatter:
10971071
test_data = [

0 commit comments

Comments
 (0)
0