Avoid conflict with macro minor#38033
Merged
vbraun merged 1 commit intosagemath:developfrom May 25, 2024
Merged
Conversation
|
Documentation preview for this PR (built with commit 64cef31; changes) is ready! 🎉 |
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Jun 22, 2024
sagemathgh-37998: Update conda-lock files, rename macOS conda-lock files to match CI Conda, remove unexplained duplicate lock files <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> The renaming is done so that the fix here can take effect on PR runs via the "CI Fix" mechanism (as changes to the workflow files themselves cannot take effect). - Moreover, making arm64 the default platform for macOS makes sense because all new macOS machines use this platform. And update by running `.github/workflows/conda-lock-update.py` for all architectures. - Workflow matrix variables now contain `-latest`, to add tests for the macOS x86_64 platform (runner name: `macos-13`) - Removes some unexplained duplications (both `arm` and `arm64` files for macOS, both `aarch` and `aarch64` for Linux) - Fixes sagemath#37997 Author: @mkoeppe, @gmou3 ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [ ] 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 and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> - Depends on sagemath#38033 (split out from here) - Depends on sagemath#38034 (split out from here) - Depends on sagemath#38222 URL: sagemath#37998 Reported by: Matthias Köppe Reviewer(s):
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Jun 26, 2024
sagemathgh-37998: Update conda-lock files, rename macOS conda-lock files to match CI Conda, remove unexplained duplicate lock files <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> The renaming is done so that the fix here can take effect on PR runs via the "CI Fix" mechanism (as changes to the workflow files themselves cannot take effect). - Moreover, making arm64 the default platform for macOS makes sense because all new macOS machines use this platform. And update by running `.github/workflows/conda-lock-update.py` for all architectures. - Workflow matrix variables now contain `-latest`, to add tests for the macOS x86_64 platform (runner name: `macos-13`) - Removes some unexplained duplications (both `arm` and `arm64` files for macOS, both `aarch` and `aarch64` for Linux) - Fixes sagemath#37997 Author: @mkoeppe, @gmou3 ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [ ] 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 and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> - Depends on sagemath#38033 (split out from here) - Depends on sagemath#38034 (split out from here) - Depends on sagemath#38222 (merged here) URL: sagemath#37998 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
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.
Author: @gmou3
Reviewer: @mkoeppe
📝 Checklist
⌛ Dependencies