revert unnecessary python_dist changes

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

@@ -5,47 +5,59 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.backend.python.targets.python_library import PythonLibrary
-from pants.backend.python.targets.python_target import PythonTarget
+from pex.interpreter import PythonIdentity
+from twitter.common.collections import maybe_list
+
 from pants.base.exceptions import TargetDefinitionException
 from pants.base.payload import Payload
-from pants.source.payload_fields import SourcesField
-from pants.source.wrapped_globs import FilesetWithSpec
-from pants.util.memo import memoized_property
+from pants.base.payload_field import PrimitiveField
+from pants.build_graph.target import Target
 
 
-class PythonDistribution(PythonTarget):
+class PythonDistribution(Target):
   """A Python distribution target that accepts a user-defined setup.py."""
 
+  default_sources_globs = '*.py'
+
   @classmethod
   def alias(cls):
     return 'python_dist'
 
-  default_sources_globs = [
-    '*.c',
-    '*.h',
-    '*.cpp',
-    '*.hpp',
-    '*.cxx',
-    '*.hxx',
-    '*.cc',
-  ] + list(PythonLibrary.default_sources_globs)
-
-  def __init__(self, sources=None, provides=None, **kwargs):
+  def __init__(self,
+               address=None,
+               payload=None,
+               sources=None,
+               compatibility=None,
+               **kwargs):
     """
+    :param address: The Address that maps to this Target in the BuildGraph.
+    :type address: :class:`pants.build_graph.address.Address`
+    :param payload: The configuration encapsulated by this target.  Also in charge of most
+                    fingerprinting details.
+    :type payload: :class:`pants.base.payload.Payload`
     :param sources: Files to "include". Paths are relative to the
       BUILD file's directory.
     :type sources: ``Fileset`` or list of strings. Must include setup.py.
+    :param compatibility: either a string or list of strings that represents
+      interpreter compatibility for this target, using the Requirement-style
+      format, e.g. ``'CPython>=3', or just ['>=2.7','<3']`` for requirements
+      agnostic to interpreter class.
     """
-    if provides is not None:
-      raise TargetDefinitionException(
-        self, "A PythonDistribution may not have a provides parameter "
-              "(parameter was: '{}').".format(repr(provides)))
-
-    super(PythonDistribution, self).__init__(
-      sources=sources, provides=provides, **kwargs)
+    payload = payload or Payload()
+    payload.add_fields({
+      'sources': self.create_sources_field(sources, address.spec_path, key_arg='sources'),
+      'compatibility': PrimitiveField(maybe_list(compatibility or ()))
+    })
+    super(PythonDistribution, self).__init__(address=address, payload=payload, **kwargs)
 
     if not 'setup.py' in sources:
       raise TargetDefinitionException(
         self, 'A setup.py in the top-level directory relative to the target definition is required.'
       )
+
+    # Check that the compatibility requirements are well-formed.
+    for req in self.payload.compatibility:
+      try:
+        PythonIdentity.parse_requirement(req)
+      except ValueError as e:
+        raise TargetDefinitionException(self, str(e))