System package quoting fixes #36910
Merged
System package quoting fixes #36910
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
added 6 commits
December 17, 2023 12:14
git grep -l \" build/pkgs/*/distros* | xargs sed -i.bak '/^"/s/"//g' git grep -l -E '^([^# ]+) +([^# ][^#]+)(#.*)' build/pkgs/*/distros/*.txt | xargs sed -E -i.bak $'s/^([^# ]+) +([^# ][^#]+)(#.*)?/\\3\\\n\\1\\\n\\2/' git grep -l -E '^([^# ]+) +([^# ][^#]+)' build/pkgs/*/distros/*.txt | xargs sed -E -i.bak $'s/^([^# ]+) +([^# ][^#]+)/\\1\\\n\\2/' git grep -l -E ' +$' build/pkgs/*/distros/*.txt | xargs sed -E -i.bak 's/[ ]+$//'
…_SITEPACKAGES is respected
dimpase
reviewed
Dec 18, 2023
dimpase
reviewed
Dec 18, 2023
dimpase
reviewed
Dec 18, 2023
|
OK |
dimpase
approved these changes
Dec 18, 2023
|
Thanks! |
|
Documentation preview for this PR (built with commit 7c0eb33; changes) is ready! 🎉 |
|
Marking it blocker so that blocker #36926 does not break the portability CI. |
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 21, 2023
this is the branch from sagemath#31505, rebased over Sage 10.0 branch Resolves sagemath#31505 - Depends on sagemath#36910 (merged here) URL: sagemath#35667 Reported by: Dima Pasechnik Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 21, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> The format of the `distros/*.txt` was underspecified. We now clarify that there should be 1 package per line and no shell quoting. We extend the system package scripts so that they apply shell quoting when they print shell commands. This fixes a failure seen in CI due to underquoting: https://github.com/ sagemath/sage/actions/runs/7202678226/job/19621287638#step:11:134 We also wrap the command lines that are displayed by `sage-spkg-info` and formatted for the installation guide. https://pianomister.github.io/diffsite/?url1=https%3A%2F%2Fdeploy- preview-36910--sagemath-tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2F source&url2=https%3A%2F%2Fsagemath- tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2Fsource <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36910 Reported by: Matthias Köppe Reviewer(s): Dima Pasechnik, Matthias Köppe
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 21, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> This is a workaround for: - sagemath#36840 Cherry-picked from sagemath#36372 Author: @tobiasdiez Reviewer: @mkoeppe <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> - Depends on sagemath#36910 (merged here to fix merge conflict) <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36926 Reported by: Matthias Köppe Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 22, 2023
this is the branch from sagemath#31505, rebased over Sage 10.0 branch Resolves sagemath#31505 - Depends on sagemath#36910 (merged here) URL: sagemath#35667 Reported by: Dima Pasechnik Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 22, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> The format of the `distros/*.txt` was underspecified. We now clarify that there should be 1 package per line and no shell quoting. We extend the system package scripts so that they apply shell quoting when they print shell commands. This fixes a failure seen in CI due to underquoting: https://github.com/ sagemath/sage/actions/runs/7202678226/job/19621287638#step:11:134 We also wrap the command lines that are displayed by `sage-spkg-info` and formatted for the installation guide. https://pianomister.github.io/diffsite/?url1=https%3A%2F%2Fdeploy- preview-36910--sagemath-tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2F source&url2=https%3A%2F%2Fsagemath- tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2Fsource <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36910 Reported by: Matthias Köppe Reviewer(s): Dima Pasechnik, Matthias Köppe
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 22, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> This is a workaround for: - sagemath#36840 Cherry-picked from sagemath#36372 Author: @tobiasdiez Reviewer: @mkoeppe <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> - Depends on sagemath#36910 (merged here to fix merge conflict) <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36926 Reported by: Matthias Köppe Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 23, 2023
this is the branch from sagemath#31505, rebased over Sage 10.0 branch Resolves sagemath#31505 - Depends on sagemath#36910 (merged here) URL: sagemath#35667 Reported by: Dima Pasechnik Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 23, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> The format of the `distros/*.txt` was underspecified. We now clarify that there should be 1 package per line and no shell quoting. We extend the system package scripts so that they apply shell quoting when they print shell commands. This fixes a failure seen in CI due to underquoting: https://github.com/ sagemath/sage/actions/runs/7202678226/job/19621287638#step:11:134 We also wrap the command lines that are displayed by `sage-spkg-info` and formatted for the installation guide. https://pianomister.github.io/diffsite/?url1=https%3A%2F%2Fdeploy- preview-36910--sagemath-tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2F source&url2=https%3A%2F%2Fsagemath- tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2Fsource <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36910 Reported by: Matthias Köppe Reviewer(s): Dima Pasechnik, Matthias Köppe
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 23, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> This is a workaround for: - sagemath#36840 Cherry-picked from sagemath#36372 Author: @tobiasdiez Reviewer: @mkoeppe <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> - Depends on sagemath#36910 (merged here to fix merge conflict) <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36926 Reported by: Matthias Köppe Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 24, 2023
this is the branch from sagemath#31505, rebased over Sage 10.0 branch Resolves sagemath#31505 - Depends on sagemath#36910 (merged here) URL: sagemath#35667 Reported by: Dima Pasechnik Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 24, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> The format of the `distros/*.txt` was underspecified. We now clarify that there should be 1 package per line and no shell quoting. We extend the system package scripts so that they apply shell quoting when they print shell commands. This fixes a failure seen in CI due to underquoting: https://github.com/ sagemath/sage/actions/runs/7202678226/job/19621287638#step:11:134 We also wrap the command lines that are displayed by `sage-spkg-info` and formatted for the installation guide. https://pianomister.github.io/diffsite/?url1=https%3A%2F%2Fdeploy- preview-36910--sagemath-tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2F source&url2=https%3A%2F%2Fsagemath- tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2Fsource <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36910 Reported by: Matthias Köppe Reviewer(s): Dima Pasechnik, Matthias Köppe
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 24, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> This is a workaround for: - sagemath#36840 Cherry-picked from sagemath#36372 Author: @tobiasdiez Reviewer: @mkoeppe <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> - Depends on sagemath#36910 (merged here to fix merge conflict) <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36926 Reported by: Matthias Köppe Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 25, 2023
this is the branch from sagemath#31505, rebased over Sage 10.0 branch Resolves sagemath#31505 - Depends on sagemath#36910 (merged here) URL: sagemath#35667 Reported by: Dima Pasechnik Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 26, 2023
this is the branch from sagemath#31505, rebased over Sage 10.0 branch Resolves sagemath#31505 - Depends on sagemath#36910 (merged here) URL: sagemath#35667 Reported by: Dima Pasechnik Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 26, 2023
<!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> This is a workaround for: - sagemath#36840 Cherry-picked from sagemath#36372 Author: @tobiasdiez Reviewer: @mkoeppe <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> - Depends on sagemath#36910 (merged here to fix merge conflict) <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36926 Reported by: Matthias Köppe Reviewer(s):
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.
The format of the
distros/*.txtwas underspecified. We now clarify that there should be 1 package per line and no shell quoting.We extend the system package scripts so that they apply shell quoting when they print shell commands.
This fixes a failure seen in CI due to underquoting: https://github.com/sagemath/sage/actions/runs/7202678226/job/19621287638#step:11:134
We also wrap the command lines that are displayed by
sage-spkg-infoand formatted for the installation guide.https://pianomister.github.io/diffsite/?url1=https%3A%2F%2Fdeploy-preview-36910--sagemath-tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2Fsource&url2=https%3A%2F%2Fsagemath-tobias.netlify.app%2Fhtml%2Fen%2Finstallation%2Fsource
📝 Checklist
⌛ Dependencies