Skip to content

Commit 0a2a4bf

Browse files
committed
bump numpy to 2.2.3, scipy to 1.15.2
also fix a related doctest in graphs
1 parent bc78b0f commit 0a2a4bf

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

build/pkgs/numpy/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=numpy-VERSION.tar.gz
2-
sha1=915414f1efabd7c183583154cf1a709bd2745828
3-
sha256=697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4
2+
sha1=f776e594fbd88e4a50639213b4c510b1588e2dd0
3+
sha256=dbdc15f0c81611925f382dfa97b3bd0bc2c1ce19d4fe50482cb0ddc12ba30020
44
upstream_url=https://files.pythonhosted.org/packages/source/n/numpy/numpy-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.26.3
1+
2.2.3

build/pkgs/scipy/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=scipy-VERSION.tar.gz
2-
sha1=0fd6e14972d8dd9b4a656686a40aed00ad0f1396
3-
sha256=4bf5abab8a36d20193c698b0f1fc282c1d083c94723902c447e5d2f1780936a3
2+
sha1=093c30bdd187fd5693a8d2fc9fcb961b96418a85
3+
sha256=cd58a314d92838f7e6f755c8a2167ead4f27e1fd5c1251fd54289569ef3495ec
44
upstream_url=https://files.pythonhosted.org/packages/source/s/scipy/scipy-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.12.0
1+
1.15.2

build/pkgs/scipy/version_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# deprecations cannot be introduced in micro releases.
55
# SciPy devs wait "at least 6 months", "in practice two (minor) releases"
66
# from deprecation to removal of a feature.
7-
scipy >=1.5
7+
scipy >=1.12

src/sage/graphs/generic_graph.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16220,21 +16220,25 @@ def clustering_coeff(self,
1622016220
{0: 1/3, 1: 1/3, 2: 0, 3: 1/3, 4: 1/3, 5: 1/3,
1622116221
6: 1/3, 7: 1/3, 8: 0, 9: 1/3, 10: 1/3, 11: 0}
1622216222

16223-
sage: (graphs.FruchtGraph()).clustering_coeff(weight=True) # needs networkx
16223+
sage: # needs networkx
16224+
sage: import numpy
16225+
sage: if int(numpy.version.short_version[0]) > 1:
16226+
....: numpy.set_printoptions(legacy="1.25")
16227+
sage: graphs.FruchtGraph().clustering_coeff(weight=True)
1622416228
{0: 0.3333333333333333, 1: 0.3333333333333333, 2: 0,
1622516229
3: 0.3333333333333333, 4: 0.3333333333333333,
1622616230
5: 0.3333333333333333, 6: 0.3333333333333333,
1622716231
7: 0.3333333333333333, 8: 0, 9: 0.3333333333333333,
1622816232
10: 0.3333333333333333, 11: 0}
1622916233

16230-
sage: (graphs.FruchtGraph()).clustering_coeff(nodes=[0,1,2])
16234+
sage: graphs.FruchtGraph().clustering_coeff(nodes=[0,1,2])
1623116235
{0: 0.3333333333333333, 1: 0.3333333333333333, 2: 0.0}
1623216236

16233-
sage: (graphs.FruchtGraph()).clustering_coeff(nodes=[0,1,2], # needs networkx
16237+
sage: graphs.FruchtGraph().clustering_coeff(nodes=[0,1,2], # needs networkx
1623416238
....: weight=True)
1623516239
{0: 0.3333333333333333, 1: 0.3333333333333333, 2: 0}
1623616240

16237-
sage: (graphs.GridGraph([5,5])).clustering_coeff(nodes=[(0,0),(0,1),(2,2)])
16241+
sage: graphs.GridGraph([5,5]).clustering_coeff(nodes=[(0,0),(0,1),(2,2)])
1623816242
{(0, 0): 0.0, (0, 1): 0.0, (2, 2): 0.0}
1623916243

1624016244
TESTS:

0 commit comments

Comments
 (0)