Skip to content

Commit

Permalink
Merge branch 'meson-compile' into meson-ci-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasdiez authored Feb 28, 2024
2 parents 4aa1121 + 0d5f088 commit aeeec9c
Show file tree
Hide file tree
Showing 34 changed files with 269 additions and 396 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/ci-meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}

- name: Create conda environment files
run: ./bootstrap-conda

- name: Cache conda packages
uses: actions/cache@v3
with:
Expand All @@ -58,20 +55,14 @@ jobs:
channels: conda-forge
channel-priority: true
activate-environment: sage
environment-file: src/environment-${{ matrix.python }}.yml
environment-file: src/environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && 'macos' || 'linux' }}.yml

- name: Print Conda environment
shell: bash -l {0}
run: |
conda info
conda list
- name: Bootstrap
shell: bash -l {0}
run: python -m sage_setup.autogen.interpreters src/sage/ext/interpreters
env:
PYTHONPATH: src

- name: Build
shell: bash -l {0}
run: |
Expand Down
198 changes: 0 additions & 198 deletions generate-meson.py

This file was deleted.

1 change: 1 addition & 0 deletions grayskull
Submodule grayskull added at 5e74f1
1 change: 1 addition & 0 deletions meson
Submodule meson added at 5fdf7d
2 changes: 1 addition & 1 deletion src/.relint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@
magic doctest comments should appear on the "sage:" line, not "....:" lines
# see optional_regex in src/sage/doctest/parsing.py
# "indirect doctest" is from src/bin/sage-coverage
pattern: '^[ ]*[.][.][.][.]:.*#.*(arb216|arb218|py2|py3|long time|not implemented|not tested|known bug|optional|indirect doctest)'
pattern: '^[ ]*[.][.][.][.]:.*#.*(py2|py3|long time|not implemented|not tested|known bug|optional|indirect doctest)'
6 changes: 0 additions & 6 deletions src/doc/en/installation/meson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ Alternatively, install all build requirements as described in section
``rm src/**/*.so`` or ``for f in src/**/*.so ; do mv "$f" "$f.old"; done``.
Also uninstall the 'old' sage packages with ``pip uninstall sage-conf sage-setup sagemath-standard``.

Generate a few files that are needed for the build process::

```bash
python -m sage_setup.autogen.interpreters src/sage/ext/interpreters
```

