Skip to content

Commit b239916

Browse files
committed
Added MANIFEST.in to specify header files with sdist. This broke when moving to GitHub actions (different setuptools version?)
1 parent 569dc1d commit b239916

12 files changed

Lines changed: 23 additions & 11 deletions

File tree

.github/workflows/python-package.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ jobs:
3838
if: startsWith(github.ref, 'refs/tags')
3939
steps:
4040
- uses: actions/checkout@v2
41-
- name: Set up Python for dist
42-
uses: actions/setup-python@v2
43-
with:
44-
python-version: 3.8
4541
- name: Build dist
4642
run: |
4743
python setup.py sdist

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"files.associations": {
3+
"splitstream_private.h": "c"
4+
}
5+
}

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include include/*.h

apa.gz

-607 Bytes
Binary file not shown.
File renamed without changes.

setup.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,17 @@
1616
author_email="rickard@evolviq.com",
1717
version="1.2.3",
1818
description="Splitting of (XML, JSON) objects from a continuous stream",
19-
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'])],
20-
headers=['src/splitstream.h', 'src/splitstream_private.h'],
19+
ext_modules=[Extension('splitstream',
20+
[
21+
'src/python/splitstream_py.c',
22+
'src/splitstream.c',
23+
'src/splitstream_xml.c',
24+
'src/splitstream_json.c',
25+
'src/splitstream_ubjson.c',
26+
'src/mempool.c'
27+
],
28+
include_dirs=["include/"])],
29+
headers=['include/splitstream.h', 'include/splitstream_private.h'],
2130
install_requires=requirements + test_requirements,
2231
zip_safe=False,
2332
test_suite='test',

src/python/splitstream_py.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
#include <Python.h>
2020
#include <bytesobject.h>
21-
#include "../splitstream.h"
21+
#include <splitstream.h>
22+
2223
const static int SPLITSTREAM_STATE_FLAG_DID_RETURN_DOCUMENT = 8;
2324
const static int SPLITSTREAM_STATE_FLAG_FILE_EOF = 16;
2425

src/splitstream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include "splitstream_private.h"
19+
#include <splitstream_private.h>
2020
#include <string.h>
2121

2222
static void AppendDoc(SplitstreamState* state, SplitstreamDocument* dest, const void* ptr, size_t length);

src/splitstream_json.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include "splitstream_private.h"
19+
#include <splitstream_private.h>
2020

2121
size_t SplitstreamJSONScanner(SplitstreamState* s, const char* buf, size_t len, size_t* start) {
2222
int escapeCounter = s->counter[0];

0 commit comments

Comments
 (0)