Merge pull request #287 from RonnyPfannschmidt/fix-286

fix #286 - return a list from tags_to_versions

Author: RonnyPfannschmidt

CHANGELOG.rst

@@ -1,3 +1,9 @@
+v3.0.3
+======
+
+* fix #286 - duo an oversight a helper functio nwas returning a generator instead of a list
+
+
 v3.0.2
 ======
 

src/setuptools_scm/version.py

@@ -30,12 +30,12 @@ def _parse_version_tag(tag, config):
         if len(match.groups()) == 1:
             key = 1
         else:
-            key = 'version'
-        
+            key = "version"
+
         result = {
-            'version': match.group(key),
-            'prefix': match.group(0)[:match.start(key)],
-            'suffix': match.group(0)[match.end(key):],
+            "version": match.group(key),
+            "prefix": match.group(0)[:match.start(key)],
+            "suffix": match.group(0)[match.end(key):],
         }
 
     trace("tag '%s' parsed to %s" % (tag, result))
@@ -88,20 +88,21 @@ def tag_to_version(tag, config=None):
         config = Configuration()
 
     tagdict = _parse_version_tag(tag, config)
-    if not isinstance(tagdict, dict) or not tagdict.get('version', None):
+    if not isinstance(tagdict, dict) or not tagdict.get("version", None):
         warnings.warn("tag %r no version found" % (tag,))
         return None
 
-    version = tagdict['version']
+    version = tagdict["version"]
     trace("version pre parse", version)
 
-    if tagdict.get('suffix', ''):
-        warnings.warn("tag %r will be stripped of its suffix '%s'" % (tag, tagdict['suffix']))
+    if tagdict.get("suffix", ""):
+        warnings.warn(
+            "tag %r will be stripped of its suffix '%s'" % (tag, tagdict["suffix"])
+        )
 
     if VERSION_CLASS is not None:
         version = pkg_parse_version(version)
         trace("version", repr(version))
-    
     return version
 
 
@@ -111,7 +112,12 @@ def tags_to_versions(tags, config=None):
     :param tags: an iterable of tags
     :param config: optional configuration object
     """
-    return filter(None, map(lambda tag: tag_to_version(tag, config=config), tags))
+    result = []
+    for tag in tags:
+        tag = tag_to_version(tag, config=config)
+        if tag:
+            result.append(tag)
+    return result
 
 
 class ScmVersion(object):
@@ -176,9 +182,14 @@ def _parse_tag(tag, preformatted, config):
     return tag
 
 
-def meta(tag, distance=None, dirty=False, node=None, preformatted=False, config=None, **kw):
+def meta(
+    tag, distance=None, dirty=False, node=None, preformatted=False, config=None, **kw
+):
     if not config:
-        warnings.warn("meta invoked without explicit configuration, will use defaults where required.")
+        warnings.warn(
+            "meta invoked without explicit configuration,"
+            " will use defaults where required."
+        )
     parsed_version = _parse_tag(tag, preformatted, config)
     trace("version", tag, "->", parsed_version)
     assert parsed_version is not None, "cant parse version %s" % tag

testing/test_version.py

@@ -1,6 +1,6 @@
 import pytest
 from setuptools_scm.config import Configuration
-from setuptools_scm.version import meta, simplified_semver_version
+from setuptools_scm.version import meta, simplified_semver_version, tags_to_versions
 
 
 @pytest.mark.parametrize(
@@ -49,6 +49,13 @@ def test_next_semver(version, expected_next):
     ],
 )
 def test_tag_regex1(tag, expected):
-    Configuration().tag_regex = r'^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$'
+    Configuration().tag_regex = r"^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$"
     result = meta(tag)
     assert result.tag.public == expected
+
+
+@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/286")
+def test_tags_to_versions():
+    config = Configuration()
+    versions = tags_to_versions(["1", "2", "3"], config=config)
+    assert isinstance(versions, list)  # enable subscription