Skip to content

Conversation

fchapoton
Copy link
Contributor

fixing the linter, once again broken

📝 Checklist

  • The title is concise, informative, and self-explanatory.
  • The description explains in detail what this PR is about.

@github-actions
Copy link

Documentation preview for this PR (built with commit d11230a; changes) is ready! 🎉

@@ -2,7 +2,7 @@
from sage.misc.lazy_import import lazy_import as _lazy_import

_lazy_import("sage.coding.code_constructions", ["permutation_action",
"walsh_matrix"])
"walsh_matrix"])

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks strange. This should be one liner:

_lazy_import("sage.coding.code_constructions", ["permutation_action", "walsh_matrix"])

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry. I misread.

@kwankyu
Copy link
Collaborator

kwankyu commented Sep 25, 2023

We should have "p: urgent" priority label for PRs that should be merged to "develop" branch as soon as possible (after positive review) under release manager's discretion to fix CI-related issues, instead of waiting for the next beta.

@vbraun @mkoeppe

Copy link
Collaborator

@kwankyu kwankyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

vbraun pushed a commit to vbraun/sage that referenced this pull request Sep 27, 2023
sagemathgh-36338: CI: Merge open blocker PRs in all CI workflows + other improvements
    
<!-- ^^^^^
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 new script `.ci/merge-fixes.sh` uses the GitHub CLI to retrieve open
PRs with the "blocker" label from sagemath/sage and tries to merge them
into the tested branch, ignoring any PRs that give merge failures.

We call this script in all CI workflows. Thus,
- hotfixes for the linter (such as sagemath#36327) or
- fixes for build problems (such as sagemath#36276)

will take effect in the CI workflows of all PRs.

This can be seen in the runs of the workflows of the present PR (section
"Merge CI fixes from sagemath/sage").

Additionally,
- we fix `debian-trixie`, which failed because a system package is no
longer available
- we fix `macos-conda-maximal` by removing some fictitious
distros/conda.txt files
- we refactor ci-macos using a new reusable workflow; example runs:
   - https://github.com/mkoeppe/sage/actions/runs/6308124398
   -
https://github.com/sagemath/cysignals/actions/runs/6316714387?pr=185
- we update the ci-macos platforms, including a configuration for the
new and problematic Xcode 15.0

<!-- 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#36338
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik, Jonathan Kliem, Kwankyu Lee, Matthias Köppe, Tobias Diez
@vbraun vbraun merged commit f6a9058 into sagemath:develop Sep 27, 2023
@fchapoton fchapoton deleted the fix_linter3 branch September 28, 2023 05:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants