fix(pypi): Handle case where dep is in extras multiple times

Author: thirtyseven

python/private/pypi/pep508_deps.bzl

@@ -81,6 +81,7 @@ def deps(
         deps_select = {
             d: markers
             for d, markers in sorted(deps_select.items())
+            if d not in deps
         },
     )
 

tests/pypi/pep508/deps_tests.bzl

@@ -161,6 +161,24 @@ def test_all_markers_are_added(env):
 
 _tests.append(test_all_markers_are_added)
 
+def test_markers_with_extra(env):
+    requires_dist = [
+        "bar",
+        'baz!=1.56.0; sys_platform == "darwin" and extra == "client"',
+        'baz; extra == "client"',
+    ]
+
+    got = deps(
+        "foo",
+        extras = ["client"],
+        requires_dist = requires_dist,
+    )
+
+    env.expect.that_collection(got.deps).contains_exactly(["bar", "baz"])
+    env.expect.that_dict(got.deps_select).contains_exactly({})
+
+_tests.append(test_markers_with_extra)
+
 def deps_test_suite(name):  # buildifier: disable=function-docstring
     test_suite(
         name = name,