Remove now-dead code

Author: brettcannon

packaging/tags.py

@@ -136,12 +136,6 @@ def _normalize_string(string):
     return string.replace(".", "_").replace("-", "_")
 
 
-def _cpython_interpreter(py_version):
-    # type: (PythonVersion) -> str
-    # TODO: Is using py_version_nodot for interpreter version critical?
-    return "cp{major}{minor}".format(major=py_version[0], minor=py_version[1])
-
-
 def _cpython_abis(py_version, warn=False):
     # type: (PythonVersion, bool) -> List[str]
     abis = []
@@ -178,24 +172,6 @@ def _cpython_abis(py_version, warn=False):
     return abis
 
 
-def _cpython_tags(py_version, interpreter, abis, platforms):
-    # type: (PythonVersion, str, Iterable[str], Iterable[str]) -> Iterator[Tag]
-    for abi in abis:
-        for platform_ in platforms:
-            yield Tag(interpreter, abi, platform_)
-    for tag in (Tag(interpreter, "abi3", platform_) for platform_ in platforms):
-        yield tag
-    for tag in (Tag(interpreter, "none", platform_) for platform_ in platforms):
-        yield tag
-    # PEP 384 was first implemented in Python 3.2.
-    for minor_version in range(py_version[1] - 1, 1, -1):
-        for platform_ in platforms:
-            interpreter = "cp{major}{minor}".format(
-                major=py_version[0], minor=minor_version
-            )
-            yield Tag(interpreter, "abi3", platform_)
-
-
 def cpython_tags(
     python_version=sys.version_info[:2], abis=None, platforms=None, **kwargs
 ):
@@ -268,14 +244,6 @@ def _generic_abi():
         return "none"
 
 
-def _pypy_tags(py_version, interpreter, abi, platforms):
-    # type: (PythonVersion, str, str, Iterable[str]) -> Iterator[Tag]
-    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
-        yield tag
-    for tag in (Tag(interpreter, "none", platform) for platform in platforms):
-        yield tag
-
-
 def pypy_tags(interpreter=None, abis=None, platforms=None):
     # type: (Optional[str], Optional[Iterable[str]], Optional[Iterable[str]]) -> Iterator[Tag]  # noqa
     """
@@ -300,16 +268,6 @@ def _generic_interpreter(warn=False):
     return "{name}{version}".format(name=_interpreter_name(), version=version)
 
 
-def _generic_tags(interpreter, py_version, abi, platforms):
-    # type: (str, PythonVersion, str, Iterable[str]) -> Iterator[Tag]
-    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
-        yield tag
-    if abi != "none":
-        tags = (Tag(interpreter, "none", platform_) for platform_ in platforms)
-        for tag in tags:
-            yield tag
-
-
 def generic_tags(interpreter=None, abis=None, platforms=None, **kwargs):
     # type: (Optional[str], Optional[Iterable[str]], Optional[Iterable[str]], bool) -> Iterator[Tag]  # noqa
     """
@@ -352,24 +310,6 @@ def _py_interpreter_range(py_version):
         yield "py{major}{minor}".format(major=py_version[0], minor=minor)
 
 
-def _independent_tags(interpreter, py_version, platforms):
-    # type: (str, PythonVersion, Iterable[str]) -> Iterator[Tag]
-    """
-    Yield the sequence of tags that are consistent across implementations.
-
-    The tags consist of:
-    - py*-none-<platform>
-    - <interpreter>-none-any
-    - py*-none-any
-    """
-    for version in _py_interpreter_range(py_version):
-        for platform_ in platforms:
-            yield Tag(version, "none", platform_)
-    yield Tag(interpreter, "none", "any")
-    for version in _py_interpreter_range(py_version):
-        yield Tag(version, "none", "any")
-
-
 def compatible_tags(
     python_version=sys.version_info[:2], interpreter=None, platforms=None
 ):

tests/test_tags.py

