From c5acde70da4921ce64b731d506c27519d3014801 Mon Sep 17 00:00:00 2001 From: john-maidbot <78750993+john-maidbot@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:04:56 -0500 Subject: [PATCH 1/8] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 81d89b8..1c06d53 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,7 @@ install_requires=[ 'numpy>=1.18.1', 'scipy', + 'Cython>=0.29.24,<0.30.0', 'matplotlib'], description="Generate STL files from numpy arrays and text", author='Tristan Hearn', From 5f010edeed399dcf34545c62a2e3afa3aec45b77 Mon Sep 17 00:00:00 2001 From: john-maidbot <78750993+john-maidbot@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:15:07 -0500 Subject: [PATCH 2/8] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 1c06d53..49ed2dc 100644 --- a/setup.py +++ b/setup.py @@ -11,6 +11,7 @@ setup(name='stl_tools', version='0.4.2', + python_requires='>=3.2,<3.10', install_requires=[ 'numpy>=1.18.1', 'scipy', From 19f747c093382a5def9c3bc497482612eef04d9f Mon Sep 17 00:00:00 2001 From: john-maidbot <78750993+john-maidbot@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:17:46 -0500 Subject: [PATCH 3/8] Update setup.py --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 49ed2dc..c8fa76f 100644 --- a/setup.py +++ b/setup.py @@ -11,11 +11,10 @@ setup(name='stl_tools', version='0.4.2', - python_requires='>=3.2,<3.10', install_requires=[ 'numpy>=1.18.1', 'scipy', - 'Cython>=0.29.24,<0.30.0', + 'Cython>=0.29,<0.29.27', 'matplotlib'], description="Generate STL files from numpy arrays and text", author='Tristan Hearn', From c34f3d23b7a009034bb099bbd8f5ae6fc779c7b2 Mon Sep 17 00:00:00 2001 From: john-maidbot <78750993+john-maidbot@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:21:45 -0500 Subject: [PATCH 4/8] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c8fa76f..d99ba17 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ install_requires=[ 'numpy>=1.18.1', 'scipy', - 'Cython>=0.29,<0.29.27', + 'Cython>=0.29,<=0.29.15', 'matplotlib'], description="Generate STL files from numpy arrays and text", author='Tristan Hearn', From b0cf54d48e95f84c868f83c5418f2957b2caab2a Mon Sep 17 00:00:00 2001 From: john-maidbot <78750993+john-maidbot@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:27:09 -0500 Subject: [PATCH 5/8] Update cwrapped.c --- stl_tools/cwrapped.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stl_tools/cwrapped.c b/stl_tools/cwrapped.c index ce8c5a2..3be26b9 100644 --- a/stl_tools/cwrapped.c +++ b/stl_tools/cwrapped.c @@ -20336,9 +20336,9 @@ static void __pyx_tp_dealloc_array(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - ++Py_REFCNT(o); + Py_REFCNT(o)++; __pyx_array___dealloc__(o); - --Py_REFCNT(o); + Py_REFCNT(o)--; PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->mode); @@ -20647,9 +20647,9 @@ static void __pyx_tp_dealloc_memoryview(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - ++Py_REFCNT(o); + Py_REFCNT(o)++; __pyx_memoryview___dealloc__(o); - --Py_REFCNT(o); + Py_REFCNT(o)--; PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->obj); @@ -20897,9 +20897,9 @@ static void __pyx_tp_dealloc__memoryviewslice(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - ++Py_REFCNT(o); + Py_REFCNT(o)++; __pyx_memoryviewslice___dealloc__(o); - --Py_REFCNT(o); + Py_REFCNT(o)--; PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->from_object); From 5a1ba6fc6cbf22b2b1880fdf7736338cad96b9c0 Mon Sep 17 00:00:00 2001 From: john-maidbot <78750993+john-maidbot@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:35:49 -0500 Subject: [PATCH 6/8] Update cwrapped.c --- stl_tools/cwrapped.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stl_tools/cwrapped.c b/stl_tools/cwrapped.c index 3be26b9..9c657b5 100644 --- a/stl_tools/cwrapped.c +++ b/stl_tools/cwrapped.c @@ -20336,9 +20336,9 @@ static void __pyx_tp_dealloc_array(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - Py_REFCNT(o)++; + Py_SET_REFCNT(o, Py_REFCNT(o)+1); __pyx_array___dealloc__(o); - Py_REFCNT(o)--; + Py_SET_REFCNT(o, Py_REFCNT(o)-1); PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->mode); @@ -20647,9 +20647,9 @@ static void __pyx_tp_dealloc_memoryview(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - Py_REFCNT(o)++; + Py_SET_REFCNT(o, Py_REFCNT(o)+1);; __pyx_memoryview___dealloc__(o); - Py_REFCNT(o)--; + Py_SET_REFCNT(o, Py_REFCNT(o)-1);; PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->obj); @@ -20897,9 +20897,9 @@ static void __pyx_tp_dealloc__memoryviewslice(PyObject *o) { { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); - Py_REFCNT(o)++; + Py_SET_REFCNT(o, Py_REFCNT(o)+1);; __pyx_memoryviewslice___dealloc__(o); - Py_REFCNT(o)--; + Py_SET_REFCNT(o, Py_REFCNT(o)-1);; PyErr_Restore(etype, eval, etb); } Py_CLEAR(p->from_object); From e6f34f9ee23b34c5f3a6f84965e9cd805e6f1933 Mon Sep 17 00:00:00 2001 From: john-maidbot <78750993+john-maidbot@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:36:13 -0500 Subject: [PATCH 7/8] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d99ba17..3ce25b1 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ install_requires=[ 'numpy>=1.18.1', 'scipy', - 'Cython>=0.29,<=0.29.15', + 'Cython>=0.29.14,<=0.3.0', 'matplotlib'], description="Generate STL files from numpy arrays and text", author='Tristan Hearn', From 11005c0789c77d8a2fbcb8c933b51a59533a52fb Mon Sep 17 00:00:00 2001 From: john-maidbot <78750993+john-maidbot@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:36:29 -0500 Subject: [PATCH 8/8] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3ce25b1..3a0f333 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ install_requires=[ 'numpy>=1.18.1', 'scipy', - 'Cython>=0.29.14,<=0.3.0', + 'Cython>=0.29.14,<0.30.0', 'matplotlib'], description="Generate STL files from numpy arrays and text", author='Tristan Hearn',