Skip to content

Commit ebcf29c

Browse files
tscrimtscrim
authored
Merge branch 'develop' into public/combinat/symmetry_classes_plane_partitions-28244
2 parents 9ff10da + 82e02a1 commit ebcf29c

File tree

1,153 files changed

+20865
-95270
lines changed

Some content is hidden

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

1,153 files changed

+20865
-95270
lines changed

‎.codecov.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# https://docs.codecov.com/docs/pull-request-comments#disable-comment
2+
comment: false
3+
# https://docs.codecov.com/docs/commit-status
4+
coverage:
5+
status:
6+
project:
7+
default:
8+
target: auto
9+
threshold: 0%
10+
base: auto
11+
patch:
12+
default:
13+
target: auto
14+
threshold: 0%
15+
base: auto

‎.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-Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ ARG SYSTEM_FACTOR="ubuntu-jammy"
55
ARG PACKAGE_FACTOR="standard"
66
ARG DOCKER_TARGET="with-system-packages"
77
ARG DOCKER_TAG="dev"
8-
FROM ghcr.io/sagemath/sage/sage-docker-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}
8+
FROM ghcr.io/sagemath/sage/sage-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}

‎.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/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
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
1+
<!-- Please provide a concise, informative and self-explanatory title. -->
2+
<!-- Don't put issue numbers in the title. Put it in the Description below. -->
3+
<!-- For example, instead of "Fixes #12345", use "Add a new method to multiply two integers" -->
4+
5+
### :books: Description
76

8-
<!-- Describe your changes here in detail -->
7+
<!-- Describe your changes here in detail. -->
98
<!-- 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" -->
9+
<!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". -->
10+
<!-- If your change requires a documentation PR, please link it appropriately. -->
1111

12-
### 📝 Checklist
12+
### :memo: Checklist
1313

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! -->
14+
<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x ]`. -->
1715

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.
16+
- [ ] The title is concise, informative, and self-explanatory.
17+
- [ ] The description explains in detail what this PR is about.
18+
- [ ] I have linked a relevant issue or discussion.
2019
- [ ] I have created tests covering the changes.
2120
- [ ] I have updated the documentation accordingly.
2221

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: ...
22+
### :hourglass: Dependencies
23+
24+
<!-- List all open PRs that this PR logically depends on
25+
- #12345: short description why this is a dependency
26+
- #34567: ...
2827
-->
2928

29+
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Documentation for all configuration options:
2+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
# Maintain dependencies for GitHub Actions
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ jobs:
103103
104104
- name: Upload coverage to codecov
105105
if: always() && steps.build.outcome == 'success'
106-
uses: codecov/codecov-action@v2
106+
uses: codecov/codecov-action@v3
107107
with:
108108
files: ./coverage.xml

‎.github/workflows/ci-conda.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ubuntu-latest, macos-latest]
26-
python: [3.8, 3.9]
26+
python: ['3.9', '3.10', '3.11']
2727
conda-env: [environment, environment-optional]
2828

2929
steps:
@@ -41,11 +41,18 @@ jobs:
4141
bash ~/miniconda.sh -b -p $HOME/miniconda
4242
echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
4343
44+
# Workaround for https://github.com/actions/runner-images/issues/6910 / https://github.com/conda/conda/issues/12303
45+
- name: Downgrade conda
46+
if: matrix.os == 'ubuntu-latest'
47+
run: |
48+
conda config --set allow_conda_downgrades true
49+
conda install conda=4.12.0 -y
50+
4451
- name: Create conda environment files
4552
run: ./bootstrap-conda
4653

4754
- name: Cache conda packages
48-
uses: actions/cache@v2
55+
uses: actions/cache@v3
4956
with:
5057
path: ~/conda_pkgs_dir
5158
key:

‎.github/workflows/ci-macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
matrix:
3939
stage: ["1", "2", "2-optional-0-o", "2-optional-p-z", "2-experimental-0-o", "2-experimental-p-z"]
4040
# python3_xcode is only accepted if enough packages are available from the system
41-
# --> to test "minimal", we would need https://trac.sagemath.org/ticket/30949
41+
# --> to test "minimal", we would need https://github.com/sagemath/sage/issues/30949
4242
tox_env: [homebrew-macos-usrlocal-minimal, homebrew-macos-usrlocal-standard, homebrew-macos-usrlocal-maximal, homebrew-macos-usrlocal-python3_xcode-standard, conda-forge-macos-minimal, conda-forge-macos-standard, conda-forge-macos-maximal]
4343
xcode_version_factor: [default]
4444
os: [ macos-11, macos-12 ]

0 commit comments

Comments
 (0)