Rebase, deprecation bumps, s/manylinu1/linux/ revert.

3rdparty/python/requirements.txt

@@ -3,7 +3,6 @@ beautifulsoup4>=4.6.0,<4.7
 cffi==1.13.2
 contextlib2==0.5.5
 coverage>=4.5,<4.6
-cryptography==2.7
 dataclasses==0.6
 docutils==0.14
 fasteners==0.15.0

src/python/pants/backend/python/rules/pex.py

@@ -97,7 +97,7 @@ async def create_pex(
   """Returns a PEX with the given requirements, optional entry point, and optional
   interpreter constraints."""
 
-  argv = ["-vvvvvvvvv", "--output-file", request.output_filename]
+  argv = ["--output-file", request.output_filename]
   if python_setup.resolver_jobs:
     argv.extend(["--jobs", python_setup.resolver_jobs])
   if request.entry_point is not None:

src/python/pants/backend/python/subsystems/python_setup.py

@@ -59,7 +59,7 @@ def register_options(cls, register):
                   '"<PEXRC>" (paths in the PEX_PYTHON_PATH variable in a pexrc file), '
                   '"<PYENV>" (all python versions under $(pyenv root)/versions).')
     register('--resolver-use-manylinux', advanced=True, type=bool, default=False, fingerprint=True,
-             removal_version='1.26.0.dev2',
+             removal_version='1.27.0.dev2',
              removal_hint='Use --resolver-manylinux=<manylinux spec upper bound> instead.',
              help='Whether to consider manylinux wheels when resolving requirements for foreign'
                   'linux platforms.')

src/python/pants/backend/python/targets/unpacked_whls.py

@@ -60,7 +60,7 @@ def __init__(self, module_name, libraries=None, include_patterns=None, exclude_p
     """
     deprecated_conditional(
       lambda: type(within_data_subdir) not in (bool, type(None)),
-      removal_version='1.26.0.dev2',
+      removal_version='1.27.0.dev2',
       entity_description='A non-boolean value for `within_data_subdir`',
       hint_message='The location of the .data subdirectory will be inferred from the module name!',
     )

src/python/pants/backend/python/tasks/setup_py.py

@@ -9,6 +9,8 @@
 import textwrap
 from abc import ABC, abstractmethod
 from collections import OrderedDict, defaultdict
+from pathlib import Path
+from typing import Dict
 
 from pex.interpreter import PythonInterpreter
 from pex.pex import PEX

src/python/pants/python/setup_py_runner.py

@@ -27,7 +27,7 @@ class SetupPyRunner:
   class Factory(ExecutablePexTool):
     options_scope = 'setup-py-runner'
     deprecated_options_scope = 'build-setup-requires-pex'
-    deprecated_options_scope_removal_version = '1.25.0.dev2'
+    deprecated_options_scope_removal_version = '1.27.0.dev2'
 
     @classmethod
     def register_options(cls, register: Callable[..., None]) -> None:

tests/python/pants_test/backend/python/tasks/test_python_binary_integration.py

@@ -12,7 +12,7 @@
 from pants.util.contextutil import open_zip, temporary_dir
 
 
-_LINUX_PLATFORM = "manylinux1-x86_64-cp-36-m"
+_LINUX_PLATFORM = "linux-x86_64-cp-36-m"
 _LINUX_WHEEL_SUBSTRING = "manylinux"
 _OSX_PLATFORM = "macosx-10.13-x86_64-cp-36-m"
 _OSX_WHEEL_SUBSTRING = "macosx"