Skip to content

Commit

Permalink
Merge branch 'develop' into typing_charts
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasdiez authored Sep 29, 2023
2 parents 71bdece + 1cf0c13 commit c930dca
Show file tree
Hide file tree
Showing 4,066 changed files with 174,901 additions and 204,329 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
36 changes: 36 additions & 0 deletions .ci/merge-fixes.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/bin/sh
# Merge open PRs from sagemath/sage labeled "blocker".
REPO="sagemath/sage"
GH="gh -R $REPO"
PRs="$($GH pr list --label "p: blocker / 1" --json number --jq '.[].number')"
if [ -z "$PRs" ]; then
echo 'Nothing to do: Found no open PRs with "blocker" status.'
else
echo "Found PRs: " $PRs
export GIT_AUTHOR_NAME="ci-sage workflow"
export GIT_AUTHOR_EMAIL="ci-sage@example.com"
export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
git tag -f test_base
git commit -q -m "Uncommitted changes" --no-allow-empty -a
for a in $PRs; do
echo "::group::Merging PR https://github.com/$REPO/pull/$a"
git tag -f test_head
$GH pr checkout -b pr-$a $a
git fetch --unshallow --all
git checkout -q test_head
if git merge --no-edit --squash -q pr-$a; then
echo "::endgroup::"
if git commit -q -m "Merge https://github.com/$REPO/pull/$a" -a --no-allow-empty; then
echo "Merged #$a"
else
echo "Empty, skipped"
fi
else
echo "::endgroup::"
echo "Failure merging #$a, resetting"
git reset --hard
fi
done
git log test_base..HEAD
fi
19 changes: 19 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# https://docs.codecov.com/docs/pull-request-comments#disable-comment
comment: false
# https://docs.codecov.com/docs/codecovyml-reference#codecov
codecov:
require_ci_to_pass: false
# https://docs.codecov.com/docs/commit-status
coverage:
status:
project:
default:
target: auto
threshold: 0%
base: auto
informational: true
patch:
default:
target: auto
threshold: 0%
base: auto
2 changes: 1 addition & 1 deletion .devcontainer/portability-Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ ARG SYSTEM_FACTOR="ubuntu-jammy"
ARG PACKAGE_FACTOR="standard"
ARG DOCKER_TARGET="with-system-packages"
ARG DOCKER_TAG="dev"
FROM ghcr.io/sagemath/sage/sage-docker-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}
FROM ghcr.io/sagemath/sage/sage-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}
49 changes: 24 additions & 25 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,11 @@ description: Report a bug
title: "<title>"
labels: "t: bug"
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
required: true
- type: checkboxes
attributes:
label: Did you read the documentation and troubleshoot guide?
description: Please read [README.md](https://github.com/sagemath/sage/blob/develop/README.md) and [the Troubleshooting section in the Installation Guide](https://doc.sagemath.org/html/en/installation/troubles.html).
options:
- label: I have read the documentation and troubleshoot guide
required: true
- type: textarea
- type: markdown
attributes:
label: Environment
description: |
examples:
- **OS**: Ubuntu 20.04
- Sage Version: 9.2
value: |
- **OS**:
- **Sage Version**:
render: markdown
validations:
required: true
* Please search to see if an issue already exists for the bug you encountered.
* Please read [README.md](https://github.com/sagemath/sage/blob/develop/README.md) and [the Troubleshooting section in the Installation Guide](https://doc.sagemath.org/html/en/installation/troubles.html).
- type: textarea
attributes:
label: Steps To Reproduce
Expand Down Expand Up @@ -60,3 +38,24 @@ body:
Links? References? Anything that will give us more context about the issue you are encountering!
validations:
required: false
- type: textarea
attributes:
label: Environment
description: |
examples:
- **OS**: Ubuntu 20.04
- Sage Version: 9.2
value: |
- **OS**:
- **Sage Version**:
render: markdown
validations:
required: true
- type: checkboxes
attributes:
label: Checklist
options:
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
required: true
- label: I have read the documentation and troubleshoot guide
required: true
25 changes: 12 additions & 13 deletions .github/ISSUE_TEMPLATE/failure_building_from_source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,11 @@ title: "<title>"
labels: ['c: build', 't: bug']
assignees: []
body:
- type: checkboxes
- type: markdown
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
required: true
- type: checkboxes
attributes:
label: Did you read the documentation and troubleshoot guide?
description: Please read [README.md](https://github.com/sagemath/sage/blob/develop/README.md) and [the Troubleshooting sectionin the Installation Guide](https://doc.sagemath.org/html/en/installation/troubles.html).
options:
- label: I have read the documentation and troubleshoot guide
required: true
value: |
* Please search to see if an issue already exists for the bug you encountered.
* Please read [README.md](https://github.com/sagemath/sage/blob/develop/README.md) and [the Troubleshooting section in the Installation Guide](https://doc.sagemath.org/html/en/installation/troubles.html).
- type: textarea
attributes:
label: Environment
Expand Down Expand Up @@ -65,3 +56,11 @@ body:
Links? References? Anything that will give us more context about the issue you are encountering!
validations:
required: false
- type: checkboxes
attributes:
label: Checklist
options:
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
required: true
- label: I have read the documentation and troubleshoot guide
required: true
15 changes: 9 additions & 6 deletions .github/ISSUE_TEMPLATE/feature_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ description: Suggest an idea
title: "<title>"
labels: "t: enhancement"
body:
- type: checkboxes
- type: markdown
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
required: true
value: |
* Please search to see if an issue already exists for the bug you encountered.
- type: textarea
attributes:
label: Problem Description
Expand All @@ -34,3 +31,9 @@ body:
description: Add any other context about the problem here.
validations:
required: false
- type: checkboxes
attributes:
label: Is there an existing issue for this?
options:
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
required: true
25 changes: 14 additions & 11 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,30 @@ 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 #1234" use "Introduce new method to calculate 1+1"
-->
### 📚 Description

<!-- Describe your changes here in detail -->

<!-- Why is this change required? What problem does it solve? -->
<!-- If it resolves an open issue, please link to the issue here. For example "Closes #1337" -->
<!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". -->
<!-- If your change requires a documentation PR, please link it appropriately. -->

### 📝 Checklist
### :memo: 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. -->

- [ ] I have made sure that the title is self-explanatory and the description concisely explains the PR.
- [ ] I have linked an issue or discussion.
- [ ] 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 pull requests that this PR logically depends on -->
<!--
- #xyz: short description why this is a dependency
- #abc: ...
### :hourglass: Dependencies

<!-- List all open PRs that this PR logically depends on
- #12345: short description why this is a dependency
- #34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
Loading

0 comments on commit c930dca

Please sign in to comment.