python2 fixups for dist_name passing

Author: RonnyPfannschmidt

src/setuptools_scm/config.py

@@ -137,4 +137,4 @@ def from_file(cls, name="pyproject.toml", dist_name=None):
         with open(name) as strm:
             defn = __import__("toml").load(strm)
         section = defn.get("tool", {})["setuptools_scm"]
-        return cls(**section, dist_name=dist_name)
+        return cls(dist_name=dist_name, **section)

tox.ini

@@ -28,6 +28,7 @@ skip_install=
 deps=
     pytest
     setuptools >= 42
+    toml
 commands=
     test: pytest []
     selfcheck: python setup.py --version