8000 Merge pull request #17696 from tylerjereddy/treddy_110_final_prep · scipy/scipy@7856f28 · GitHub 8000
[go: up one dir, main page]
Skip to content

Commit 7856f28

Browse files
tylerjereddytylerjereddy
authored
Merge pull request #17696 from tylerjereddy/treddy_110_final_prep
MAINT: prepare for SciPy 1.10.0 "final"
2 parents 843500a + 205b624 commit 7856f28

File tree

7 files changed

+24
-17
lines changed

7 files changed

+24
-17
lines changed

‎.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
gfortran --version
4747
- name: pip-packages
4848
run: |
49-
pip install numpy==1.22.2 cython "pybind11!=2.10.2" pythran meson ninja pytest pytest-xdist pytest-timeout pooch
49+
pip install numpy==1.22.2 cython pybind11 pythran meson ninja pytest pytest-xdist pytest-timeout pooch
5050
- name: openblas-libs
5151
run: |
5252
# Download and install pre-built OpenBLAS library

‎doc/release/1.10.0-notes.rst

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
SciPy 1.10.0 Release Notes
33
==========================
44

5-
.. note:: Scipy 1.10.0 is not released yet!
6-
75
.. contents::
86

97
SciPy 1.10.0 is the culmination of 6 months of hard work. It contains
@@ -419,7 +417,7 @@ Authors
419417
* David Gilbertson (1) +
420418
* Ralf Gommers (251)
421419
* Marco Gorelli (2) +
422-
* Matt Haberland (383)
420+
* Matt Haberland (387)
423421
* Andrew Hawryluk (2) +
424422
* Christoph Hohnerlein (2) +
425423
* Loïc Houpert (2) +
@@ -489,7 +487,7 @@ Authors
489487
* Ilhan Polat (6)
490488
* Akshita Prasanth (2) +
491489
* Sean Quinn (1)
492-
* Tyler Reddy (142)
490+
* Tyler Reddy (155)
493491
* Martin Reinecke (1)
494492
* Ned Richards (1)
495493
* Marie Roald (1) +
@@ -509,6 +507,7 @@ Authors
509507
* Alexander Soare (1) +
510508
* Bjørge Solli (2) +
511509
* Scott Staniewicz (1)
510+
* Ethan Steinberg (3) +
512511
* Albert Steppi (3)
513512
* Thomas Stoeger (1) +
514513
* Kai Striega (4)
@@ -518,6 +517,7 @@ Authors
518517
* TianyiQ (1) +
519518
* Tiger (1) +
520519
* Will Tirone (1)
520+
* Ajay Shanker Tripathi (1) +
521521
* Edgar Andrés Margffoy Tuay (1) +
522522
* Dmitry Ulyumdzhiev (1) +
523523
* Hari Vamsi (1) +
@@ -540,7 +540,7 @@ Authors
540540
* Egor Zemlyanoy (19)
541541
* Gavin Zhang (3) +
542542

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

@@ -681,6 +681,7 @@ Issues closed for 1.10.0
681681
* `#17412 <https://github.com/scipy/scipy/issues/17412>`__: BUG: Meson error:compiler for language "cpp", not specified for...
682682
* `#17444 <https://github.com/scipy/scipy/issues/17444>`__: BUG: beta.ppf causes segfault
683683
* `#17468 <https://github.com/scipy/scipy/issues/17468>`__: Weird errors with running the tests \`scipy.stats.tests.test_distributions\`...
684+
* `#17518 <https://github.com/scipy/scipy/issues/17518>`__: ENH: stats.pearsonr: support complex data
684685
* `#17523 <https://github.com/scipy/scipy/issues/17523>`__: BUG: \`[source]\` button in the docs sending to the wrong place
685686
* `#17578 <https://github.com/scipy/scipy/issues/17578>`__: TST, BLD, CI: 1.10.0rc1 wheel build/test failures
686687
* `#17619 <https://github.com/scipy/scipy/issues/17619>`__: BUG: core dump when calling scipy.optimize.linprog
@@ -1204,3 +1205,7 @@ Pull requests for 1.10.0
12041205
* `#17640 <https://github.com/scipy/scipy/pull/17640>`__: MAINT: prepare for SciPy 1.10.0rc2
12051206
* `#17645 <https://github.com/scipy/scipy/pull/17645>`__: MAINT: stats.rankdata: ensure consistent shape handling
12061207
* `#17653 <https://github.com/scipy/scipy/pull/17653>`__: MAINT: pybind11 win exclusion
1208+
* `#17656 <https://github.com/scipy/scipy/pull/17656>`__: MAINT: 1.10.0rc2 backports, round two
1209+
* `#17662 <https://github.com/scipy/scipy/pull/17662>`__: Fix undefined behavior within scipy.fft
1210+
* `#17686 <https://github.com/scipy/scipy/pull/17686>`__: REV: integrate.qmc_quad: delay release to SciPy 1.11.0
1211+
* `#17689 <https://github.com/scipy/scipy/pull/17689>`__: REL: integrate.qmc_quad: remove from release notes

