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: prepare for SciPy 1.10.0 "final" #17696

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
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Expand Up @@ -46,7 +46,7 @@ jobs:
gfortran --version
- name: pip-packages
run: |
pip install numpy==1.22.2 cython "pybind11!=2.10.2" pythran meson ninja pytest pytest-xdist pytest-timeout pooch
pip install numpy==1.22.2 cython pybind11 pythran meson ninja pytest pytest-xdist pytest-timeout pooch
- name: openblas-libs
run: |
# Download and install pre-built OpenBLAS library
Expand Down
15 changes: 10 additions & 5 deletions doc/release/1.10.0-notes.rst
Expand Up @@ -2,8 +2,6 @@
SciPy 1.10.0 Release Notes
==========================

.. note:: Scipy 1.10.0 is not released yet!

.. contents::

SciPy 1.10.0 is the culmination of 6 months of hard work. It contains
Expand Down Expand Up @@ -419,7 +417,7 @@ Authors
* David Gilbertson (1) +
* Ralf Gommers (251)
* Marco Gorelli (2) +
* Matt Haberland (383)
* Matt Haberland (387)
* Andrew Hawryluk (2) +
* Christoph Hohnerlein (2) +
* Loïc Houpert (2) +
Expand Down Expand Up @@ -489,7 +487,7 @@ Authors
* Ilhan Polat (6)
* Akshita Prasanth (2) +
* Sean Quinn (1)
* Tyler Reddy (142)
* Tyler Reddy (155)
* Martin Reinecke (1)
* Ned Richards (1)
* Marie Roald (1) +
Expand All @@ -509,6 +507,7 @@ Authors
* Alexander Soare (1) +
* Bjørge Solli (2) +
* Scott Staniewicz (1)
* Ethan Steinberg (3) +
* Albert Steppi (3)
* Thomas Stoeger (1) +
* Kai Striega (4)
Expand All @@ -518,6 +517,7 @@ Authors
* TianyiQ (1) +
* Tiger (1) +
* Will Tirone (1)
* Ajay Shanker Tripathi (1) +
* Edgar Andrés Margffoy Tuay (1) +
* Dmitry Ulyumdzhiev (1) +
* Hari Vamsi (1) +
Expand All @@ -540,7 +540,7 @@ Authors
* Egor Zemlyanoy (19)
* Gavin Zhang (3) +

A total of 182 people contributed to this release.
A total of 184 people contributed to this release.
People with a "+" by their names contributed a patch for the first time.
This list of names is automatically generated, and may not be fully complete.

