diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2015-07-21 14:27:42 +0200 |
|---|---|---|
| committer | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2015-07-21 14:27:42 +0200 |
| commit | 656b38bdd47d1080099a71deac1cbb13d4bbc766 (patch) | |
| tree | 85edd005951800d2e6517c8fd4482de3ee55c0f7 | |
| parent | d7d480add81d3cbefde7b5a278f023a2f0e2e19b (diff) | |
| parent | 389811c25ed5f4c8e8d24178aaaae189a79b4e94 (diff) | |
| download | setuptools-scm-656b38bdd47d1080099a71deac1cbb13d4bbc766.tar.gz | |
Merge pull request #32 from pypa/fail-fast
prepare fast failing with a exception, fixes #31
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | setup.cfg | 3 | ||||
| -rw-r--r-- | setuptools_scm/__init__.py | 1 | ||||
| -rw-r--r-- | setuptools_scm/integration.py | 7 |
4 files changed, 7 insertions, 5 deletions
@@ -61,6 +61,7 @@ __pycache__/ # Distribution / packaging .Python env/ +.env/ build/ develop-eggs/ dist/ @@ -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..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 @@ -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='.'): |