Fix tests.

Author: jsirois

tests/test_environment.py

@@ -46,6 +46,8 @@
 if TYPE_CHECKING:
     from typing import Any, Callable, Dict, Iterable, Iterator, Optional, Tuple
 
+    from pex.requirements import ParsedRequirement
+
 
 @contextmanager
 def yield_pex_builder(zip_safe=True, interpreter=None):
@@ -195,11 +197,11 @@ def add_sources(builder, content):
 
 
 def get_setuptools_requirement(interpreter=None):
-    # type: (Optional[PythonInterpreter]) -> str
+    # type: (Optional[PythonInterpreter]) -> ParsedRequirement
     # We use a very old version of setuptools to prove the point the user version is what is used
     # here and not the vendored version (when possible). A newer setuptools is needed though to work
     # with python 3.
-    return (
+    return parse_requirement_string(
         "setuptools==1.0"
         if (interpreter or PythonInterpreter.get()).version[0] == 2
         else "setuptools==17.0"

tests/test_resolver.py

@@ -624,7 +624,7 @@ def prepare_project(project_dir):
         python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*",
     )
     resolved_distributions = resolve(
-        requirements=[dist],
+        requirements=[parse_requirement_string(dist)],
         # We need this to allow the invalid version above to sneak by pip wheel metadata
         # verification.
         verify_wheels=False,