MAINT: git security shim for 1.9.x #16329
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* replicated scipygh-16139 on the latest maintenance branch because the `master` branch of the wheels repo will encounter the issues described in that PR (for example, see: MacPython/scipy-wheels#166 which has Travis and Azure failures caused by those same versioning issues) * I think the `cwd` is still correct even though the patch is being applied to a different file this time (used to be `setup.py`), though we could double check this by pointing the wheels PR at the commit hash of this PR if we want * any reason not to forward port this as well at this point, if we're going to need to keep backporting it?
rgommers
reviewed
May 31, 2022
There was a problem hiding this comment.
An odd error in two of the jobs:
___________________________ test_valid_scipy_version ___________________________
[gw1] linux -- Python 3.9.12 /opt/hostedtoolcache/Python/3.9.12/x64/bin/python
../../build-install/lib/python3.9/site-packages/scipy/_lib/tests/test_scipy_version.py:18: in test_valid_scipy_version
assert_(res is not None, scipy.__version__)
E AssertionError: 1.9.0.dev0+0.
dev_suffix = '(\\.dev0\\+.+([0-9a-f]{7}|Unknown))'
res = None
version_pattern = '^[0-9]+\\.[0-9]+\\.[0-9]+(|a[0-9]|b[0-9]|rc[0-9])'
=========================== short test summary info ============================
FAILED ../../build-install/lib/python3.9/site-packages/scipy/_lib/tests/test_scipy_version.py::test_valid_scipy_version
= 1 failed, 37647 passed, 2657 skipped, 140 xfailed, 9 xpassed in 385.93s (0:06:25) =
Looks fine to me to forward-port to main once CI is green.
* make the `git` directory scoping more robust
|
Ok, I'll have to debug this locally, the CI failures are similar to exactly what I want to fix in the wheels repo. |
* adjustments that work locally for setting the SciPy version with `git` dir scoping
tylerjereddy
force-pushed
the
treddy_git_security_shim_again
branch
from
d0154d3
to
6434ee2
Compare
|
I fixed locally with two versions of I do see an unrelated mingw download error on Windows Azure 32-bit |
tylerjereddy
added a commit
to tylerjereddy/scipy
that referenced
this pull request
Jun 1, 2022
* forward port scipygh-16329 so we don't have to keep backporting to each new maintenance branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
replicate WIP, BLD, MAINT: git security/version shim #16139 on the latest maintenance branch
because the
masterbranch of the wheels repo willencounter the issues described in that PR (for example, see:
MAINT: master->main refs MacPython/scipy-wheels#166 which
has Travis and Azure failures caused by those same
versioning issues)
I think the
cwdis still correct even though the patchis being applied to a different file this time (used to be
setup.py), though we could double check this by pointingthe wheels PR at the commit hash of this PR on my fork if we want
any reason not to forward port this as well at this point,
if we're going to need to keep "backporting" it?
(there are other issues in the wheels repo as well, possibly even the PROPACK
Windows stuff to shim around again? but one thing at a time)