‎pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ build-backend = 'mesonpy'
1212
requires = [
1313
"meson-python>=0.11.0,<0.12.0",
1414
"Cython>=0.29.32,<3.0",
15-
"pybind11>=2.10.0,!=2.10.2,<2.11.0",
15+
# conservatively avoid issues from
16+
# https://github.com/pybind/pybind11/issues/4420
17+
"pybind11==2.10.1",
1618
"pythran>=0.12.0,<0.13.0",
1719
# `wheel` is needed for non-isolated builds, given that `meson-python`
1820
# doesn't list it as a runtime requirement (at least in 0.5.0)

‎scipy/fft/_pocketfft/pypocketfft.cxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ using clong = std::complex<ldbl_t>;
3737
using f32 = float;
3838
using f64 = double;
3939
using flong = ldbl_t;
40-
auto None = py::none();
4140

4241
shape_t copy_shape(const py::array &arr)
4342
{
@@ -717,6 +716,8 @@ PYBIND11_MODULE(pypocketfft, m)
717716
{
718717
using namespace pybind11::literals;
719718

719+
auto None = py::none();
720+
720721
m.doc() = pypocketfft_DS;
721722
m.def("c2c", c2c, c2c_DS, "a"_a, "axes"_a=None, "forward"_a=true,
722723
"inorm"_a=0, "out"_a=None, "nthreads"_a=1);

‎scipy/integrate/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
quadrature -- Integrate with given tolerance using Gaussian quadrature
2121
romberg -- Integrate func using Romberg integration
2222
newton_cotes -- Weights and error coefficient for Newton-Cotes integration
23-
qmc_quad -- N-D integration using Quasi-Monte Carlo quadrature
2423
IntegrationWarning -- Warning on issues during integration
2524
AccuracyWarning -- Warning on issues during quadrature integration
2625

‎scipy/integrate/_quadrature.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
__all__ = ['fixed_quad', 'quadrature', 'romberg', 'romb',
2020
'trapezoid', 'trapz', 'simps', 'simpson',
2121
'cumulative_trapezoid', 'cumtrapz', 'newton_cotes',
22-
'qmc_quad', 'AccuracyWarning']
22+
'AccuracyWarning']
2323

2424

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

10511051
# lazy import to avoid issues with partially-initialized submodule
1052-
if not hasattr(qmc_quad, 'qmc'):
1052+
if not hasattr(_qmc_quad, 'qmc'):
10531053
from scipy import stats
1054-
qmc_quad.stats = stats
1054+
_qmc_quad.stats = stats
10551055
else:
1056-
stats = qmc_quad.stats
1056+
stats = _qmc_quad.stats
10571057

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

11251125

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

‎scipy/integrate/tests/test_quadrature.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
from scipy.integrate import (quadrature, romberg, romb, newton_cotes,
88
cumulative_trapezoid, cumtrapz, trapz, trapezoid,
9-
quad, simpson, simps, fixed_quad, AccuracyWarning,
10-
qmc_quad)
9+
quad, simpson, simps, fixed_quad, AccuracyWarning)
10+
from scipy.integrate._quadrature import _qmc_quad as qmc_quad
1111
from scipy import stats, special as sc
1212

1313

0 commit comments

Comments
 (0)
0