Expand Down Expand Up @@ -681,6 +681,7 @@ Issues closed for 1.10.0
* `#17412 <https://github.com/scipy/scipy/issues/17412>`__: BUG: Meson error:compiler for language "cpp", not specified for...
* `#17444 <https://github.com/scipy/scipy/issues/17444>`__: BUG: beta.ppf causes segfault
* `#17468 <https://github.com/scipy/scipy/issues/17468>`__: Weird errors with running the tests \`scipy.stats.tests.test_distributions\`...
* `#17518 <https://github.com/scipy/scipy/issues/17518>`__: ENH: stats.pearsonr: support complex data
* `#17523 <https://github.com/scipy/scipy/issues/17523>`__: BUG: \`[source]\` button in the docs sending to the wrong place
* `#17578 <https://github.com/scipy/scipy/issues/17578>`__: TST, BLD, CI: 1.10.0rc1 wheel build/test failures
* `#17619 <https://github.com/scipy/scipy/issues/17619>`__: BUG: core dump when calling scipy.optimize.linprog
Expand Down Expand Up @@ -1204,3 +1205,7 @@ Pull requests for 1.10.0
* `#17640 <https://github.com/scipy/scipy/pull/17640>`__: MAINT: prepare for SciPy 1.10.0rc2
* `#17645 <https://github.com/scipy/scipy/pull/17645>`__: MAINT: stats.rankdata: ensure consistent shape handling
* `#17653 <https://github.com/scipy/scipy/pull/17653>`__: MAINT: pybind11 win exclusion
* `#17656 <https://github.com/scipy/scipy/pull/17656>`__: MAINT: 1.10.0rc2 backports, round two
* `#17662 <https://github.com/scipy/scipy/pull/17662>`__: Fix undefined behavior within scipy.fft
* `#17686 <https://github.com/scipy/scipy/pull/17686>`__: REV: integrate.qmc_quad: delay release to SciPy 1.11.0
* `#17689 <https://github.com/scipy/scipy/pull/17689>`__: REL: integrate.qmc_quad: remove from release notes
4 changes: 3 additions & 1 deletion pyproject.toml
Expand Up @@ -12,7 +12,9 @@ build-backend = 'mesonpy'
requires = [
"meson-python>=0.11.0,<0.12.0",
"Cython>=0.29.32,<3.0",
"pybind11>=2.10.0,!=2.10.2,<2.11.0",
# conservatively avoid issues from
# https://github.com/pybind/pybind11/issues/4420
"pybind11==2.10.1",
"pythran>=0.12.0,<0.13.0",
# `wheel` is needed for non-isolated builds, given that `meson-python`
# doesn't list it as a runtime requirement (at least in 0.5.0)
Expand Down
3 changes: 2 additions & 1 deletion scipy/fft/_pocketfft/pypocketfft.cxx
Expand Up @@ -37,7 +37,6 @@ using clong = std::complex<ldbl_t>;
using f32 = float;
using f64 = double;
using flong = ldbl_t;
auto None = py::none();

shape_t copy_shape(const py::array &arr)
{
Expand Down Expand Up @@ -717,6 +716,8 @@ PYBIND11_MODULE(pypocketfft, m)
{
using namespace pybind11::literals;

auto None = py::none();

m.doc() = pypocketfft_DS;
m.def("c2c", c2c, c2c_DS, "a"_a, "axes"_a=None, "forward"_a=true,
"inorm"_a=0, "out"_a=None, "nthreads"_a=1);
Expand Down
1 change: 0 additions & 1 deletion scipy/integrate/__init__.py
Expand Up @@ -20,7 +20,6 @@
quadrature -- Integrate with given tolerance using Gaussian quadrature
romberg -- Integrate func using Romberg integration
newton_cotes -- Weights and error coefficient for Newton-Cotes integration
qmc_quad -- N-D integration using Quasi-Monte Carlo quadrature
IntegrationWarning -- Warning on issues during integration
AccuracyWarning -- Warning on issues during quadrature integration

Expand Down
12 changes: 6 additions & 6 deletions scipy/integrate/_quadrature.py
Expand Up @@ -19,7 +19,7 @@
__all__ = ['fixed_quad', 'quadrature', 'romberg', 'romb',
'trapezoid', 'trapz', 'simps', 'simpson',
'cumulative_trapezoid', 'cumtrapz', 'newton_cotes',
'qmc_quad', 'AccuracyWarning']
'AccuracyWarning']


# Make See Also linking for our local copy work properly
Expand Down Expand Up @@ -1049,11 +1049,11 @@ def newton_cotes(rn, equal=0):
def _qmc_quad_iv(func, a, b, n_points, n_estimates, qrng, log):

# lazy import to avoid issues with partially-initialized submodule
if not hasattr(qmc_quad, 'qmc'):
if not hasattr(_qmc_quad, 'qmc'):
from scipy import stats
qmc_quad.stats = stats
_qmc_quad.stats = stats
else:
stats = qmc_quad.stats
stats = _qmc_quad.stats

if not callable(func):
message = "`func` must be callable."
Expand Down Expand Up @@ -1123,8 +1123,8 @@ def vfunc(x):
QMCQuadResult = namedtuple('QMCQuadResult', ['integral', 'standard_error'])


def qmc_quad(func, a, b, *, n_points=1024, n_estimates=8, qrng=None,
log=False, args=None):
def _qmc_quad(func, a, b, *, n_points=1024, n_estimates=8, qrng=None,
log=False, args=None):
"""
Compute an integral in N-dimensions using Quasi-Monte Carlo quadrature.

Expand Down
4 changes: 2 additions & 2 deletions scipy/integrate/tests/test_quadrature.py
Expand Up @@ -6,8 +6,8 @@

from scipy.integrate import (quadrature, romberg, romb, newton_cotes,
cumulative_trapezoid, cumtrapz, trapz, trapezoid,
quad, simpson, simps, fixed_quad, AccuracyWarning,
qmc_quad)
quad, simpson, simps, fixed_quad, AccuracyWarning)
from scipy.integrate._quadrature import _qmc_quad as qmc_quad
from scipy import stats, special as sc


Expand Down