Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT, REL: prepare for SciPy 1.11.0 "final" #18724

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 8 additions & 7 deletions doc/source/release/1.11.0-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
SciPy 1.11.0 Release Notes
==========================

.. note:: SciPy 1.11.0 is not released yet!

.. contents::

SciPy 1.11.0 is the culmination of 6 months of hard work. It contains
Expand Down Expand Up @@ -337,7 +335,7 @@ Authors
* boeleman (1) +
* Jack Borchanian (1) +
* Matt Borland (3) +
* Jake Bowhay (40)
* Jake Bowhay (41)
* Larry Bradley (1) +
* Sienna Brent (1) +
* Matthew Brett (1)
Expand All @@ -364,17 +362,17 @@ Authors
* Stefano Frazzetto (1) +
* Neil Girdhar (1)
* Caden Gobat (1) +
* Ralf Gommers (152)
* Ralf Gommers (153)
* GonVas (1) +
* Marco Gorelli (1)
* Brett Graham (2) +
* Matt Haberland (390)
* Matt Haberland (388)
* harshvardhan2707 (1) +
* Alex Herbert (1) +
* Guillaume Horel (1)
* Geert-Jan Huizing (1) +
* Jakob Jakobson (2)
* Julien Jerphanion (14)
* Julien Jerphanion (10)
* jyuv (2)
* Rajarshi Karmakar (1) +
* Ganesh Kathiresan (3) +
Expand Down Expand Up @@ -416,7 +414,7 @@ Authors
* Ilhan Polat (32)
* Quentin Barthélemy (1)
* Matteo Raso (12) +
* Tyler Reddy (131)
* Tyler Reddy (134)
* Lucas Roberts (1)
* Pamphile Roy (225)
* Jordan Rupprecht (1) +
Expand Down Expand Up @@ -1170,5 +1168,8 @@ Pull requests for 1.11.0
* `#18657 <https://github.com/scipy/scipy/pull/18657>`__: MAINT: fix 'no such option' error in build_scipy CI
* `#18658 <https://github.com/scipy/scipy/pull/18658>`__: TST: fix two test failures that showed up on conda-forge
* `#18659 <https://github.com/scipy/scipy/pull/18659>`__: DOC: \`scipy._sensitivity_analysis\`: correct statement about...
* `#18671 <https://github.com/scipy/scipy/pull/18671>`__: MAINT: backports for 1.11.0rc2
* `#18672 <https://github.com/scipy/scipy/pull/18672>`__: BUG: small shim for release process
* `#18676 <https://github.com/scipy/scipy/pull/18676>`__: BUG: signal: fix detrend with array-like bp
* `#18697 <https://github.com/scipy/scipy/pull/18697>`__: MAINT: NumPy 1.25.0 shims for arm64
* `#18698 <https://github.com/scipy/scipy/pull/18698>`__: DEP: interpolate: delay interp2d deprecation and update link
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(
# Note that the git commit hash cannot be added dynamically here (it is added
# in the dynamically generated and installed `scipy/version.py` though - see
# tools/version_utils.py
version: '1.11.0rc2',
version: '1.11.0',
license: 'BSD-3',
meson_version: '>= 1.1.0',
default_options: [
Expand Down
10 changes: 5 additions & 5 deletions scipy/interpolate/_interpolate.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def lagrange(x, w):


dep_mesg = """\
`interp2d` is deprecated in SciPy 1.10 and will be removed in SciPy 1.12.0.
`interp2d` is deprecated in SciPy 1.10 and will be removed in SciPy 1.13.0.

For legacy code, nearly bug-for-bug compatible replacements are
`RectBivariateSpline` on regular grids, and `bisplrep`/`bisplev` for
Expand All @@ -103,7 +103,7 @@ def lagrange(x, w):
`CloughTocher2DInterpolator`.

For more details see
`https://gist.github.com/ev-br/8544371b40f414b7eaf3fe6217209bff`
`https://scipy.github.io/devdocs/notebooks/interp_transition_guide.html`
"""

class interp2d:
Expand All @@ -114,7 +114,7 @@ class interp2d:
.. deprecated:: 1.10.0

`interp2d` is deprecated in SciPy 1.10 and will be removed in SciPy
1.12.0.
1.13.0.

For legacy code, nearly bug-for-bug compatible replacements are
`RectBivariateSpline` on regular grids, and `bisplrep`/`bisplev` for
Expand All @@ -125,8 +125,8 @@ class interp2d:
`CloughTocher2DInterpolator`.

For more details see
`https://gist.github.com/ev-br/8544371b40f414b7eaf3fe6217209bff
<https://gist.github.com/ev-br/8544371b40f414b7eaf3fe6217209bff>`_
`https://scipy.github.io/devdocs/notebooks/interp_transition_guide.html
<https://scipy.github.io/devdocs/notebooks/interp_transition_guide.html>`_


Interpolate over a 2-D grid.
Expand Down
6 changes: 4 additions & 2 deletions scipy/optimize/_linprog_highs.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ def _highs_to_scipy_status_message(highs_status, highs_message):
def _replace_inf(x):
# Replace `np.inf` with CONST_INF
infs = np.isinf(x)
x[infs] = np.sign(x[infs])*CONST_INF
with np.errstate(invalid="ignore"):
x[infs] = np.sign(x[infs])*CONST_INF
return x


Expand Down Expand Up @@ -322,7 +323,8 @@ def _linprog_highs(lp, solver, time_limit=None, presolve=True,

lb, ub = bounds.T.copy() # separate bounds, copy->C-cntgs
# highs_wrapper solves LHS <= A*x <= RHS, not equality constraints
lhs_ub = -np.ones_like(b_ub)*np.inf # LHS of UB constraints is -inf
with np.errstate(invalid="ignore"):
lhs_ub = -np.ones_like(b_ub)*np.inf # LHS of UB constraints is -inf
rhs_ub = b_ub # RHS of UB constraints is b_ub
lhs_eq = b_eq # Equality constaint is inequality
rhs_eq = b_eq # constraint with LHS=RHS
Expand Down
1 change: 1 addition & 0 deletions scipy/sparse/linalg/_isolve/tests/test_iterative.py
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ def test_zero_rhs(solver):
assert_allclose(x, 0, atol=1e-300)


@pytest.mark.xfail(reason="see gh-18697")
def test_maxiter_worsening(solver):
if solver not in (gmres, lgmres):
# these were skipped from the very beginning, see gh-9201; gh-14160
Expand Down
4 changes: 2 additions & 2 deletions tools/version_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
MAJOR = 1
MINOR = 11
MICRO = 0
ISRELEASED = True
ISRELEASED = False
IS_RELEASE_BRANCH = True
VERSION = '%d.%d.%drc2' % (MAJOR, MINOR, MICRO)
VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)


def get_version_info(source_root):
Expand Down