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: SciPy 1.11.1 backports #18779

Merged

Conversation

tylerjereddy
Copy link
Contributor

rkern and others added 8 commits June 28, 2023 11:13
…nputs (scipy#18754)

Also ensure `test_factorial{,2,k}_array_corner_cases` covers 0-dim. inputs correctly

Unfortunately, `np.array` will ignore an explicit `ndim=0` request and
happily give back a 1-dimensional result without complaint:
```
>>> np.array([1], ndmin=0, dtype=np.int64).ndim
1
```

This invalidated the original assumptions for these tests.

Additionally, we need to take care not to iterate over 0-dim arrays
(but also keep the tests with two elements in `content` correct),
that n.ravel().ndim == 1 even if n.ndim == 0, and that assert_equal
will not distinguish scalars from 0-dim arrays with the same value.
* Fixes scipy#18765

* the offending unuran source file was removed
over at scipy/unuran#9,
and this PR updates us to point to latest `main`
version of submodule (caution: this pulls in a few
more commits from `main` we didn't have in original
`1.11.0` release)

* as noted over there, the (SciPy) testsuite appears to
pass just fine when this file is purged, likely
because we have `HAVE_DECL_LOG1P` always set, since
we require C99, and therefore unuran always uses
the version from `math.h` instead of in-house anyway
@rossbar
Copy link
Contributor

rossbar commented Jun 28, 2023

Just to comment - it would be great if #18644 could make it into the next patch release as well.

@tylerjereddy
Copy link
Contributor Author

The only CI failure is or was a known issue on main that isn't related: TestSplu::test_threads_parallel.

Just to comment - it would be great if #18644 could make it into the next patch release as well.

I agree, this situation is a bit different in the sense that I'm moving a bit faster than usual and only added backports that are already merged. Apologies, but it'll surely be in 1.11.2.

@tylerjereddy tylerjereddy merged commit 450d8aa into scipy:maintenance/1.11.x Jun 28, 2023
22 of 23 checks passed
@tylerjereddy tylerjereddy deleted the treddy_1_11_1_prep branch June 28, 2023 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants