let setup.py install headers required by pxd's, still unable to separ…

…ate test dir from folly/python source
facebook · Jan 9, 2025 · eacfa5e · eacfa5e
1 parent d55cf5f
commit eacfa5e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/folly/python/setup.py b/folly/python/setup.py
@@ -83,10 +83,6 @@
             'folly/ProactorExecutor.cpp',
             'folly/error.cpp',
         ],
-        headers=[
-            'folly/python/AsyncioExecutor.h',
-            'folly/python/ProactorExecutor.h',
-        ],
         language='c++',
         extra_compile_args=compile_args,
         include_dirs=include_dirs,
@@ -97,15 +93,10 @@
         'folly.iobuf',
         sources=[
             'folly/iobuf.pyx',
-            'folly/iobuf_intf.cpp',
             'folly/iobuf_ext.cpp',
+            'folly/iobuf_intf.cpp',
             'folly/error.cpp',
         ],
-        headers=[
-            'folly/python/iobuf_intf.h',
-            'folly/python/iobuf_ext.h',
-        ],
-
         language='c++',
         extra_compile_args=compile_args,
         include_dirs=include_dirs,
@@ -142,10 +133,22 @@
 if __name__ == '__main__':
     setup(
         name='folly',
-        version='0.0.1',
+        zip_safe=False,
+        version='0.1.1',
         packages=['folly'],
         setup_requires=['cython'],
-        zip_safe=False,
+        headers=[
+            'folly/AsyncioExecutor.h',
+            'folly/ProactorExecutor.h',
+            'folly/coro.h',
+            'folly/futures.h',
+            'folly/async_generator.h',
+            'folly/executor_intf.h',
+            'folly/iobuf_intf.h',
+            'folly/iobuf_ext.h',
+            'folly/error.h',
+            'folly/import.h',
+        ],
         package_data={'': ['*.pxd', '*.pyi', '__init__.py', '*_api.h']},
         ext_modules=cythonize(
             exts, 

diff --git a/folly/python/test/setup.py b/folly/python/test/setup.py
@@ -41,9 +41,9 @@
         'simplebridge',
         sources=[
             'simplebridge.pyx',
-        #    '../executor_intf.cpp',
+            '../executor_intf.cpp',
             '../error.cpp', 
-        #    '../fibers.cpp'
+            '../fibers.cpp'
         ],
         depends=['simple.h'],
         language='c++', 
@@ -74,7 +74,7 @@
         'simplebridgecoro',
         sources=[
             'simplebridgecoro.pyx',
-        #    '../executor_intf.cpp',
+            '../executor_intf.cpp',
             '../error.cpp', 
         ],
         depends=['simplecoro.h'],