Skip to content

gh-100238: Use setuptools in peg-generator and reenable tests #104798

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
lysnikolaou merged 9 commits into from
May 26, 2023
Merged

gh-100238: Use setuptools in peg-generator and reenable tests #104798

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88edfa7
gh-100238: Use setuptools in peg-generator and reenable tests
lysnikolaou May 23, 2023
c750365
Merge branch 'main' into setuptools-peg-generator
lysnikolaou May 24, 2023
907eae8
Roll back changes re. newline in tokenizer
lysnikolaou May 24, 2023
3e8c0aa
Fix test_pegen tests after changes in the Python tokenizer
lysnikolaou May 24, 2023
1c905d7
Take fixup_build_ext from 3.11 to use in the peg-generator
lysnikolaou May 24, 2023
339e592
Use full path in venv python executable
lysnikolaou May 25, 2023
672e463
Add another verbose print
lysnikolaou May 25, 2023
dc89e7b
Use sys.executable to find name of venv executable
lysnikolaou May 26, 2023
b3ab1a9
Check sysconfig for site-packages path
lysnikolaou May 26, 2023
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
Fix test_pegen tests after changes in the Python tokenizer
  • Loading branch information
@lysnikolaou
lysnikolaou committed May 24, 2023
commit 3e8c0aaff4e916174acba69ffff0c6d67f93e18e
108 changes: 54 additions & 54 deletions Lib/test/test_peg_generator/test_pegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ def test_gather(self) -> None:
[
[
TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2\n"
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2"
),
TokenInfo(
NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2\n"
NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2"
),
],
TokenInfo(
NEWLINE, string="\n", start=(1, 4), end=(1, 5), line="1, 2\n"
NEWLINE, string="\n", start=(1, 4), end=(1, 5), line="1, 2"
),
],
)
Expand All @@ -119,8 +119,8 @@ def test_expr_grammar(self) -> None:
self.assertEqual(
node,
[
TokenInfo(NUMBER, string="42", start=(1, 0), end=(1, 2), line="42\n"),
TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="42\n"),
TokenInfo(NUMBER, string="42", start=(1, 0), end=(1, 2), line="42"),
TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="42"),
],
)

Expand All @@ -137,19 +137,19 @@ def test_optional_operator(self) -> None:
[
[
TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2\n"
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2"
),
[
TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2"
),
TokenInfo(
NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2\n"
NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2"
),
],
],
TokenInfo(
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2\n"
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2"
),
],
)
Expand All @@ -158,10 +158,10 @@ def test_optional_operator(self) -> None:
node,
[
[
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1"),
None,
],
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1"),
],
)

Expand All @@ -178,22 +178,22 @@ def test_optional_literal(self) -> None:
[
[
TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1+\n"
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1+"
),
TokenInfo(OP, string="+", start=(1, 1), end=(1, 2), line="1+\n"),
TokenInfo(OP, string="+", start=(1, 1), end=(1, 2), line="1+"),
],
TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="1+\n"),
TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="1+"),
],
)
node = parse_string("1\n", parser_class)
self.assertEqual(
node,
[
[
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1"),
None,
],
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1"),
],
)

Expand All @@ -210,19 +210,19 @@ def test_alt_optional_operator(self) -> None:
[
[
TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2\n"
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2"
),
[
TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2"
),
TokenInfo(
NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2\n"
NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2"
),
],
],
TokenInfo(
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2\n"
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2"
),
],
)
Expand All @@ -231,10 +231,10 @@ def test_alt_optional_operator(self) -> None:
node,
[
[
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1"),
None,
],
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1"),
],
)

Expand All @@ -248,27 +248,27 @@ def test_repeat_0_simple(self) -> None:
self.assertEqual(
node,
[
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3\n"),
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3"),
[
TokenInfo(
NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3\n"
NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3"
),
TokenInfo(
NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3\n"
NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3"
),
],
TokenInfo(
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3\n"
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3"
),
],
)
node = parse_string("1\n", parser_class)
self.assertEqual(
node,
[
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1"),
[],
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1"),
],
)

Expand All @@ -283,36 +283,36 @@ def test_repeat_0_complex(self) -> None:
node,
[
TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n"
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3"
),
[
[
TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3"
),
TokenInfo(
NUMBER,
string="2",
start=(1, 4),
end=(1, 5),
line="1 + 2 + 3\n",
line="1 + 2 + 3",
),
],
[
TokenInfo(
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3"
),
TokenInfo(
NUMBER,
string="3",
start=(1, 8),
end=(1, 9),
line="1 + 2 + 3\n",
line="1 + 2 + 3",
),
],
],
TokenInfo(
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3"
),
],
)
Expand All @@ -327,17 +327,17 @@ def test_repeat_1_simple(self) -> None:
self.assertEqual(
node,
[
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3\n"),
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3"),
[
TokenInfo(
NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3\n"
NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3"
),
TokenInfo(
NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3\n"
NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3"
),
],
TokenInfo(
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3\n"
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3"
),
],
)
Expand All @@ -355,36 +355,36 @@ def test_repeat_1_complex(self) -> None:
node,
[
TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n"
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3"
),
[
[
TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3"
),
TokenInfo(
NUMBER,
string="2",
start=(1, 4),
end=(1, 5),
line="1 + 2 + 3\n",
line="1 + 2 + 3",
),
],
[
TokenInfo(
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3"
),
TokenInfo(
NUMBER,
string="3",
start=(1, 8),
end=(1, 9),
line="1 + 2 + 3\n",
line="1 + 2 + 3",
),
],
],
TokenInfo(
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3"
),
],
)
Expand All @@ -403,17 +403,17 @@ def test_repeat_with_sep_simple(self) -> None:
[
[
TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2, 3\n"
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2, 3"
),
TokenInfo(
NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2, 3\n"
NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2, 3"
),
TokenInfo(
NUMBER, string="3", start=(1, 6), end=(1, 7), line="1, 2, 3\n"
NUMBER, string="3", start=(1, 6), end=(1, 7), line="1, 2, 3"
),
],
TokenInfo(
NEWLINE, string="\n", start=(1, 7), end=(1, 8), line="1, 2, 3\n"
NEWLINE, string="\n", start=(1, 7), end=(1, 8), line="1, 2, 3"
),
],
)
Expand Down Expand Up @@ -447,28 +447,28 @@ def test_left_recursive(self) -> None:
string="1",
start=(1, 0),
end=(1, 1),
line="1 + 2 + 3\n",
line="1 + 2 + 3",
),
TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3"
),
TokenInfo(
NUMBER,
string="2",
start=(1, 4),
end=(1, 5),
line="1 + 2 + 3\n",
line="1 + 2 + 3",
),
],
TokenInfo(
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3"
),
TokenInfo(
NUMBER, string="3", start=(1, 8), end=(1, 9), line="1 + 2 + 3\n"
NUMBER, string="3", start=(1, 8), end=(1, 9), line="1 + 2 + 3"
),
],
TokenInfo(
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3"
),
],
)
Expand Down