diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47e72d0..a91aca5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,10 @@ on: jobs: test: runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.8", "3.10"] + steps: - name: checkout repo uses: actions/checkout@v1 @@ -16,9 +20,9 @@ jobs: fetch-depth: 1 id: checkout - uses: actions/setup-python@v2 - name: Install Python 3.8 + name: Install Python ${{ matrix.python-version }} with: - python-version: '3.8' + python-version: ${{ matrix.python-version }} architecture: 'x64' - name: Install dependencies run: | diff --git a/setup.py b/setup.py index 3a0f333..333912c 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ from setuptools import setup, Extension -import os +import os SRC_DIR = "stl_tools" @@ -12,10 +12,10 @@ setup(name='stl_tools', version='0.4.2', install_requires=[ - 'numpy>=1.18.1', - 'scipy', - 'Cython>=0.29.14,<0.30.0', - 'matplotlib'], + 'numpy>=1.18.1', + 'scipy', + 'Cython>=0.29.14,<0.30.0', + 'matplotlib'], description="Generate STL files from numpy arrays and text", author='Tristan Hearn', author_email='tristanhearn@gmail.com', diff --git a/stl_tools/cwrapped.c b/stl_tools/cwrapped.c index 9c657b5..e0507f5 100644 --- a/stl_tools/cwrapped.c +++ b/stl_tools/cwrapped.c @@ -20336,9 +20336,19 @@ static void __pyx_tp_dealloc_array(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - Py_SET_REFCNT(o, Py_REFCNT(o)+1); + #if PY_MINOR_VERSION >= 10 + Py_SET_REFCNT(o, Py_REFCNT(o)+1); + #endif + #if PY_MINOR_VERSION < 10 + ++Py_REFCNT(o); + #endif __pyx_array___dealloc__(o); - Py_SET_REFCNT(o, Py_REFCNT(o)-1); + #if PY_MINOR_VERSION >= 10 + Py_SET_REFCNT(o, Py_REFCNT(o)-1); + #endif + #if PY_MINOR_VERSION < 10 + --Py_REFCNT(o); + #endif PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->mode); @@ -20647,9 +20657,19 @@ static void __pyx_tp_dealloc_memoryview(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - Py_SET_REFCNT(o, Py_REFCNT(o)+1);; + #if PY_MINOR_VERSION >= 10 + Py_SET_REFCNT(o, Py_REFCNT(o)+1);; + #endif + #if PY_MINOR_VERSION < 10 + ++Py_REFCNT(o); + #endif __pyx_memoryview___dealloc__(o); - Py_SET_REFCNT(o, Py_REFCNT(o)-1);; + #if PY_MINOR_VERSION >= 10 + Py_SET_REFCNT(o, Py_REFCNT(o)-1);; + #endif + #if PY_MINOR_VERSION < 10 + --Py_REFCNT(o); + #endif PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->obj); @@ -20897,9 +20917,19 @@ static void __pyx_tp_dealloc__memoryviewslice(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - Py_SET_REFCNT(o, Py_REFCNT(o)+1);; + #if PY_MINOR_VERSION >= 10 + Py_SET_REFCNT(o, Py_REFCNT(o)+1);; + #endif + #if PY_MINOR_VERSION < 10 + ++Py_REFCNT(o); + #endif __pyx_memoryviewslice___dealloc__(o); - Py_SET_REFCNT(o, Py_REFCNT(o)-1);; + #if PY_MINOR_VERSION >= 10 + Py_SET_REFCNT(o, Py_REFCNT(o)-1);; + #endif + #if PY_MINOR_VERSION < 10 + --Py_REFCNT(o); + #endif PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->from_object);