Skip to content

Commit d905cc3

Browse files
author
Matthias Koeppe
committed
Merge remote-tracking branch 'upstream/develop' into t/34949/sage__categories_matrix_structure___replace_imports_from_sage___all_for_namespace_packages
2 parents 25783a4 + 05329f6 commit d905cc3

File tree

536 files changed

+4990
-2552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

536 files changed

+4990
-2552
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/debian
3+
{
4+
"name": "Conda",
5+
"image": "mcr.microsoft.com/vscode/devcontainers/base:0-bullseye",
6+
7+
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
8+
"remoteUser": "vscode",
9+
10+
// Setup conda environment
11+
"onCreateCommand": ".devcontainer/onCreate-conda.sh",
12+
13+
// Install additional features.
14+
"features": {
15+
// For config options, see https://github.com/devcontainers/features/tree/main/src/conda
16+
"ghcr.io/devcontainers/features/conda": {
17+
"version": "latest",
18+
"addCondaForge": "true"
19+
}
20+
},
21+
"customizations": {
22+
"vscode": {
23+
"extensions": [
24+
"guyskk.language-cython",
25+
"ms-python.isort",
26+
"ms-toolsai.jupyter",
27+
"ms-python.vscode-pylance",
28+
"ms-python.pylint",
29+
"ms-python.python",
30+
"lextudio.restructuredtext",
31+
"trond-snekvik.simple-rst"
32+
]
33+
}
34+
}
35+
}

‎.devcontainer/onCreate-conda.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Do not keep running on errors
2+
set -e
3+
4+
# Create conda environment
5+
./bootstrap-conda
6+
conda install mamba -n base -c conda-forge -y
7+
mamba env create --file src/environment-dev.yml || mamba env update --file src/environment-dev.yml
8+
conda init bash
9+
10+
# Build sage
11+
conda run -n sage-dev ./bootstrap
12+
conda run -n sage-dev ./configure --with-python=/opt/conda/envs/sage-dev/bin/python --prefix=/opt/conda/envs/sage-dev
13+
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
14+
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src

‎.devcontainer/portability-updateContent.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# The script assumes that it is run from SAGE_ROOT.
66
#
77
# If "config.log" or "logs" are symlinks (for example, created by 'tox -e local-...',
8-
# or after https://trac.sagemath.org/ticket/33262), they might point outside of
8+
# or after https://github.com/sagemath/sage/issues/33262), they might point outside of
99
# the dev container, so remove them. Likewise for upstream.
1010
for f in config.log logs upstream; do
1111
if [ -L $f ]; then
1212
rm -f $f
1313
fi
1414
done
15-
# If possible (ensured after https://trac.sagemath.org/ticket/33262), keep the
15+
# If possible (ensured after https://github.com/sagemath/sage/issues/33262), keep the
1616
# logs in the container.
1717
if [ ! -d logs ]; then
1818
ln -s /sage/logs logs

‎.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Bug Report
2+
description: Report a bug
3+
title: "<title>"
4+
labels: "t: bug"
5+
body:
6+
- type: checkboxes
7+
attributes:
8+
label: Is there an existing issue for this?
9+
description: Please search to see if an issue already exists for the bug you encountered.
10+
options:
11+
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
12+
required: true
13+
- type: checkboxes
14+
attributes:
15+
label: Did you read the documentation and troubleshoot guide?
16+
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).
17+
options:
18+
- label: I have read the documentation and troubleshoot guide
19+
required: true
20+
- type: textarea
21+
attributes:
22+
label: Environment
23+
description: |
24+
examples:
25+
- **OS**: Ubuntu 20.04
26+
- Sage Version: 9.2
27+
value: |
28+
- **OS**:
29+
- **Sage Version**:
30+
render: markdown
31+
validations:
32+
required: true
33+
- type: textarea
34+
attributes:
35+
label: Steps To Reproduce
36+
description: Steps to reproduce the behavior.
37+
placeholder: |
38+
1. In this environment...
39+
2. With this config...
40+
3. Run '...'
41+
4. See error...
42+
validations:
43+
required: false
44+
- type: textarea
45+
attributes:
46+
label: Expected Behavior
47+
description: A clear and concise description of what you expected to happen.
48+
validations:
49+
required: true
50+
- type: textarea
51+
attributes:
52+
label: Actual Behavior
53+
description: A clear description of what actually happens.
54+
validations:
55+
required: true
56+
- type: textarea
57+
attributes:
58+
label: Additional Information
59+
description: |
60+
Links? References? Anything that will give us more context about the issue you are encountering!
61+
validations:
62+
required: false

