Merged
Conversation
Collaborator
|
imagesize fails to install because of the presence of |
Collaborator
|
Here I think you can differentiate between normal package and wheel package based on the presence or absence of |
Contributor
Author
I've made an edit in a similar direction in #37352 |
kwankyu
approved these changes
Feb 15, 2024
Collaborator
kwankyu
left a comment
There was a problem hiding this comment.
This works well on my system. I was just waiting for B&T to be sure. But our CI seems too much clogged at present.
Contributor
Author
|
Thank you! |
|
Documentation preview for this PR (built with commit 69209b8; changes) is ready! 🎉 |
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Feb 18, 2024
sagemathgh-37129: Sphinx 7 <!-- ^^^^^ 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 --> We update Sphinx from 5.x to 7.x, including updates to various dependencies to latest, and update furo to 2023.9.10 Reducing the complexity of the distribution by switching the packages from normal packages to wheel packages. <!-- 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#37222 <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#37129 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Feb 18, 2024
sagemathgh-37352: `sage --package create`: When re-creating with a different source type, clean up <!-- ^^^^^ 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 --> For example, when switching from a `pip` package to `wheel` package, remove the `requirements.txt` file. When switching from `normal` to `wheel`, remove the `spkg-install.in` file. One of these cases was handled by a commit on sagemath#36641, cherry-picked from there. Generalizing here to avoid mistakes such as sagemath#37129 (comment) in the future. Example: ``` $ ./sage -package create imagesize --pypi Downloading tarball from https://pypi.io/packages/py2.py3/i/imagesize/im agesize-1.4.1-py2.py3-none-any.whl to /Users/mkoeppe/s/sage/sage- rebasing/worktree-pristine/upstream/imagesize-1.4.1-py2.py3-none-any.whl [......................................................................] $ git status On branch sage_package_create_remove_files Your branch is ahead of 'upstream/develop' by 3 commits. (use "git push" to publish your local commits) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: build/pkgs/imagesize/SPKG.rst modified: build/pkgs/imagesize/checksums.ini modified: build/pkgs/imagesize/install-requires.txt deleted: build/pkgs/imagesize/spkg-install.in modified: build/pkgs/imagesize/type ``` <!-- 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#37352 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Feb 19, 2024
sagemathgh-37129: Sphinx 7 <!-- ^^^^^ 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 --> We update Sphinx from 5.x to 7.x, including updates to various dependencies to latest, and update furo to 2023.9.10 Reducing the complexity of the distribution by switching the packages from normal packages to wheel packages. <!-- 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#37222 <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#37129 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Feb 19, 2024
sagemathgh-37334: Preparation for Sphinx 7 Based on sagemath#37129, we adjust sage for Sphinx 7. Mainly, - (once again) `sage_autodoc` is updated based on the source file of Sphinx 7. Before the arrival of Sphinx 8, hopefully, we should remove `sage_autodoc`! <!-- ^^^^^ 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: ... --> - sagemath#37129 <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#37334 Reported by: Kwankyu Lee Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Feb 19, 2024
sagemathgh-37352: `sage --package create`: When re-creating with a different source type, clean up <!-- ^^^^^ 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 --> For example, when switching from a `pip` package to `wheel` package, remove the `requirements.txt` file. When switching from `normal` to `wheel`, remove the `spkg-install.in` file. One of these cases was handled by a commit on sagemath#36641, cherry-picked from there. Generalizing here to avoid mistakes such as sagemath#37129 (comment) in the future. Example: ``` $ ./sage -package create imagesize --pypi Downloading tarball from https://pypi.io/packages/py2.py3/i/imagesize/im agesize-1.4.1-py2.py3-none-any.whl to /Users/mkoeppe/s/sage/sage- rebasing/worktree-pristine/upstream/imagesize-1.4.1-py2.py3-none-any.whl [......................................................................] $ git status On branch sage_package_create_remove_files Your branch is ahead of 'upstream/develop' by 3 commits. (use "git push" to publish your local commits) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: build/pkgs/imagesize/SPKG.rst modified: build/pkgs/imagesize/checksums.ini modified: build/pkgs/imagesize/install-requires.txt deleted: build/pkgs/imagesize/spkg-install.in modified: build/pkgs/imagesize/type ``` <!-- 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#37352 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Feb 22, 2024
sagemathgh-37334: Preparation for Sphinx 7 Based on sagemath#37129, we adjust sage for Sphinx 7. Mainly, - (once again) `sage_autodoc` is updated based on the source file of Sphinx 7. Before the arrival of Sphinx 8, hopefully, we should remove `sage_autodoc`! <!-- ^^^^^ 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: ... --> - sagemath#37129 <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#37334 Reported by: Kwankyu Lee Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Feb 22, 2024
sagemathgh-37352: `sage --package create`: When re-creating with a different source type, clean up <!-- ^^^^^ 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 --> For example, when switching from a `pip` package to `wheel` package, remove the `requirements.txt` file. When switching from `normal` to `wheel`, remove the `spkg-install.in` file. One of these cases was handled by a commit on sagemath#36641, cherry-picked from there. Generalizing here to avoid mistakes such as sagemath#37129 (comment) in the future. Example: ``` $ ./sage -package create imagesize --pypi Downloading tarball from https://pypi.io/packages/py2.py3/i/imagesize/im agesize-1.4.1-py2.py3-none-any.whl to /Users/mkoeppe/s/sage/sage- rebasing/worktree-pristine/upstream/imagesize-1.4.1-py2.py3-none-any.whl [......................................................................] $ git status On branch sage_package_create_remove_files Your branch is ahead of 'upstream/develop' by 3 commits. (use "git push" to publish your local commits) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: build/pkgs/imagesize/SPKG.rst modified: build/pkgs/imagesize/checksums.ini modified: build/pkgs/imagesize/install-requires.txt deleted: build/pkgs/imagesize/spkg-install.in modified: build/pkgs/imagesize/type ``` <!-- 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#37352 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
We update Sphinx from 5.x to 7.x, including updates to various dependencies to latest, and update furo to 2023.9.10
Reducing the complexity of the distribution by switching the packages from normal packages to wheel packages.
📝 Checklist
⌛ Dependencies