From b23991698f4738ee4c3dfa81ba3100cb9c4f3ee3 Mon Sep 17 00:00:00 2001
From: Rickard Lyrenius <rickard@northernbytes.se>
Date: Tue, 7 Jul 2020 13:33:18 +0200
Subject: [PATCH] Added MANIFEST.in to specify header files with sdist. This
 broke when moving to GitHub actions (different setuptools version?)

---
 .github/workflows/python-package.yml   |   4 ----
 .vscode/settings.json                  |   5 +++++
 MANIFEST.in                            |   1 +
 apa.gz                                 | Bin 607 -> 0 bytes
 {src => include}/splitstream.h         |   0
 {src => include}/splitstream_private.h |   0
 setup.py                               |  13 +++++++++++--
 src/python/splitstream_py.c            |   3 ++-
 src/splitstream.c                      |   2 +-
 src/splitstream_json.c                 |   2 +-
 src/splitstream_ubjson.c               |   2 +-
 src/splitstream_xml.c                  |   2 +-
 12 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 MANIFEST.in
 delete mode 100644 apa.gz
 rename {src => include}/splitstream.h (100%)
 rename {src => include}/splitstream_private.h (100%)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index d6d24ce..1544e4c 100644
--- 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
new file mode 100644
index 0000000..123075b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "splitstream_private.h": "c"
+    }
+}
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..ed92c7e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include include/*.h
\ No newline at end of file
diff --git a/apa.gz b/apa.gz
deleted file mode 100644
index 743b209d922841276fa373ca8dafb6ad39c04caf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 607
zcmV-l0-*gLiwFSSj{{!-1D#V_Z__Xseb28j*+X0C60spbl_D{1Ln`WM)eZ@%sv<Y}
z(s=lWFJa}^V>{W_(mqh~<ecxE<L~CPSE<!1T@#)HZ;;%YTJY!$oxeUug(wN%jF2_e
z`A3IDgh`<c5<04sU`T_p(g;B{>LLLdqT5FUToY#$&8O4*{AN5ynUf_Fn>s0p;+R1{
z&nrS9&j-<B`fYxF`xos&5Z-^152DC`Ho1bImMCDrjdtASDmp}>kVQX2?(-LAv6hq=
zZ4_V@4+Cx$&Enb^sYhwLA*QzLq!27sr1*hVDbqs<wyrfQi{~u`O|}X+v3f6@1H;5w
zcRrt>5wsycy?4iJK>5yO@!RAgx#++WbfJheA+YdQ8`pUxD%AgeHyNTYi|N+^66*&j
zT$Q2u*o}ufmK9c`y+q;B<V=*7g3gxDqv-c`O6m>KvZqy%w)5VtHkaF^aPbh{!H<IZ
zBcsOy4_ff!5xd@xF>t#hyv=H`YAdJ#m#$6O@*s)&n4?sr!3JEg(-W=@ru1oBbhfu7
zZ_vRiwX)wt<{DR!ea2Kniv_B-#6Z^b=UxjJ6l+Z?60!`4|KbTLT(<#@MrgViqbn(u
zXrT1}R}vRBpoOT+FRTD{)Od(q<o807!jqp_H_!kT(kJQh30W(w2x$K^3$sIa?Wnuq
z2cMY|8-*G3J2b(3WAO%F6#vfjr;8Km$@^0UA5Ifoo=8tltl%<vcbZ_#Bn@kX{rmOE
t_5U>b&}O!sZFfD!+`Z+}t<#k)3GgBqbQ|IpF<wQ3=nqrd_9xH<001%&DVG2M

diff --git a/src/splitstream.h b/include/splitstream.h
similarity index 100%
rename from src/splitstream.h
rename to include/splitstream.h
diff --git a/src/splitstream_private.h b/include/splitstream_private.h
similarity index 100%
rename from src/splitstream_private.h
rename to include/splitstream_private.h
diff --git a/setup.py b/setup.py
index 0febf76..c77843d 100644
--- 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
index a89a8ff..5c2adc9 100644
--- 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
index 0e6cebc..db3debc 100644
--- 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
index a65a21f..2a59d20 100644
--- 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
index a4018ed..650d967 100644
--- 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
index 117c87f..bccdb56 100644
--- 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;