‎.github/ISSUE_TEMPLATE/failure_building_from_source.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Failure building from source
2+
description: Use this template when reporting a build failure
3+
title: "<title>"
4+
labels: ['c: build', 't: bug']
5+
assignees: []
6+
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Is there an existing issue for this?
10+
description: Please search to see if an issue already exists for the bug you encountered.
11+
options:
12+
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
13+
required: true
14+
- type: checkboxes
15+
attributes:
16+
label: Did you read the documentation and troubleshoot guide?
17+
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).
18+
options:
19+
- label: I have read the documentation and troubleshoot guide
20+
required: true
21+
- type: textarea
22+
attributes:
23+
label: Environment
24+
description: |
25+
examples:
26+
- **OS**: Ubuntu 20.04
27+
- Sage Version: 9.2
28+
value: |
29+
- **OS**:
30+
- **Sage Version**:
31+
render: markdown
32+
validations:
33+
required: true
34+
- type: textarea
35+
attributes:
36+
label: Steps To Reproduce
37+
description: Steps to reproduce the behavior.
38+
placeholder: |
39+
1. In this environment...
40+
2. With this config...
41+
3. Run '...'
42+
4. See error...
43+
validations:
44+
required: false
45+
- type: textarea
46+
attributes:
47+
label: Config log
48+
description: |
49+
Please attach `config.log`.
50+
Tip: You can attach log files by clicking this area to highlight it and then dragging files in.
51+
validations:
52+
required: true
53+
- type: textarea
54+
attributes:
55+
label: Package logs
56+
description: |
57+
Please attach ̀`logs/pkgs/SPKG.log` for failing packages.
58+
Tip: You can attach log files by clicking this area to highlight it and then dragging files in.
59+
validations:
60+
required: false
61+
- type: textarea
62+
attributes:
63+
label: Additional Information
64+
description: |
65+
Links? References? Anything that will give us more context about the issue you are encountering!
66+
validations:
67+
required: false

‎.github/ISSUE_TEMPLATE/feature_report.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Feature Request
2+
description: Suggest an idea
3+
title: "<title>"
4+
labels: "t: enhancement"
5+
body:
6+
- type: checkboxes
7+
attributes:
8+
label: Is there an existing issue for this?
9+
description: Please search to see if an issue already exists for the bug you encountered.
10+
options:
11+
- label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
12+
required: true
13+
- type: textarea
14+
attributes:
15+
label: Problem Description
16+
description: Please add a clear and concise description of the problem you are seeking to solve with this feature request.
17+
validations:
18+
required: true
19+
- type: textarea
20+
attributes:
21+
label: Proposed Solution
22+
description: Describe the solution you'd like in a clear and concise manner.
23+
validations:
24+
required: true
25+
- type: textarea
26+
attributes:
27+
label: Alternatives Considered
28+
description: A clear and concise description of any alternative solutions or features you've considered.
29+
validations:
30+
required: true
31+
- type: textarea
32+
attributes:
33+
label: Additional Information
34+
description: Add any other context about the problem here.
35+
validations:
36+
required: false

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1-
Thanks for contributing to Sage! Detailed instructions to be added shortly.
1+
<!-- ^^^^^
2+
Please provide a concise, informative and self-explanatory title.
3+
Don't put issue numbers in there, do this in the PR body below.
4+
For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1"
5+
-->
6+
### 📚 Description
7+
8+
<!-- Describe your changes here in detail -->
9+
<!-- Why is this change required? What problem does it solve? -->
10+
<!-- If it resolves an open issue, please link to the issue here. For example "Closes #1337" -->
11+
12+
### 📝 Checklist
13+
14+
<!-- Put an `x` in all the boxes that apply. -->
15+
<!-- If your change requires a documentation PR, please link it appropriately -->
16+
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
17+
18+
- [ ] I have made sure that the title is self-explanatory and the description concisely explains the PR.
19+
- [ ] I have linked an issue or discussion.
20+
- [ ] I have created tests covering the changes.
21+
- [ ] I have updated the documentation accordingly.
22+
23+
### ⌛ Dependencies
24+
<!-- List all open pull requests that this PR logically depends on -->
25+
<!--
26+
- #xyz: short description why this is a dependency
27+
- #abc: ...
28+
-->
229

3-
Please make sure to also have a look at our
4-
[Code Style Conventions](https://doc.sagemath.org/html/en/developer/coding_basics.html).

0 commit comments

Comments
 (0)