From 14be701ecc29bb9eec9dbfea36e36f84a8410c0d Mon Sep 17 00:00:00 2001 From: janezd Date: Thu, 26 Oct 2023 12:11:12 +0200 Subject: [PATCH 1/2] FR: Divide into double, not Py_ssize_t --- orangecontrib/network/network/layout/_fr_layout.pyx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/orangecontrib/network/network/layout/_fr_layout.pyx b/orangecontrib/network/network/layout/_fr_layout.pyx index f239ded9..6c94ec67 100644 --- a/orangecontrib/network/network/layout/_fr_layout.pyx +++ b/orangecontrib/network/network/layout/_fr_layout.pyx @@ -1,7 +1,6 @@ #cython: boundscheck=False #cython: wraparound=False #cython: initializedcheck=False -#cython: cdivision=True #cython: embedsignature=True #cython: infer_types=False #cython: language_level=3 @@ -70,7 +69,7 @@ cpdef void repulse_sampled(arr_f2_t pos, arr_i1_t sample, Py_ssize_t i, j, s Py_ssize_t sample_size = sample.shape[0] - Py_ssize_t inv_sample_ratio = n_nodes / sample_size + double inv_sample_ratio = n_nodes / sample_size double k2 = sqr(k) for i in range(n_nodes): @@ -168,9 +167,6 @@ def fruchterman_reingold_step(arr_f2_t pos, Py_ssize_t n_nodes = pos.shape[0] Py_ssize_t n_dim = pos.shape[1] - Py_ssize_t sample_size = sample.shape[0] - Py_ssize_t inv_sample_ratio = n_nodes / sample_size - with nogil: disp[:, :] = 0 attract(pos, edge_src, edge_dst, edge_weights, k, disp) From 1bf2dfd0cdc1e108176a4b5043cc2095b0de9fef Mon Sep 17 00:00:00 2001 From: janezd Date: Thu, 26 Oct 2023 12:19:28 +0200 Subject: [PATCH 2/2] CI Tests: Pin pandas in 'oldest' --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 088ff636..babff194 100755 --- a/tox.ini +++ b/tox.ini @@ -22,6 +22,7 @@ deps = {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*} {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*} oldest: orange3==3.34.0 + oldest: pandas<2.1 latest: https://github.com/biolab/orange3/archive/refs/heads/master.zip#egg=orange3 latest: https://github.com/biolab/orange-canvas-core/archive/refs/heads/master.zip#egg=orange-canvas-core latest: https://github.com/biolab/orange-widget-base/archive/refs/heads/master.zip#egg=orange-widget-base