From cbd318d090527ad865ae8f8d4343079291e5c80a Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Mon, 13 Jul 2015 19:52:35 +0200
Subject: prepare fast failing with a exception, fixes #31

---
 .gitignore                    | 1 +
 setup.cfg                     | 3 +++
 setuptools_scm/__init__.py    | 1 +
 setuptools_scm/integration.py | 5 +----
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab6287b..b99b6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+.env/
 build/
 develop-eggs/
 dist/
diff --git a/setup.cfg b/setup.cfg
index 3c6e79c..31e132d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,5 @@
 [bdist_wheel]
 universal=1
+
+[devpi:upload]
+formats=sdist,bdist_wheel
diff --git a/setuptools_scm/__init__.py b/setuptools_scm/__init__.py
index 844823d..9e5a9eb 100644
--- a/setuptools_scm/__init__.py
+++ b/setuptools_scm/__init__.py
@@ -24,6 +24,7 @@ def version_from_scm(root):
     ep = find_matching_entrypoint(root, 'setuptools_scm.parse_scm')
     if ep:
         return ep.load()(root)
+    raise LookupError('no scm found for %r' % root)
 
 
 def dump_version(root, version, write_to):
diff --git a/setuptools_scm/integration.py b/setuptools_scm/integration.py
index 06d199c..de8f6be 100644
--- a/setuptools_scm/integration.py
+++ b/setuptools_scm/integration.py
@@ -14,10 +14,7 @@ def version_keyword(dist, keyword, value):
         value = {}
     if getattr(value, '__call__', None):
         value = value()
-    try:
-        dist.metadata.version = get_version(**value)
-    except Exception as e:
-        trace('error', e)
+    dist.metadata.version = get_version(**value)
 
 
 def find_files(path='.'):
-- 
cgit v1.2.1


From 389811c25ed5f4c8e8d24178aaaae189a79b4e94 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Mon, 13 Jul 2015 19:57:22 +0200
Subject: remove unused import

---
 setuptools_scm/integration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools_scm/integration.py b/setuptools_scm/integration.py
index de8f6be..1b66a1d 100644
--- a/setuptools_scm/integration.py
+++ b/setuptools_scm/integration.py
@@ -1,7 +1,7 @@
 import os
 
 from .version import _warn_if_setuptools_outdated
-from .utils import trace, do
+from .utils import do
 from .discover import find_matching_entrypoint
 from . import get_version
 
-- 
cgit v1.2.1