Skip to content

Commit 7bcfce5

Browse files
committed
Merge branch 'master' into update_conf
2 parents 540bf09 + 1048db8 commit 7bcfce5

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

libpysal/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "4.4.0"
1+
__version__ = "4.5.1"
22

33
# __version__ has to be define in the first line
44

libpysal/weights/tests/test_util.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from ...io.fileio import FileIO as psopen
88
from ... import examples
99
import numpy as np
10+
import scipy
1011
import unittest
1112

1213

@@ -17,6 +18,9 @@
1718
except:
1819
HAS_GEOPANDAS = False
1920

21+
SCIPY1_7 = False
22+
if scipy.version.version == '1.7.0':
23+
SCIPY1_7 = True
2024

2125
class Testutil(unittest.TestCase):
2226
def setUp(self):
@@ -29,11 +33,14 @@ def test_lat2W(self):
2933
self.assertEqual(w9.pct_nonzero, 29.62962962962963)
3034
self.assertEqual(w9[0], {1: 1.0, 3: 1.0})
3135
self.assertEqual(w9[3], {0: 1.0, 4: 1.0, 6: 1.0})
32-
36+
@unittest.skipIf(
37+
SCIPY1_7, "Known failure due to dia change (TOFIX)"
38+
)
3339
def test_lat2SW(self):
3440
w9 = util.lat2SW(3, 3)
3541
rows, cols = w9.shape
3642
n = rows * cols
43+
self.assertEqual(w9.nnz, 24)
3744
pct_nonzero = w9.nnz / float(n)
3845
self.assertEqual(pct_nonzero, 0.29629629629629628)
3946
data = w9.todense().tolist()

0 commit comments

Comments
 (0)