Merge pull request #7 from dgoeries/fix-headers

fix: Headers include and cleanup

Author: dgoeries

pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "downsample"
-version = "0.0.4"
+version = "0.0.5"
 readme = {file = "README.txt", content-type = "text/markdown"}
 description = "Downsample algorithms module for Python written in C"
 requires-python = ">=3.10"

setup.py

@@ -1,26 +1,28 @@
 import numpy
 from setuptools import Extension, find_packages, setup
 
+_HEADERS = "src/downsample"
+
 setup(
     ext_modules=[
         Extension(
             "downsample._ltd",
             ["src/downsample/_ltd.c", "src/downsample/utils.c"],
             define_macros=[
                 ("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
-            include_dirs=[numpy.get_include(), 'include']),
+            include_dirs=[numpy.get_include(), _HEADERS]),
         Extension(
             "downsample._ltob",
             ["src/downsample/_ltob.c", "src/downsample/utils.c"],
             define_macros=[
                 ("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
-            include_dirs=[numpy.get_include(), 'include']),
+            include_dirs=[numpy.get_include(), _HEADERS]),
         Extension(
             "downsample._lttb",
             ["src/downsample/_lttb.c", "src/downsample/utils.c"],
             define_macros=[
                 ("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
-            include_dirs=[numpy.get_include(), 'include'])
+            include_dirs=[numpy.get_include(), _HEADERS])
     ],
     package_dir={"": "src"},
     package_data={

src/downsample/_ltd.c

@@ -236,7 +236,6 @@ static double calculate_sse_for_bucket(PyArrayObject *bucket) {
 
 static npy_intp find_highest_sse_bucket_index(PyObject *buckets_list,
                                               PyArrayObject *sse_array) {
-    Py_ssize_t num_buckets = PyList_Size(buckets_list);
     npy_intp sse_len = PyArray_DIM(sse_array, 0);
     if (sse_len < 3) {
         PyErr_SetString(

src/downsample/_lttb.c

@@ -133,15 +133,15 @@ static PyObject *largest_triangle_three_buckets(PyObject *self,
     result_x_data[threshold - 1] = npy_isfinite(last_a_x) ? last_a_x : 0.0;
     result_y_data[threshold - 1] = npy_isfinite(last_a_y) ? last_a_y : 0.0;
 
-    PyObject *value = Py_BuildValue("OO", result_x, result_y);
+    PyObject *result = PyTuple_Pack(2, result_x, result_y);
 
     // And remove the references!
     Py_DECREF(x_array);
     Py_DECREF(y_array);
     Py_XDECREF(result_x);
     Py_XDECREF(result_y);
 
-    return value;
+    return result;
 
 fail:
     Py_XDECREF(x_array);