To compile and install the project in editable install, just use::
```bash
Expand Down
12 changes: 7 additions & 5 deletions src/environment-3.10-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,11 @@ dependencies:
- libxkbcommon=1.6.0=h5d7e998_0
- matplotlib-inline=0.1.6=pyhd8ed1ab_0
- memory-allocator=0.1.3=py310h2372a71_0
- overrides=7.4.0=pyhd8ed1ab_0
- pexpect=4.8.0=pyh1a96a4e_2
- pillow=10.1.0=py310h01dd4db_0
- pip=23.3.2=pyhd8ed1ab_0
- meson=1.3.2=pyhd8ed1ab_0
- overrides=7.7.0=pyhd8ed1ab_0
- pexpect=4.9.0=pyhd8ed1ab_0
- pillow=10.2.0=py310h01dd4db_0
- pip=24.0=pyhd8ed1ab_0
- pplpy=0.8.9=py310h28f6eb6_0
- primecountpy=0.1.0=py310hd41b1e2_4
- prompt-toolkit=3.0.42=pyha770c72_0
Expand Down Expand Up @@ -400,7 +401,8 @@ dependencies:
- jsonschema-specifications=2023.11.2=pyhd8ed1ab_0
- jupyter_server_terminals=0.5.0=pyhd8ed1ab_0
- liblapacke=3.9.0=20_linux64_openblas
- numpy=1.26.2=py310hb13e2d6_0
- meson-python=0.15.0=pyh0c530f3_0
- numpy=1.26.4=py310hb13e2d6_0
- prompt_toolkit=3.0.42=hd8ed1ab_0
- pyqt5-sip=12.12.2=py310hc6cd4ac_5
- requests=2.31.0=pyhd8ed1ab_0
Expand Down
10 changes: 6 additions & 4 deletions src/environment-3.10-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,10 @@ dependencies:
- liblapack=3.9.0=20_osx64_openblas
- matplotlib-inline=0.1.6=pyhd8ed1ab_0
- memory-allocator=0.1.3=py310h6729b98_0
- overrides=7.4.0=pyhd8ed1ab_0
- pexpect=4.8.0=pyh1a96a4e_2
- pip=23.3.2=pyhd8ed1ab_0
- meson=1.3.2=pyhd8ed1ab_0
- overrides=7.7.0=pyhd8ed1ab_0
- pexpect=4.9.0=pyhd8ed1ab_0
- pip=24.0=pyhd8ed1ab_0
- pplpy=0.8.9=py310hd89f7aa_0
- primecountpy=0.1.0=py310h88cfcbd_4
- prompt-toolkit=3.0.42=pyha770c72_0
Expand Down Expand Up @@ -333,7 +334,8 @@ dependencies:
- jsonschema-specifications=2023.11.2=pyhd8ed1ab_0
- jupyter_server_terminals=0.5.0=pyhd8ed1ab_0
- liblapacke=3.9.0=20_osx64_openblas
- numpy=1.26.2=py310h2a7ecf2_0
- meson-python=0.15.0=pyh0c530f3_0
- numpy=1.26.4=py310h4bfa8fc_0
- pango=1.50.14=h19c1c8a_2
- prompt_toolkit=3.0.42=hd8ed1ab_0
- pyobjc-framework-cocoa=10.1=py310h3674b6a_0
Expand Down
12 changes: 7 additions & 5 deletions src/environment-3.11-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,11 @@ dependencies:
- libxkbcommon=1.6.0=h5d7e998_0
- matplotlib-inline=0.1.6=pyhd8ed1ab_0
- memory-allocator=0.1.3=py311h459d7ec_0
- overrides=7.4.0=pyhd8ed1ab_0
- pexpect=4.8.0=pyh1a96a4e_2
- pillow=10.1.0=py311ha6c5da5_0
- pip=23.3.2=pyhd8ed1ab_0
- meson=1.3.2=pyhd8ed1ab_0
- overrides=7.7.0=pyhd8ed1ab_0
- pexpect=4.9.0=pyhd8ed1ab_0
- pillow=10.2.0=py311ha6c5da5_0
- pip=24.0=pyhd8ed1ab_0
- pplpy=0.8.9=py311h85abca9_0
- primecountpy=0.1.0=py311h9547e67_4
- prompt-toolkit=3.0.42=pyha770c72_0
Expand Down Expand Up @@ -399,7 +400,8 @@ dependencies:
- jsonschema-specifications=2023.11.2=pyhd8ed1ab_0
- jupyter_server_terminals=0.5.0=pyhd8ed1ab_0
- liblapacke=3.9.0=20_linux64_openblas
- numpy=1.26.2=py311h64a7726_0
- meson-python=0.15.0=pyh0c530f3_0
- numpy=1.26.4=py311h64a7726_0
- prompt_toolkit=3.0.42=hd8ed1ab_0
- pyqt5-sip=12.12.2=py311hb755f60_5
- requests=2.31.0=pyhd8ed1ab_0
Expand Down
10 changes: 6 additions & 4 deletions src/environment-3.11-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,10 @@ dependencies:
- liblapack=3.9.0=20_osx64_openblas
- matplotlib-inline=0.1.6=pyhd8ed1ab_0
- memory-allocator=0.1.3=py311h2725bcf_0
- overrides=7.4.0=pyhd8ed1ab_0
- pexpect=4.8.0=pyh1a96a4e_2
- pip=23.3.2=pyhd8ed1ab_0
- meson=1.3.2=pyhd8ed1ab_0
- overrides=7.7.0=pyhd8ed1ab_0
- pexpect=4.9.0=pyhd8ed1ab_0
- pip=24.0=pyhd8ed1ab_0
- pplpy=0.8.9=py311h7355a2a_0
- primecountpy=0.1.0=py311h5fe6e05_4
- prompt-toolkit=3.0.42=pyha770c72_0
Expand Down Expand Up @@ -332,7 +333,8 @@ dependencies:
- jsonschema-specifications=2023.11.2=pyhd8ed1ab_0
- jupyter_server_terminals=0.5.0=pyhd8ed1ab_0
- liblapacke=3.9.0=20_osx64_openblas
- numpy=1.26.2=py311h93c810c_0
- meson-python=0.15.0=pyh0c530f3_0
- numpy=1.26.4=py311hc43a94b_0
- pango=1.50.14=h19c1c8a_2
- prompt_toolkit=3.0.42=hd8ed1ab_0
- pyobjc-framework-cocoa=10.1=py311h9b70068_0
Expand Down
12 changes: 7 additions & 5 deletions src/environment-3.9-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,11 @@ dependencies:
- libxkbcommon=1.6.0=h5d7e998_0
- matplotlib-inline=0.1.6=pyhd8ed1ab_0
- memory-allocator=0.1.3=py39hd1e30aa_0
- overrides=7.4.0=pyhd8ed1ab_0
- pexpect=4.8.0=pyh1a96a4e_2
- pillow=10.1.0=py39had0adad_0
- pip=23.3.2=pyhd8ed1ab_0
- meson=1.3.2=pyhd8ed1ab_0
- overrides=7.7.0=pyhd8ed1ab_0
- pexpect=4.9.0=pyhd8ed1ab_0
- pillow=10.2.0=py39had0adad_0
- pip=24.0=pyhd8ed1ab_0
- pplpy=0.8.9=py39hba3e9e5_0
- primecountpy=0.1.0=py39h7633fee_4
- prompt-toolkit=3.0.42=pyha770c72_0
Expand Down Expand Up @@ -400,7 +401,8 @@ dependencies:
- jsonschema-specifications=2023.11.2=pyhd8ed1ab_0
- jupyter_server_terminals=0.5.0=pyhd8ed1ab_0
- liblapacke=3.9.0=20_linux64_openblas
- numpy=1.26.2=py39h474f0d3_0
- meson-python=0.15.0=pyh0c530f3_0
- numpy=1.26.4=py39h474f0d3_0
- prompt_toolkit=3.0.42=hd8ed1ab_0
- pyqt5-sip=12.12.2=py39h3d6467e_5
- requests=2.31.0=pyhd8ed1ab_0
Expand Down
Loading

0 comments on commit aeeec9c

Please sign in to comment.