Skip to content

Commit

Permalink
Bump dom-toml
Browse files Browse the repository at this point in the history 
* Update expected error messages (now coming from tomli not toml)
* Update expected output (tomli puts small tables inline)
  • Loading branch information
@domdfcoding
domdfcoding committed Apr 9, 2024
1 parent 06a6994 commit e63a810
Show file tree
Hide file tree
Showing 36 changed files with 107 additions and 158 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
click>=8.0.1
consolekit>=1.2.3
dom-toml>=0.5.0
dom-toml>=2.0.0
domdf-python-tools>=3.0.0
entrypoints>=0.3
formate>=0.4.9
Expand Down
3 changes: 1 addition & 2 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_3_.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
err:
- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char
28)'
- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)'
- ''
out:
- ''
3 changes: 1 addition & 2 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_6_.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
err:
- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char
28)'
- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)'
- ''
out:
- "--- .../example.rst\t(original)"
Expand Down
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code-block:: TOML
Expand Down
11 changes: 5 additions & 6 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ err:
out:
- "--- .../example.rst\t(original)"
- "+++ .../example.rst\t(reformatted)"
- '@@ -69,13 +69,11 @@'
- '@@ -69,13 +69,9 @@'
- ' .. code-block:: toml'
- ''
- " \t[project]"
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- ''
- '-'
- '-'
- "-\tname = 'my-project'"
- '-'
- '-'
- "-\tversion=\"1.2.3\""
- "-\tlicense = {file = \"LICENSE\"}"
- "+\t[project.license]"
- "+\tfile = \"LICENSE\""
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- "+\tlicense = { file = \"LICENSE\" }"
- ''
- ''
- ' .. code-block:: TOML'
Expand Down
3 changes: 1 addition & 2 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_3_.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
err:
- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char
28)'
- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)'
- ''
out:
- ''
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code-block:: TOML
Expand Down
11 changes: 5 additions & 6 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ err:
out:
- "--- .../example.rst\t(original)"
- "+++ .../example.rst\t(reformatted)"
- '@@ -69,13 +69,11 @@'
- '@@ -69,13 +69,9 @@'
- ' .. code-block:: toml'
- ''
- " \t[project]"
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- ''
- '-'
- '-'
- "-\tname = 'my-project'"
- '-'
- '-'
- "-\tversion=\"1.2.3\""
- "-\tlicense = {file = \"LICENSE\"}"
- "+\t[project.license]"
- "+\tfile = \"LICENSE\""
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- "+\tlicense = { file = \"LICENSE\" }"
- ''
- ''
- ' .. code-block:: TOML'
Expand Down
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code-block:: TOML
Expand Down
11 changes: 5 additions & 6 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ err:
out:
- "--- .../example.rst\t(original)"
- "+++ .../example.rst\t(reformatted)"
- '@@ -69,13 +69,11 @@'
- '@@ -69,13 +69,9 @@'
- ' .. code-block:: toml'
- ''
- " \t[project]"
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- ''
- '-'
- '-'
- "-\tname = 'my-project'"
- '-'
- '-'
- "-\tversion=\"1.2.3\""
- "-\tlicense = {file = \"LICENSE\"}"
- "+\t[project.license]"
- "+\tfile = \"LICENSE\""
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- "+\tlicense = { file = \"LICENSE\" }"
- ''
- ''
- ' .. code-block:: TOML'
Expand Down
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code-block:: TOML
Expand Down
14 changes: 6 additions & 8 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.yml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
err:
- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char
28)'
- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)'
- ''
out:
- "--- .../example.rst\t(original)"
- "+++ .../example.rst\t(reformatted)"
- '@@ -69,13 +69,11 @@'
- '@@ -69,13 +69,9 @@'
- ' .. code-block:: toml'
- ''
- " \t[project]"
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- ''
- '-'
- '-'
- "-\tname = 'my-project'"
- '-'
- '-'
- "-\tversion=\"1.2.3\""
- "-\tlicense = {file = \"LICENSE\"}"
- "+\t[project.license]"
- "+\tfile = \"LICENSE\""
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- "+\tlicense = { file = \"LICENSE\" }"
- ''
- ''
- ' .. code-block:: TOML'
Expand Down
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code-block:: TOML
Expand Down
11 changes: 5 additions & 6 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ err:
out:
- "--- .../example.rst\t(original)"
- "+++ .../example.rst\t(reformatted)"
- '@@ -69,13 +69,11 @@'
- '@@ -69,13 +69,9 @@'
- ' .. code-block:: toml'
- ''
- " \t[project]"
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- ''
- '-'
- '-'
- "-\tname = 'my-project'"
- '-'
- '-'
- "-\tversion=\"1.2.3\""
- "-\tlicense = {file = \"LICENSE\"}"
- "+\t[project.license]"
- "+\tfile = \"LICENSE\""
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- "+\tlicense = { file = \"LICENSE\" }"
- ''
- ''
- ' .. code-block:: TOML'
Expand Down
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code:: TOML
Expand Down
11 changes: 5 additions & 6 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ err:
out:
- "--- .../example.rst\t(original)"
- "+++ .../example.rst\t(reformatted)"
- '@@ -81,13 +81,11 @@'
- '@@ -81,13 +81,9 @@'
- ' .. code-block:: TOML'
- ''
- " \t[project]"
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- ''
- '-'
- '-'
- "-\tname = 'my-project'"
- '-'
- '-'
- "-\tversion=\"1.2.3\""
- "-\tlicense = {file = \"LICENSE\"}"
- "+\t[project.license]"
- "+\tfile = \"LICENSE\""
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- "+\tlicense = { file = \"LICENSE\" }"
- ''
- ''
- ' .. code:: TOML'
Expand Down
4 changes: 2 additions & 2 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_1_.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
err:
- '.../example.rst:93: TomlDecodeError: Key name found without value. Reached end
of line. (line 10 column 2 char 86)'
- '.../example.rst:93: TOMLDecodeError: Invalid initial character for a key part (at
line 8, column 12)'
- ''
out:
- ''
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code:: TOML
Expand Down
15 changes: 7 additions & 8 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.yml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
err:
- '.../example.rst:93: TomlDecodeError: Key name found without value. Reached end
of line. (line 10 column 2 char 86)'
- '.../example.rst:93: TOMLDecodeError: Invalid initial character for a key part (at
line 8, column 12)'
- ''
out:
- "--- .../example.rst\t(original)"
- "+++ .../example.rst\t(reformatted)"
- '@@ -81,13 +81,11 @@'
- '@@ -81,13 +81,9 @@'
- ' .. code-block:: TOML'
- ''
- " \t[project]"
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- ''
- '-'
- '-'
- "-\tname = 'my-project'"
- '-'
- '-'
- "-\tversion=\"1.2.3\""
- "-\tlicense = {file = \"LICENSE\"}"
- "+\t[project.license]"
- "+\tfile = \"LICENSE\""
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- "+\tlicense = { file = \"LICENSE\" }"
- ''
- ''
- ' .. code:: TOML'
Expand Down
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code:: TOML
Expand Down
15 changes: 7 additions & 8 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.yml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
err:
- '.../example.rst:93: TomlDecodeError: Key name found without value. Reached end
of line. (line 10 column 2 char 86)'
- '.../example.rst:93: TOMLDecodeError: Invalid initial character for a key part (at
line 8, column 12)'
- ''
out:
- "--- .../example.rst\t(original)"
- "+++ .../example.rst\t(reformatted)"
- '@@ -81,13 +81,11 @@'
- '@@ -81,13 +81,9 @@'
- ' .. code-block:: TOML'
- ''
- " \t[project]"
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- ''
- '-'
- '-'
- "-\tname = 'my-project'"
- '-'
- '-'
- "-\tversion=\"1.2.3\""
- "-\tlicense = {file = \"LICENSE\"}"
- "+\t[project.license]"
- "+\tfile = \"LICENSE\""
- "+\tname = \"my-project\""
- "+\tversion = \"1.2.3\""
- "+\tlicense = { file = \"LICENSE\" }"
- ''
- ''
- ' .. code:: TOML'
Expand Down
4 changes: 1 addition & 3 deletions tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@
[project]
name = "my-project"
version = "1.2.3"
[project.license]
file = "LICENSE"
license = { file = "LICENSE" }
.. code:: TOML
Expand Down
Loading

0 comments on commit e63a810

Please sign in to comment.