Port backend/jvm

src/python/pants/backend/jvm/BUILD

@@ -46,6 +46,7 @@ python_library(
   sources=['ivy_utils.py'],
   dependencies=[
     '3rdparty/python/twitter/commons:twitter.common.collections',
+    '3rdparty/python:future',
     '3rdparty/python:six',
     ':ivy_utils_resources',
     'src/python/pants/backend/jvm/subsystems:jar_dependency_management',
@@ -71,6 +72,9 @@ resources(
 python_library(
   name='repository',
   sources=['repository.py'],
+  dependencies = [
+    '3rdparty/python:future',
+  ]
 )
 
 python_library(
@@ -87,7 +91,7 @@ python_library(
   name='ossrh_publication_metadata',
   sources=['ossrh_publication_metadata.py'],
   dependencies=[
-    '3rdparty/python:six',
+    '3rdparty/python:future',
     ':artifact',
     'src/python/pants/base:validation',
   ],

src/python/pants/backend/jvm/ivy_utils.py

@@ -13,7 +13,9 @@
 import threading
 import xml.etree.ElementTree as ET
 from abc import abstractmethod
+from builtins import object, str
 from collections import OrderedDict, defaultdict, namedtuple
+from functools import total_ordering
 
 import six
 from twitter.common.collections import OrderedSet
@@ -513,6 +515,7 @@ class IvyResolveMappingError(Exception):
   """Raised when there is a failure mapping the ivy resolve results to pants objects."""
 
 
+@total_ordering
 class IvyModuleRef(object):
   """
   :API: public
@@ -533,8 +536,11 @@ def __init__(self, org, name, rev, classifier=None, ext=None):
   def __eq__(self, other):
     return isinstance(other, IvyModuleRef) and self._id == other._id
 
-  def __ne__(self, other):
-    return not self == other
+  # TODO(python3port): Return NotImplemented if other does not have attributes
+  def __lt__(self, other):
+    # We can't just re-use __repr__ or __str_ because we want to order rev last
+    return ((self.org, self.name, self.classifier, self.ext, self.rev) <
+            (other.org, other.name, other.classifier, other.ext, other.rev))
 
   def __hash__(self):
     return hash(self._id)
@@ -546,11 +552,6 @@ def __repr__(self):
     return ('IvyModuleRef(org={!r}, name={!r}, rev={!r}, classifier={!r}, ext={!r})'
             .format(*self._id))
 
-  def __cmp__(self, other):
-    # We can't just re-use __repr__ or __str_ because we want to order rev last
-    return cmp((self.org, self.name, self.classifier, self.ext, self.rev),
-               (other.org, other.name, other.classifier, other.ext, other.rev))
-
   @property
   def caller_key(self):
     """This returns an identifier for an IvyModuleRef that only retains the caller org and name.
@@ -724,7 +725,7 @@ def _load_classpath_from_cachepath(path):
       return []
     else:
       with safe_open(path, 'r') as cp:
-        return filter(None, (path.strip() for path in cp.read().split(os.pathsep)))
+        return [_f for _f in (path.strip() for path in cp.read().split(os.pathsep)) if _f]
 
   @classmethod
   def do_resolve(cls, executor, extra_args, ivyxml, jvm_options, workdir_report_paths_by_conf,
@@ -1097,7 +1098,7 @@ def collect_elements(target):
         new_jars[coordinate] = jar.copy(excludes=jar.excludes + additional_excludes)
       jars = new_jars
 
-    return jars.values(), global_excludes
+    return list(jars.values()), global_excludes
 
   @classmethod
   def _resolve_conflict(cls, existing, proposed):
@@ -1178,7 +1179,7 @@ def _generate_jar_template(cls, jars):
         mutable=jar_attributes.mutable,
         force=jar_attributes.force,
         transitive=jar_attributes.transitive,
-        artifacts=artifacts.values(),
+        artifacts=list(artifacts.values()),
         any_have_url=any_have_url,
         excludes=[cls._generate_exclude_template(exclude) for exclude in excludes])
 
@@ -1222,7 +1223,7 @@ def _generate_fetch_jar_template(cls, jars):
         module=jar_attributes.name,
         version=jar_attributes.rev,
         mutable=jar_attributes.mutable,
-        artifacts=artifacts.values(),
+        artifacts=list(artifacts.values()),
         any_have_url=any_have_url,
         excludes=[])
 

src/python/pants/backend/jvm/ossrh_publication_metadata.py

@@ -5,14 +5,16 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-import six
+from builtins import object
+
+import future
 
 from pants.backend.jvm.artifact import PublicationMetadata
 from pants.base.validation import assert_list
 
 
 def _validate_maybe_string(name, item):
-  if item and not isinstance(item, six.string_types):
+  if item and not isinstance(item, future.utils.string_types):
     raise ValueError('{} was expected to be of type {} but given {}'.format(name, type(item), item))
   return item
 

src/python/pants/backend/jvm/repository.py

@@ -6,6 +6,7 @@
                         unicode_literals, with_statement)
 
 import os
+from builtins import object
 
 
 class Repository(object):

src/python/pants/backend/jvm/subsystems/BUILD

@@ -5,6 +5,7 @@ python_library(
   name = 'dependency_context',
   sources = ['dependency_context.py'],
   dependencies = [
+    '3rdparty/python:future',
     ':java',
     ':scala_platform',
     'src/python/pants/backend/codegen/thrift/java',
@@ -18,6 +19,7 @@ python_library(
   name = 'jvm_tool_mixin',
   sources = ['jvm_tool_mixin.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/base:exceptions',
     'src/python/pants/java/distribution',
     'src/python/pants/option',
@@ -75,6 +77,7 @@ python_library(
   name = 'jvm_platform',
   sources = ['jvm_platform.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/base:exceptions',
     'src/python/pants/base:revision',
     'src/python/pants/option',
@@ -88,6 +91,7 @@ python_library(
   name = 'jar_dependency_management',
   sources = ['jar_dependency_management.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/backend/jvm/targets:jvm',
     'src/python/pants/base:revision',
     'src/python/pants/build_graph',
@@ -115,6 +119,7 @@ python_library(
   name = 'shader',
   sources = ['shader.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/java/jar',
     'src/python/pants/backend/jvm/tasks:classpath_util',
     'src/python/pants/backend/jvm/tasks:jvm_tool_task_mixin',
@@ -131,6 +136,7 @@ python_library(
   name = 'zinc',
   sources = ['zinc.py'],
   dependencies = [
+    '3rdparty/python:future',
     ':dependency_context',
     ':jvm_tool_mixin',
     ':shader',
@@ -142,6 +148,7 @@ python_library(
   name = 'zinc_language_mixin',
   sources = ['zinc_language_mixin.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/subsystem',
   ]
 )

src/python/pants/backend/jvm/subsystems/dependency_context.py

@@ -6,6 +6,7 @@
                         unicode_literals, with_statement)
 
 import hashlib
+from builtins import str
 
 from pants.backend.jvm.subsystems.java import Java
 from pants.backend.jvm.subsystems.scala_platform import ScalaPlatform

src/python/pants/backend/jvm/subsystems/jar_dependency_management.py

@@ -6,6 +6,7 @@
                         unicode_literals, with_statement)
 
 import logging
+from builtins import map, next, object
 from collections import defaultdict
 from textwrap import dedent
 
@@ -255,7 +256,7 @@ def __iter__(self):
   def __len__(self):
     return len(self._artifacts_to_versions)
 
-  def __nonzero__(self):
+  def __bool__(self):
     return len(self) > 0
 
   def __contains__(self, artifact):

src/python/pants/backend/jvm/subsystems/jvm_platform.py

@@ -6,6 +6,8 @@
                         unicode_literals, with_statement)
 
 import logging
+from builtins import object, str
+from functools import total_ordering
 
 from pants.base.exceptions import TaskError
 from pants.base.revision import Revision
@@ -185,6 +187,7 @@ def parse_java_version(cls, version):
     return Revision(*version.components[:2])
 
 
+@total_ordering
 class JvmPlatformSettings(object):
   """Simple information holder to keep track of common arguments to java compilers."""
 
@@ -231,15 +234,13 @@ def __iter__(self):
   def __eq__(self, other):
     return tuple(self) == tuple(other)
 
-  def __ne__(self, other):
-    return not self.__eq__(other)
+  # TODO(python3port): decide if this should raise NotImplemented on invalid comparisons
+  def __lt__(self, other):
+    return tuple(self) < tuple(other)
 
   def __hash__(self):
     return hash(tuple(self))
 
-  def __cmp__(self, other):
-    return cmp(tuple(self), tuple(other))
-
   def __str__(self):
     return 'source={source},target={target},args=({args})'.format(
       source=self.source_level,

src/python/pants/backend/jvm/subsystems/jvm_tool_mixin.py

@@ -5,6 +5,7 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
+from builtins import object
 from collections import namedtuple
 from textwrap import dedent
 

src/python/pants/backend/jvm/subsystems/shader.py

@@ -8,6 +8,7 @@
 import logging
 import os
 import re
+from builtins import object
 from collections import namedtuple
 from contextlib import contextmanager
 

src/python/pants/backend/jvm/subsystems/zinc.py

@@ -5,6 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
+from builtins import object
+
 from pants.backend.jvm.subsystems.dependency_context import DependencyContext
 from pants.backend.jvm.subsystems.java import Java
 from pants.backend.jvm.subsystems.jvm_tool_mixin import JvmToolMixin

src/python/pants/backend/jvm/subsystems/zinc_language_mixin.py

@@ -5,6 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
+from builtins import object
+
 
 class ZincLanguageMixin(object):
   """A mixin for subsystems for languages compiled with Zinc."""

src/python/pants/backend/jvm/targets/BUILD

@@ -29,7 +29,7 @@ python_library(
   dependencies = [
     '3rdparty/python/twitter/commons:twitter.common.collections',
     '3rdparty/python/twitter/commons:twitter.common.dirutil',
-    '3rdparty/python:six',
+    '3rdparty/python:future',
     'src/python/pants/java/jar',
     'src/python/pants/backend/jvm/subsystems:java',
     'src/python/pants/backend/jvm/subsystems:junit',
@@ -59,7 +59,6 @@ python_library(
     'javac_plugin.py',
   ],
   dependencies = [
-    '3rdparty/python:six',
     ':jvm',
     'src/python/pants/backend/jvm/subsystems:java',
     'src/python/pants/backend/jvm/subsystems:junit',

src/python/pants/backend/jvm/targets/import_jars_mixin.py

@@ -5,7 +5,7 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-import six
+import future
 
 from pants.backend.jvm.targets.jar_library import JarLibrary
 from pants.build_graph.address_lookup_error import AddressLookupError
@@ -53,7 +53,7 @@ def gen_specs():
         for item in target_representation.get(fields_tuple[field_pos], ()):
           # For better error handling, this simply skips over non-strings, but we catch them
           # with a WrongTargetType in JarLibrary.to_jar_dependencies.
-          if not isinstance(item, six.string_types):
+          if not isinstance(item, future.utils.string_types):
             raise JarLibrary.ExpectedAddressError(
               'expected imports to contain string addresses, got {found_class} instead.'
               .format(found_class=type(item).__name__)

src/python/pants/backend/jvm/targets/jar_library.py

@@ -5,7 +5,7 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-import six
+import future
 from twitter.common.collections import OrderedSet
 
 from pants.base.exceptions import TargetDefinitionException
@@ -99,7 +99,7 @@ def to_jar_dependencies(relative_to, jar_library_specs, build_graph):
     """
     jar_deps = OrderedSet()
     for spec in jar_library_specs:
-      if not isinstance(spec, six.string_types):
+      if not isinstance(spec, future.utils.string_types):
         raise JarLibrary.ExpectedAddressError(
           "{address}: expected imports to contain string addresses, got {found_class}."
           .format(address=relative_to.spec,

src/python/pants/backend/jvm/targets/java_agent.py

@@ -5,7 +5,7 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from six import string_types
+from future.utils import string_types
 
 from pants.backend.jvm.targets.java_library import JavaLibrary
 from pants.base.exceptions import TargetDefinitionException

src/python/pants/backend/jvm/targets/junit_tests.py

@@ -5,6 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
+from builtins import str
+
 from pants.backend.jvm.subsystems.junit import JUnit
 from pants.backend.jvm.subsystems.jvm_platform import JvmPlatform
 from pants.backend.jvm.targets.jvm_target import JvmTarget

src/python/pants/backend/jvm/targets/jvm_binary.py

@@ -8,7 +8,7 @@
 import re
 from hashlib import sha1
 
-from six import string_types
+from future.utils import string_types
 
 from pants.backend.jvm.targets.jvm_target import JvmTarget
 from pants.base.exceptions import TargetDefinitionException

src/python/pants/backend/jvm/targets/managed_jar_dependencies.py

@@ -7,6 +7,7 @@
 
 import copy
 import os
+from builtins import object
 
 from pants.base.exceptions import TargetDefinitionException
 from pants.base.payload import Payload