Skip to content

Makefile, .ci/write-dockerfile.sh: Update for src/pyproject.toml after #36982#37926

Merged
vbraun merged 14 commits intosagemath:developfrom
mkoeppe:fix_ci_linux
May 25, 2024
Merged

Makefile, .ci/write-dockerfile.sh: Update for src/pyproject.toml after #36982#37926
vbraun merged 14 commits intosagemath:developfrom
mkoeppe:fix_ci_linux

Conversation

@mkoeppe
Copy link
Copy Markdown
Contributor

@mkoeppe mkoeppe commented May 3, 2024 •
edited
Loading

Also some unrelated fixes:

📝 Checklist

  • 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

@github-actions
Copy link
Copy Markdown

github-actions bot commented May 3, 2024 •
edited
Loading

Documentation preview for this PR (built with commit 4c076bb; changes) is ready! 🎉
This preview will update shortly after each push to this PR.

This was referenced May 6, 2024
Merged
Merged
Merged
@fchapoton
Copy link
Copy Markdown
Contributor

fchapoton commented May 8, 2024

hmm, tagging doctests as "known bugs" does not look like a good permanent solution

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented May 8, 2024

That's right, this is a bad temporary solution.

This is fallout from the big revert in #37796.

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented May 8, 2024

I've removed the commits that made changes to .github/workflows/*macos.yml to reduce the scope of the PR; these commits are now on #37919.

Matthias Koeppe added 14 commits May 12, 2024 13:00
@mkoeppe
.ci/write-dockerfile.sh: Update for src/pyproject.toml after sagemath…
92b9d80 
…#36982
@mkoeppe
Makefile (CONFIGURE_DEPENDENCIES): Add src/pyproject.toml
e0fc352
@mkoeppe
.ci/write-dockerfile.sh: Quoting fix for updated docker client
404a2c1
@mkoeppe
.ci/write-dockerfile.sh (with-targets): Re-bootstrap after copying in…
5393c94 
… src
@mkoeppe
tox.ini, .ci/write-dockerfile.sh: Fix handling of CONFIGURE_ARGS, add…
e335e93 
… doc
@mkoeppe
tox.ini (docker): Pass through HOME to fix use with current macOS Doc…
53d2aab 
…ker Desktop client
@mkoeppe
.ci/write-dockerfile.sh: Fix handling of .gitignore while src/ has no…
754bb9f 
…t been copied in fully
@mkoeppe
.gitignore: Ignore venvs within pkgs/*/
d3f9c60
@mkoeppe
src/sage/misc/package_dir.py: Mark two doctests '# known bug'
614d98a
@mkoeppe
tox.ini (docker): Supply BUILD_TAG to write-dockerfile.sh, for use by…
c2be0e0 
… the default from_docker_tag in docker.yml
@mkoeppe
.ci/write-dockerfile.sh: Check that 'git worktree' works before using…
9ae5c18 
… retrofit-worktree.sh
@mkoeppe
.ci/write-dockerfile.sh (with-targets): Use .ci from /sage; in git-fr…
b16750c 
…ee fallback, re-bootstrap in /sage
@mkoeppe
.ci/retrofit-worktree.sh: Exit earlier if git is not present
fe470b5
@mkoeppe
.ci/retrofit-worktree.sh: Prune old worktree if needed
4c076bb
kwankyu
kwankyu reviewed May 22, 2024
View reviewed changes
@kwankyu
Copy link
Copy Markdown
Collaborator

kwankyu commented May 22, 2024 •
edited
Loading

This PR is mostly about CI maintenance, pertaining to the proposal: https://groups.google.com/g/sage-devel/c/dEa3i2Fn3ZY

As such, I apply "show" model for reviewing this PR (that is, believe the maintainer is doing the right things).

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented May 22, 2024

Thanks!

@vbraun vbraun merged commit 0da8273 into sagemath:develop May 25, 2024
vbraun pushed a commit to vbraun/sage that referenced this pull request May 29, 2024
c0e9f94 
sagemathgh-37988: CI Build&Test: Replace use of `sage -t --new`
    
<!-- ^ 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". -->

Fixes sagemath#37985.

We also turn on  `--long --format github` for this run, so that
annotations are shown in the "Files changed" tab.
(Previously, only the annotations from the full testsuite run were
shown, out of the concern of duplicating the numerous doctest style
warnings. But these warnings have been much reduced, and the last two
warnings are fixed in sagemath#38029.)

Example run: https://github.com/sagemath/sage/actions/runs/9198070834/jo
b/25299950120?pr=37988

### 📝 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.
- [x] 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#37926 (merged here)
    
URL: sagemath#37988
Reported by: Matthias Köppe
Reviewer(s): Kwankyu Lee, Matthias Köppe
vbraun pushed a commit to vbraun/sage that referenced this pull request May 31, 2024
1bc9050 
sagemathgh-37988: CI Build&Test: Replace use of `sage -t --new`
    
<!-- ^ 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". -->

Fixes sagemath#37985.

We also turn on  `--long --format github` for this run, so that
annotations are shown in the "Files changed" tab.
(Previously, only the annotations from the full testsuite run were
shown, out of the concern of duplicating the numerous doctest style
warnings. But these warnings have been much reduced, and the last two
warnings are fixed in sagemath#38029.)

Example run: https://github.com/sagemath/sage/actions/runs/9198070834/jo
b/25299950120?pr=37988

### 📝 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.
- [x] 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#37926 (merged here)
    
URL: sagemath#37988
Reported by: Matthias Köppe
Reviewer(s): Kwankyu Lee, Matthias Köppe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kwankyu kwankyu kwankyu approved these changes

Assignees

@mkoeppe mkoeppe

Labels

c: scripts p: blocker / 1 p: CI fix merged before running CI tests v: small

Projects

None yet

Milestone

sage-10.4

Development

Successfully merging this pull request may close these issues.

4 participants

@mkoeppe @fchapoton @kwankyu @vbraun