@@ -275,67 +275,6 @@ def test_cpython_abis_wide_unicode(
     assert tags._cpython_abis(version) == expected
 
 
-def test_independent_tags():
-    result = list(tags._independent_tags("cp33", (3, 3), ["plat1", "plat2"]))
-    assert result == [
-        tags.Tag("py33", "none", "plat1"),
-        tags.Tag("py33", "none", "plat2"),
-        tags.Tag("py3", "none", "plat1"),
-        tags.Tag("py3", "none", "plat2"),
-        tags.Tag("py32", "none", "plat1"),
-        tags.Tag("py32", "none", "plat2"),
-        tags.Tag("py31", "none", "plat1"),
-        tags.Tag("py31", "none", "plat2"),
-        tags.Tag("py30", "none", "plat1"),
-        tags.Tag("py30", "none", "plat2"),
-        tags.Tag("cp33", "none", "any"),
-        tags.Tag("py33", "none", "any"),
-        tags.Tag("py3", "none", "any"),
-        tags.Tag("py32", "none", "any"),
-        tags.Tag("py31", "none", "any"),
-        tags.Tag("py30", "none", "any"),
-    ]
-
-
-def test_cpython_tags():
-    result = list(
-        tags._cpython_tags((3, 8), "cp38", ["cp38d", "cp38"], ["plat1", "plat2"])
-    )
-    assert result == [
-        tags.Tag("cp38", "cp38d", "plat1"),
-        tags.Tag("cp38", "cp38d", "plat2"),
-        tags.Tag("cp38", "cp38", "plat1"),
-        tags.Tag("cp38", "cp38", "plat2"),
-        tags.Tag("cp38", "abi3", "plat1"),
-        tags.Tag("cp38", "abi3", "plat2"),
-        tags.Tag("cp38", "none", "plat1"),
-        tags.Tag("cp38", "none", "plat2"),
-        tags.Tag("cp37", "abi3", "plat1"),
-        tags.Tag("cp37", "abi3", "plat2"),
-        tags.Tag("cp36", "abi3", "plat1"),
-        tags.Tag("cp36", "abi3", "plat2"),
-        tags.Tag("cp35", "abi3", "plat1"),
-        tags.Tag("cp35", "abi3", "plat2"),
-        tags.Tag("cp34", "abi3", "plat1"),
-        tags.Tag("cp34", "abi3", "plat2"),
-        tags.Tag("cp33", "abi3", "plat1"),
-        tags.Tag("cp33", "abi3", "plat2"),
-        tags.Tag("cp32", "abi3", "plat1"),
-        tags.Tag("cp32", "abi3", "plat2"),
-    ]
-    result = list(tags._cpython_tags((3, 3), "cp33", ["cp33m"], ["plat1", "plat2"]))
-    assert result == [
-        tags.Tag("cp33", "cp33m", "plat1"),
-        tags.Tag("cp33", "cp33m", "plat2"),
-        tags.Tag("cp33", "abi3", "plat1"),
-        tags.Tag("cp33", "abi3", "plat2"),
-        tags.Tag("cp33", "none", "plat1"),
-        tags.Tag("cp33", "none", "plat2"),
-        tags.Tag("cp32", "abi3", "plat1"),
-        tags.Tag("cp32", "abi3", "plat2"),
-    ]
-
-
 def test_sys_tags_on_mac_cpython(mock_interpreter_name, monkeypatch):
     if mock_interpreter_name("CPython"):
         monkeypatch.setattr(tags, "_cpython_abis", lambda *a: ["cp33m"])
@@ -384,19 +323,6 @@ def test_pypy_interpreter(monkeypatch):
     assert expected == tags._pypy_interpreter()
 
 
-def test__pypy_tags(mock_interpreter_name, monkeypatch):
-    if mock_interpreter_name("PyPy"):
-        monkeypatch.setattr(tags, "_pypy_interpreter", lambda: "pp360")
-    interpreter = tags._pypy_interpreter()
-    result = list(tags._pypy_tags((3, 3), interpreter, "pypy3_60", ["plat1", "plat2"]))
-    assert result == [
-        tags.Tag(interpreter, "pypy3_60", "plat1"),
-        tags.Tag(interpreter, "pypy3_60", "plat2"),
-        tags.Tag(interpreter, "none", "plat1"),
-        tags.Tag(interpreter, "none", "plat2"),
-    ]
-
-
 def test_sys_tags_on_mac_pypy(mock_interpreter_name, monkeypatch):
     if mock_interpreter_name("PyPy"):
         monkeypatch.setattr(tags, "_pypy_interpreter", lambda: "pp360")