Added MANIFEST.in to specify header files with sdist. This broke when…

… moving to GitHub actions (different setuptools version?)
rickardp · Jul 7, 2020 · b239916 · b239916
1 parent 569dc1d
commit b239916
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -38,10 +38,6 @@ jobs:
     if: startsWith(github.ref, 'refs/tags')
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python for dist
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
     - name: Build dist
       run: |
         python setup.py sdist

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "splitstream_private.h": "c"
+    }
+}
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+include include/*.h
diff --git a/apa.gz b/apa.gz
diff --git a/src/splitstream.h → include/splitstream.h b/src/splitstream.h → include/splitstream.h
diff --git a/src/splitstream_private.h → include/splitstream_private.h b/src/splitstream_private.h → include/splitstream_private.h
diff --git a/setup.py b/setup.py
@@ -16,8 +16,17 @@
     author_email="rickard@evolviq.com",
     version="1.2.3",
     description="Splitting of (XML, JSON) objects from a continuous stream",
-    ext_modules=[Extension('splitstream', ['src/python/splitstream_py.c', 'src/splitstream.c', 'src/splitstream_xml.c', 'src/splitstream_json.c', 'src/splitstream_ubjson.c', 'src/mempool.c'])],
-    headers=['src/splitstream.h', 'src/splitstream_private.h'],
+    ext_modules=[Extension('splitstream', 
+        [
+            'src/python/splitstream_py.c',
+            'src/splitstream.c',
+            'src/splitstream_xml.c',
+            'src/splitstream_json.c',
+            'src/splitstream_ubjson.c',
+            'src/mempool.c'
+        ],
+        include_dirs=["include/"])],
+    headers=['include/splitstream.h', 'include/splitstream_private.h'],
     install_requires=requirements + test_requirements,
     zip_safe=False,
     test_suite='test',

diff --git a/src/python/splitstream_py.c b/src/python/splitstream_py.c
@@ -18,7 +18,8 @@
 
 #include <Python.h>
 #include <bytesobject.h>
-#include "../splitstream.h"
+#include <splitstream.h>
+
 const static int SPLITSTREAM_STATE_FLAG_DID_RETURN_DOCUMENT = 8;
 const static int SPLITSTREAM_STATE_FLAG_FILE_EOF = 16;
 

diff --git a/src/splitstream.c b/src/splitstream.c
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-#include "splitstream_private.h"
+#include <splitstream_private.h>
 #include <string.h>
 
 static void AppendDoc(SplitstreamState* state, SplitstreamDocument* dest, const void* ptr, size_t length);

diff --git a/src/splitstream_json.c b/src/splitstream_json.c
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-#include "splitstream_private.h"
+#include <splitstream_private.h>
 
 size_t SplitstreamJSONScanner(SplitstreamState* s, const char* buf, size_t len, size_t* start) {
 	int escapeCounter = s->counter[0];

diff --git a/src/splitstream_ubjson.c b/src/splitstream_ubjson.c
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-#include "splitstream_private.h"
+#include <splitstream_private.h>
 
 size_t SplitstreamUBJSONScanner(SplitstreamState* s, const char* buf, size_t len, size_t* start) {
 	int remainingCounter = s->counter[0], value = s->counter[1];

diff --git a/src/splitstream_xml.c b/src/splitstream_xml.c
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-#include "splitstream_private.h"
+#include <splitstream_private.h>
 
 const int COUNTER_DASH = 0;
 const int COUNTER_CLOSING_BRACKET = 1;