summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2020-12-13 22:33:51 +0100
committerRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2020-12-13 22:37:23 +0100
commitf6e2adf91d2a88049a33d98b066092364412f805 (patch)
tree40adbe90ed17130bf35dd2a76ced71a83ffa85de
parent212090fdd7caf7976bc3f1dcd083dac04eb83766 (diff)
downloadsetuptools-scm-f6e2adf91d2a88049a33d98b066092364412f805.tar.gz
python2 fixups for dist_name passing
-rw-r--r--src/setuptools_scm/config.py2
-rw-r--r--tox.ini1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/setuptools_scm/config.py b/src/setuptools_scm/config.py
index c451b90..fe1eb98 100644
--- a/src/setuptools_scm/config.py
+++ b/src/setuptools_scm/config.py
@@ -137,4 +137,4 @@ class Configuration(object):
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)
diff --git a/tox.ini b/tox.ini
index 030dbd4..9a8c1c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,6 +28,7 @@ skip_install=
deps=
pytest
setuptools >= 42
+ toml
commands=
test: pytest []
selfcheck: python setup.py --version