now also blocked on setup_requires fix

cosmicexplorer · Jul 30, 2018 · afacb4c · afacb4c
1 parent 5769dbb
commit afacb4c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/examples/src/python/example/python_distribution/hello/distutils_extensions/BUILD b/examples/src/python/example/python_distribution/hello/distutils_extensions/BUILD
@@ -3,9 +3,10 @@
 
 python_dist(
   sources=['setup.py', 'hello.c'],
-  setup_requires=[
-    'testprojects/pants-plugins/3rdparty/python/pants',
-  ],
+  # FIXME: setup_requires needs to provide transitive deps of all the requested packages too!
+  # setup_requires=[
+  #   'testprojects/pants-plugins/3rdparty/python/pants',
+  # ],
 )
 
 python_binary(

diff --git a/examples/src/python/example/python_distribution/hello/distutils_extensions/hello.c b/examples/src/python/example/python_distribution/hello/distutils_extensions/hello.c
@@ -4,9 +4,16 @@
 
 #include <Python.h>
 
-static PyObject *hello(PyObject *self, PyObject *args) {
+#ifdef PANTS_PYTHON_DIST
+static const char *hello_str = "Hello from Pants!";
+#else
+static const char *hello_str = "Hello from outside of Pants!";
+#endif
+
+    static PyObject *
+    hello(PyObject *self, PyObject *args) {
   /* FIXME: make this depend on some env var we pass in!? */
-  return Py_BuildValue("s", "Hello from C!");
+  return Py_BuildValue("s", hello_str);
 }
 
 static PyMethodDef Methods[] = {

diff --git a/examples/src/python/example/python_distribution/hello/distutils_extensions/setup.py b/examples/src/python/example/python_distribution/hello/distutils_extensions/setup.py
@@ -11,14 +11,13 @@
 try:
   from pants.backend.python.distutils_extensions import pants_setup as setup
 except ImportError as e:
-  raise e
   from setuptools import setup
 
 
 c_module = Extension(b'hello', sources=[b'hello.c'])
 
 setup(
-  name='distutils_extensions'
+  name='distutils_extensions',
   version='0.0.1',
   ext_modules=[c_module],
   packages=find_packages(),

diff --git a/src/python/pants/backend/python/distutils_extensions.py b/src/python/pants/backend/python/distutils_extensions.py
@@ -32,7 +32,7 @@ def customize_compiler_from_env(compiler):
     linker_so=link_cmd)
 
 
-class env_only_build_ext(distutils_build_ext):
+class pants_build_ext(distutils_build_ext):
   """???"""
 
   def _append_to_compiler_property(elements, append_fun):
@@ -96,6 +96,8 @@ def run(self):
         self._append_to_compiler_property(self.rpath, self.compiler.add_runtime_library_dir)
         self._append_to_compiler_property(self.link_objects, self.compiler.add_link_object)
 
+        self.compiler.define_macro('PANTS_PYTHON_DIST', None)
+
         # Now actually compile and link everything.
         self.build_extensions()
 
@@ -109,6 +111,6 @@ def pants_setup(cmdclass=None, *args, **kwargs):
       "Overriding 'build_ext' in the 'cmdclass' keyword argument of pants_setup() "
       "is not supported.")
 
-  cmdclass.add('build_ext', env_only_build_ext)
+  cmdclass.add('build_ext', pants_build_ext)
 
   setuptools_setup(*args, cmdclass=cmdclass, **kwargs)