Add support for toml-formatted variables (#27)

* Add support for toml-formatted variables

Author: mraspberry

Pipfile

@@ -11,4 +11,4 @@ black = "*"
 pre-commit = "*"
 
 [packages]
-pytest-variables = {editable = true,extras = ["hjson", "yaml"],path = "."}
+pytest-variables = {editable = true,extras = ["hjson", "yaml", "toml"],path = "."}

README.rst

@@ -83,6 +83,16 @@ to one of the following:
 
 To learn more about the loader, see `here <https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation>`_
 
+TOML
+~~~~~~~~~~
+
+TOML_ aims to be a minimal configuration file format that's easy to read due to obvious semantics. TOML is designed to map unambiguously to a hash table.
+To install TOML support:
+
+.. code-block:: bash
+
+  $ pip install pytest-variables[toml]
+
 Contributing
 ------------
 
@@ -174,6 +184,7 @@ Resources
 .. _pytest: http://pytest.org
 .. _Human JSON: http://hjson.org
 .. _YAML: http://yaml.org
+.. _TOML: https://github.com/toml-lang/toml
 .. _dictionary: https://docs.python.org/tutorial/datastructures.html#dictionaries
 .. _Release Notes:  http://github.com/pytest-dev/pytest-variables/blob/master/CHANGES.rst
 .. _Issue Tracker: http://github.com/pytest-dev/pytest-variables/issues

pytest_variables/plugin.py

@@ -26,6 +26,7 @@ def default(module, path, loader):
     "hjson": ("hjson", default),
     "yml": ("yaml", default),
     "yaml": ("yaml", default),
+    "toml": ("toml", default),
 }
 
 

setup.py

@@ -12,7 +12,7 @@
     entry_points={"pytest11": ["variables = pytest_variables.plugin"]},
     install_requires=["pytest>=2.4.2"],
     setup_requires=["setuptools_scm"],
-    extras_require={"hjson": ["hjson"], "yaml": ["PyYAML"]},
+    extras_require={"hjson": ["hjson"], "yaml": ["PyYAML"], "toml": ["toml"]},
     license="Mozilla Public License 2.0 (MPL 2.0)",
     keywords="py.test pytest json variables",
     classifiers=[

test_variables.py

@@ -9,7 +9,7 @@
 
 def pytest_generate_tests(metafunc):
     if "file_format" in metafunc.fixturenames:
-        metafunc.parametrize("file_format", ["json", "hjson", "yaml"])
+        metafunc.parametrize("file_format", ["json", "hjson", "yaml", "toml"])
 
 
 def run(testdir, file_format="json", variables=None, raw=False):
@@ -22,6 +22,9 @@ def run(testdir, file_format="json", variables=None, raw=False):
         elif file_format == "yaml" and not raw:
             yaml = pytest.importorskip("yaml")
             v = yaml.dump(v)
+        elif file_format == "toml" and not raw:
+            toml = pytest.importorskip("toml")
+            v = toml.dumps(v)
         elif not raw:
             import json
 
@@ -84,7 +87,7 @@ def test(variables):
 
 def test_invalid_format(testdir, file_format):
     testdir.makepyfile("def test(variables): pass")
-    result = run(testdir, file_format, ["invalid"], raw=True)
+    result = run(testdir, file_format, ["invalid="], raw=True)
     assert result.ret == 3
     result.stderr.fnmatch_lines(["*ValueError: Unable to parse*"])
 

tox.ini

@@ -12,6 +12,7 @@ deps =
     pytest
     hjson
     PyYAML
+    toml
 commands = pytest -v -r a {posargs}
 
 [testenv:linting]