Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit c403910

Browse files
tobiasdieztobiasdiez
committed
Merge remote-tracking branch 'origin/public/manifolds/typing' into public/manifold/typing_more
2 parents 79a7003 + 7c18c7f commit c403910

File tree

239 files changed

+91906
-1553
lines changed

Some content is hidden

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

239 files changed

+91906
-1553
lines changed

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ jobs:
1818
- name: Checkout
1919
uses: actions/checkout@v2
2020

21+
- name: Set up node to install pyright
22+
uses: actions/setup-node@v1
23+
with:
24+
node-version: '12'
25+
26+
- name: Install pyright
27+
run: npm install -g pyright
28+
2129
- name: Prepare
2230
run: |
2331
# Reuse built SAGE_LOCAL contained in the Docker image
@@ -27,6 +35,9 @@ jobs:
2735
apt-get install -y git
2836
./sage -python -m pip install coverage
2937
38+
- name: Static code check with pyright
39+
run: pyright
40+
3041
- name: Build
3142
run: make build
3243
env:

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

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
name: Build & Test using Conda
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
push:
7+
tags:
8+
- '*'
9+
branches:
10+
- 'public/build/**-runci'
11+
workflow_dispatch:
12+
# Allow to run manually
13+
14+
concurrency:
15+
# Cancel previous runs of this workflow for the same branch
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
test:
21+
name: Conda
22+
runs-on: ${{ matrix.os }}
23+
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
os: [ubuntu-latest, macos-latest]
28+
python: [3.8, 3.9]
29+
conda-env: [environment, environment-optional]
30+
31+
steps:
32+
- uses: actions/checkout@v2
33+
34+
- name: Check for Miniconda
35+
id: check_conda
36+
run: echo ::set-output name=installed::$CONDA
37+
38+
# Miniconda is installed by default in the ubuntu-latest, however not in the act-image to run it locally
39+
- name: Install Miniconda
40+
if: steps.check_conda.outputs.installed == ''
41+
run: |
42+
wget https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-Linux-x86_64.sh -O ~/miniconda.sh
43+
bash ~/miniconda.sh -b -p $HOME/miniconda
44+
echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
45+
46+
- name: Install bootstrap prerequisites
47+
run: |
48+
export PATH="$(pwd)/build/bin:$PATH"
49+
SYSTEM=$(sage-guess-package-system)
50+
eval $(sage-print-system-package-command $SYSTEM --sudo install $(sage-get-system-packages $SYSTEM _bootstrap))
51+
52+
# Create conda environment file
53+
- name: Bootstrap
54+
run: ./bootstrap
55+
56+
- name: Cache conda packages
57+
uses: actions/cache@v2
58+
with:
59+
path: ~/conda_pkgs_dir
60+
key:
61+
${{ runner.os }}-conda-${{ hashFiles('src/environment.yml') }}
62+
63+
- name: Setup Conda
64+
uses: conda-incubator/setup-miniconda@v2
65+
with:
66+
python-version: ${{ matrix.python }}
67+
mamba-version: "*"
68+
channels: conda-forge,defaults
69+
channel-priority: true
70+
activate-environment: sage-build
71+
environment-file: src/${{ matrix.conda-env }}.yml
72+
73+
- name: Print Conda environment
74+
shell: bash -l {0}
75+
run: |
76+
conda info
77+
conda list
78+
79+
- name: Configure
80+
shell: bash -l {0}
81+
continue-on-error: true
82+
run: |
83+
echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
84+
./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)
85+
echo "::remove-matcher owner=configure-system-package-warning::"
86+
echo "::remove-matcher owner=configure-system-package-error::"
87+
88+
- name: Build
89+
shell: bash -l {0}
90+
run: |
91+
pip install --no-build-isolation -v -v -e pkgs/sage-conf pkgs/sage-setup
92+
pip install --no-build-isolation -v -v -e src
93+
env:
94+
SAGE_NUM_THREADS: 2
95+
96+
- name: Test
97+
shell: bash -l {0}
98+
run: ./sage -t --all -p0
99+
100+
- name: Print logs
101+
run: |
102+
for file in $(find . -type f -name "*.log"); do
103+
echo "::group::$file"
104+
cat "$file"
105+
echo "::endgroup::"
106+
done
107+
if: always()

‎.github/workflows/configure-systempackage-problem-matcher.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "configure-system-package-warning",
5+
"severity": "warning",
6+
"pattern": [
7+
{
8+
"regexp": "((\\S*)\\:(\\s*)(no suitable system package; standard, will be installed as an SPKG))",
9+
"file": 2,
10+
"message": 1,
11+
"kind": "file"
12+
}
13+
]
14+
},
15+
{
16+
"owner": "configure-system-package-error",
17+
"pattern": [
18+
{
19+
"regexp": "((\\S*)\\:(\\s*)(no suitable system package; this is an error))",
20+
"file": 2,
21+
"message": 1,
22+
"kind": "file"
23+
}
24+
]
25+
}
26+
]
27+
}

‎.zenodo.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 9.6.beta5",
5-
"version": "9.6.beta5",
4+
"title": "sagemath/sage: 9.6.beta6",
5+
"version": "9.6.beta6",
66
"upload_type": "software",
7-
"publication_date": "2022-03-12",
7+
"publication_date": "2022-03-27",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/9.6.beta5",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.6.beta6",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.6.beta5, Release Date: 2022-03-12
1+
SageMath version 9.6.beta6, Release Date: 2022-03-27

‎build/pkgs/configure/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=77a0ccf3c86269794e27c972ccc06d456d519d0b
3-
md5=ed8dddf6a1e934b4c6e261d3c1789023
4-
cksum=2861204287
2+
sha1=a0eb0004d52bcf6279753f7afc196124f41a2aec
3+
md5=f23c9203da185c3f6e436dd7e99b45e5
4+
cksum=1232840594

‎build/pkgs/configure/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4eea45940133fa4c8b0ec028495db0aa5ae767ba
1+
f43e375fb59b4b297a3b2b4c3da31f0d4d34adb3

‎build/pkgs/cylp/SPKG.rst‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
cylp: A Python interface for CLP, CBC, and CGL
2+
==============================================
3+
4+
Description
5+
-----------
6+
7+
A Python interface for CLP, CBC, and CGL
8+
9+
License
10+
-------
11+
12+
Eclipse Public License
13+
14+
Upstream Contact
15+
----------------
16+
17+
https://pypi.org/project/cylp/
18+

‎build/pkgs/cylp/checksums.ini‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tarball=cylp-VERSION.tar.gz
2+
sha1=54965f2ae9b914df7817dffd53bc34925a6fadd4
3+
md5=a4f50e6b24a7fcd2e890a9e7e8825437
4+
cksum=4132703858
5+
upstream_url=https://pypi.io/packages/source/c/cylp/cylp-VERSION.tar.gz

‎build/pkgs/cylp/dependencies‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
$(PYTHON) numpy scipy cbc | $(PYTHON_TOOLCHAIN) cython
2+
3+
----------
4+
All lines of this file are ignored except the first.

0 commit comments

Comments
 (0)