Fix sage-get-system-packages install-requires after #29665
#36979
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
… not require ENABLE_SYSTEM_SITE_PACKAGES=yes
orlitzky
approved these changes
Dec 30, 2023
orlitzky
reviewed
Dec 30, 2023
build/bin/sage-get-system-packages
Outdated
| ;; | ||
| *:) | ||
| # Skip this package if it uses the SAGE_PYTHON_PACKAGE_CHECK | ||
| # macro and if --enable-system-site-packages was NOT passed |
There was a problem hiding this comment.
Actually, the -z test was dropped here so this comment should be updated too
|
Re-reading the code, I agree that more comments were needed |
|
OK, good now, thanks. |
|
Thanks for the review! |
|
Documentation preview for this PR (built with commit 00ab9a3; changes) is ready! 🎉 |
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Jan 2, 2024
sagemathgh-36979: Fix `sage-get-system-packages install-requires` after sagemath#29665 Currently broken (since sagemath#29665): ``` $ build/bin/sage-get-system-packages install-requires zipp $ build/bin/sage-get-system-packages install-requires-toml zipp ``` This causes `pkgs/sagemath-standard/pyproject.toml` to be broken; as noted in sagemath#36964 (comment) The correct output: ``` $ build/bin/sage-get-system-packages install-requires zipp zipp >=0.5.2 $ build/bin/sage-get-system-packages install-requires-toml zipp 'zipp >=0.5.2', ``` <!-- ^^^^^ 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 --> <!-- 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. - [x] 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#36979 Reported by: Matthias Köppe Reviewer(s): Michael Orlitzky
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Jan 5, 2024
sagemathgh-36979: Fix `sage-get-system-packages install-requires` after sagemath#29665 Currently broken (since sagemath#29665): ``` $ build/bin/sage-get-system-packages install-requires zipp $ build/bin/sage-get-system-packages install-requires-toml zipp ``` This causes `pkgs/sagemath-standard/pyproject.toml` to be broken; as noted in sagemath#36964 (comment) The correct output: ``` $ build/bin/sage-get-system-packages install-requires zipp zipp >=0.5.2 $ build/bin/sage-get-system-packages install-requires-toml zipp 'zipp >=0.5.2', ``` <!-- ^^^^^ 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 --> <!-- 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. - [x] 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#36979 Reported by: Matthias Köppe Reviewer(s): Michael Orlitzky
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.
Currently broken (since #29665):
This causes
pkgs/sagemath-standard/pyproject.tomlto be broken; as noted in #36964 (comment)The correct output:
📝 Checklist
⌛ Dependencies