Skip to content

Commit e63a810

Browse files
committed
Bump dom-toml
* Update expected error messages (now coming from tomli not toml) * Update expected output (tomli puts small tables inline)
1 parent 06a6994 commit e63a810

File tree

36 files changed

+107
-158
lines changed

36 files changed

+107
-158
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
click>=8.0.1
22
consolekit>=1.2.3
3-
dom-toml>=0.5.0
3+
dom-toml>=2.0.0
44
domdf-python-tools>=3.0.0
55
entrypoints>=0.3
66
formate>=0.4.9
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
err:
2-
- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char
3-
28)'
2+
- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)'
43
- ''
54
out:
65
- ''

tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_6_.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
err:
2-
- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char
3-
28)'
2+
- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)'
43
- ''
54
out:
65
- "--- .../example.rst\t(original)"

tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@
7171
[project]
7272
name = "my-project"
7373
version = "1.2.3"
74-
75-
[project.license]
76-
file = "LICENSE"
74+
license = { file = "LICENSE" }
7775
7876
7977
.. code-block:: TOML

tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ err:
33
out:
44
- "--- .../example.rst\t(original)"
55
- "+++ .../example.rst\t(reformatted)"
6-
- '@@ -69,13 +69,11 @@'
6+
- '@@ -69,13 +69,9 @@'
77
- ' .. code-block:: toml'
88
- ''
99
- " \t[project]"
10-
- "+\tname = \"my-project\""
11-
- "+\tversion = \"1.2.3\""
12-
- ''
10+
- '-'
1311
- '-'
1412
- "-\tname = 'my-project'"
1513
- '-'
1614
- '-'
1715
- "-\tversion=\"1.2.3\""
1816
- "-\tlicense = {file = \"LICENSE\"}"
19-
- "+\t[project.license]"
20-
- "+\tfile = \"LICENSE\""
17+
- "+\tname = \"my-project\""
18+
- "+\tversion = \"1.2.3\""
19+
- "+\tlicense = { file = \"LICENSE\" }"
2120
- ''
2221
- ''
2322
- ' .. code-block:: TOML'
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
err:
2-
- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char
3-
28)'
2+
- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)'
43
- ''
54
out:
65
- ''

tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@
7171
[project]
7272
name = "my-project"
7373
version = "1.2.3"
74-
75-
[project.license]
76-
file = "LICENSE"
74+
license = { file = "LICENSE" }
7775
7876
7977
.. code-block:: TOML

tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ err:
33
out:
44
- "--- .../example.rst\t(original)"
55
- "+++ .../example.rst\t(reformatted)"
6-
- '@@ -69,13 +69,11 @@'
6+
- '@@ -69,13 +69,9 @@'
77
- ' .. code-block:: toml'
88
- ''
99
- " \t[project]"
10-
- "+\tname = \"my-project\""
11-
- "+\tversion = \"1.2.3\""
12-
- ''
10+
- '-'
1311
- '-'
1412
- "-\tname = 'my-project'"
1513
- '-'
1614
- '-'
1715
- "-\tversion=\"1.2.3\""
1816
- "-\tlicense = {file = \"LICENSE\"}"
19-
- "+\t[project.license]"
20-
- "+\tfile = \"LICENSE\""
17+
- "+\tname = \"my-project\""
18+
- "+\tversion = \"1.2.3\""
19+
- "+\tlicense = { file = \"LICENSE\" }"
2120
- ''
2221
- ''
2322
- ' .. code-block:: TOML'

tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@
7171
[project]
7272
name = "my-project"
7373
version = "1.2.3"
74-
75-
[project.license]
76-
file = "LICENSE"
74+
license = { file = "LICENSE" }
7775
7876
7977
.. code-block:: TOML

tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ err:
33
out:
44
- "--- .../example.rst\t(original)"
55
- "+++ .../example.rst\t(reformatted)"
6-
- '@@ -69,13 +69,11 @@'
6+
- '@@ -69,13 +69,9 @@'
77
- ' .. code-block:: toml'
88
- ''
99
- " \t[project]"
10-
- "+\tname = \"my-project\""
11-
- "+\tversion = \"1.2.3\""
12-
- ''
10+
- '-'
1311
- '-'
1412
- "-\tname = 'my-project'"
1513
- '-'
1614
- '-'
1715
- "-\tversion=\"1.2.3\""
1816
- "-\tlicense = {file = \"LICENSE\"}"
19-
- "+\t[project.license]"
20-
- "+\tfile = \"LICENSE\""
17+
- "+\tname = \"my-project\""
18+
- "+\tversion = \"1.2.3\""
19+
- "+\tlicense = { file = \"LICENSE\" }"
2120
- ''
2221
- ''
2322
- ' .. code-block:: TOML'

0 commit comments

Comments
 (0)