From 8e5d025a0c3fe5144f999fffc64e490aec2e885b Mon Sep 17 00:00:00 2001 From: natali-maidbot Date: Tue, 18 Jul 2023 13:20:14 -0500 Subject: [PATCH 1/5] test 3.10 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47e72d0..5fb5e12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-python@v2 name: Install Python 3.8 with: - python-version: '3.8' + python-version: '3.10' architecture: 'x64' - name: Install dependencies run: | From d5eaec3dca38836af7ff5d9bb63c965b4e9eb809 Mon Sep 17 00:00:00 2001 From: natali-maidbot Date: Tue, 18 Jul 2023 13:22:54 -0500 Subject: [PATCH 2/5] Oops update step name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fb5e12..360c2c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 1 id: checkout - uses: actions/setup-python@v2 - name: Install Python 3.8 + name: Install Python 3.10 with: python-version: '3.10' architecture: 'x64' From 1aa1678db27c5ca31b7b9a4649365eeb6c72aba0 Mon Sep 17 00:00:00 2001 From: natali-maidbot Date: Tue, 18 Jul 2023 13:27:53 -0500 Subject: [PATCH 3/5] see if johns pr fixed --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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', From eb6faa31ec0b334c6bfd63901cbe769f7e4cb30b Mon Sep 17 00:00:00 2001 From: natali-maidbot Date: Tue, 18 Jul 2023 13:51:06 -0500 Subject: [PATCH 4/5] hopefully this is helpful --- stl_tools/cwrapped.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) 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); From 2b6b48447ba6bb3e5364bbaa16a7eac75155037f Mon Sep 17 00:00:00 2001 From: natali-maidbot Date: Tue, 18 Jul 2023 14:15:09 -0500 Subject: [PATCH 5/5] test 310 and 38 --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 360c2c7..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.10 + name: Install Python ${{ matrix.python-version }} with: - python-version: '3.10' + python-version: ${{ matrix.python-version }} architecture: 'x64' - name: Install dependencies run: |