Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile everything with meson #36524

Merged
merged 283 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
283 commits
Select commit Hold shift + click to select a range
781f001
Merge branch 'rel_import_modules' into meson-compile
tobiasdiez Oct 30, 2023
0152168
Merge branch 'rel_headers' into meson-compile
tobiasdiez Oct 30, 2023
119fcfa
add version to pyproject.toml
tobiasdiez Oct 31, 2023
0760fb2
fix test command in ci
tobiasdiez Oct 31, 2023
573b569
Merge remote-tracking branch 'origin/develop' into meson-compile
tobiasdiez Oct 31, 2023
f25cbfa
add more meson build files
tobiasdiez Oct 31, 2023
eaa267f
Merge remote-tracking branch 'tobiasdiez/rel_import_rings' into meson…
tobiasdiez Oct 31, 2023
5930aff
More meson files
tobiasdiez Oct 31, 2023
e650614
Merge branch 'rel_import_ntl' into meson-compile
tobiasdiez Oct 31, 2023
100a35d
Add interpreters
tobiasdiez Nov 2, 2023
5e28f54
Merge branch 'interpreters_outdir' into meson-compile
tobiasdiez Nov 2, 2023
72799e7
Merge remote-tracking branch 'tobiasdiez/rel_headers' into meson-compile
tobiasdiez Nov 2, 2023
f0acc6d
Merge remote-tracking branch 'mkoeppe/absolute_cimport_sage_graphs' i…
tobiasdiez Nov 2, 2023
dbe7b15
Merge remote-tracking branch 'mkoeppe/absolute_cimport_sage_libs' int…
tobiasdiez Nov 2, 2023
111b145
And another round of meson files
tobiasdiez Nov 2, 2023
c279072
Fix matrix
tobiasdiez Nov 2, 2023
a993e90
Merge remote-tracking branch 'mkoeppe/absolute_cimport_sage_geometry'…
tobiasdiez Nov 2, 2023
8accfbd
Last set of meson files
tobiasdiez Nov 2, 2023
9db105f
Last set of relative imports
tobiasdiez Nov 2, 2023
d3aaee7
cleanup
tobiasdiez Nov 3, 2023
2486d99
fix ci
tobiasdiez Nov 3, 2023
3e5f3c1
Improve symbolic compilation
tobiasdiez Nov 4, 2023
3990cc0
improve docs
tobiasdiez Nov 9, 2023
d8c04cf
git ignore old so files
tobiasdiez Nov 9, 2023
c27aa7b
use dependency to find singular
tobiasdiez Nov 9, 2023
f0cbcfe
remove outdated comment
tobiasdiez Nov 11, 2023
e70b24e
remove gmpxx in symbolic
tobiasdiez Nov 11, 2023
4519e18
fix a few runtime errors
tobiasdiez Nov 11, 2023
f5cc9d6
Merge remote-tracking branch 'tobiasdiez/rel_import_modules' into pr/…
tobiasdiez Nov 12, 2023
e4afb29
Properly compile dynamics
tobiasdiez Nov 12, 2023
c0e6c59
properly compile sat
tobiasdiez Nov 12, 2023
eaa04d4
ci: run tests
tobiasdiez Nov 12, 2023
44d7498
Fix a few runtime errors
tobiasdiez Nov 14, 2023
9d5afd3
Add missing singular dependencies
tobiasdiez Nov 14, 2023
dec2e02
Drop bogus ginac depencency
tobiasdiez Nov 14, 2023
310975e
Fix a few more runtime errors
tobiasdiez Nov 14, 2023
1c1bfa3
Remove dependency on https://github.com/sagemath/sage/pull/36489
tobiasdiez Nov 14, 2023
7727ab1
fix farey compilation
tobiasdiez Nov 14, 2023
8a6d93b
remove duplicate dependency
tobiasdiez Nov 14, 2023
d700f64
Fix farey compilation
tobiasdiez Nov 14, 2023
c60c866
Remove obsolete uncommented code
tobiasdiez Nov 14, 2023
edcdb2a
Try to fix farey header compilation
tobiasdiez Nov 14, 2023
93d9000
try to fix farey compilation in ci
tobiasdiez Nov 14, 2023
903c79b
Another try to fix farey
tobiasdiez Nov 14, 2023
cdc880f
Merge remote-tracking branch 'origin/develop' into pr/tobiasdiez/36524
tobiasdiez Nov 14, 2023
9d689cb
Don't install farey header
tobiasdiez Nov 14, 2023
37a67ab
Fix farey import error
tobiasdiez Nov 14, 2023
3cee517
Merge branch 'develop' into meson-compile
tobiasdiez Nov 15, 2023
395c310
Remove old warning about sage.gaprc
tobiasdiez Nov 16, 2023
b63beef
Fix compilation of interpreters
tobiasdiez Nov 16, 2023
49fa87b
Git-ignore all builddirs
tobiasdiez Nov 16, 2023
82c5f2b
Include static maxima file
tobiasdiez Nov 16, 2023
8453c1c
Readd a few all imports
tobiasdiez Nov 16, 2023
97053a7
Recreate missing init files
tobiasdiez Nov 16, 2023
efe272c
create dependency on generated interpreters
tobiasdiez Nov 16, 2023
17888c9
Readd interpreter generation in ci
tobiasdiez Nov 16, 2023
946ef70
And remove some of the init files again
tobiasdiez Nov 16, 2023
0189df5
Fix interpreters include directory
tobiasdiez Nov 16, 2023
ef0ba56
Fix glpk import error
tobiasdiez Nov 16, 2023
56e1d8d
Fix arb runtime error
tobiasdiez Nov 16, 2023
1199bcd
Add missing init file
tobiasdiez Nov 18, 2023
5759c28
Fix runtime errors due to missing glpk
tobiasdiez Nov 18, 2023
b4988ff
Don't remove init file in interpreters
tobiasdiez Nov 18, 2023
bd9fd26
Fix missing pari dependency
tobiasdiez Nov 19, 2023
592e2f4
cleanup ci
tobiasdiez Nov 19, 2023
4f5b91b
install ext_data
tobiasdiez Nov 19, 2023
7a5c83e
Don't fail fast in ci
tobiasdiez Nov 19, 2023
c00b92f
set env variables correctly
tobiasdiez Nov 19, 2023
b391063
Add a few missing headers
tobiasdiez Nov 19, 2023
b78557d
correctly specify version
tobiasdiez Nov 20, 2023
353b989
Properly set SAGE_SHARE to datadir, and warn if cremona is not installed
tobiasdiez Nov 20, 2023
46dbc4f
Install more headers
tobiasdiez Nov 20, 2023
d328913
Readd init files
tobiasdiez Nov 24, 2023
817c49c
Fix tests
tobiasdiez Nov 24, 2023
b5ffbe6
Fix linter
tobiasdiez Nov 24, 2023
fef4acf
Merge branch 'develop' into init_files
tobiasdiez Dec 6, 2023
41a9f0e
Merge branch 'develop' into meson-compile
tobiasdiez Dec 7, 2023
f001d1a
Merge remote-tracking branch 'upstream/develop' into meson-compile
tobiasdiez Dec 7, 2023
db94088
Merge branch 'meson-compile' of https://github.com/tobiasdiez/sage in…
tobiasdiez Dec 7, 2023
4698e07
update meson files
tobiasdiez Dec 7, 2023
1adecdb
fix bernmm compilation
tobiasdiez Dec 7, 2023
56f3394
fix missing python file
tobiasdiez Dec 7, 2023
c9f9948
fix a few more failing tests by installing necessary files
tobiasdiez Dec 8, 2023
7205317
embed file position into cython docstrings
tobiasdiez Dec 9, 2023
4e5d73e
Merge remote-tracking branch 'tobiasdiez/init_files' into meson-compile
tobiasdiez Dec 9, 2023
7851141
Merge branch 'develop' into init_files
tobiasdiez Dec 10, 2023
e39f031
Merge branch 'develop' into meson-compile
tobiasdiez Dec 10, 2023
f74c257
Merge remote-tracking branch 'origin/develop' into pr/tobiasdiez/36524
tobiasdiez Dec 14, 2023
36a8e75
Fix build error
tobiasdiez Dec 14, 2023
b468af3
cleanup
tobiasdiez Dec 14, 2023
95ed032
Remove explicit file names from docs
tobiasdiez Dec 14, 2023
4280f5d
Merge remote-tracking branch 'upstream/develop' into meson-compile
tobiasdiez Dec 19, 2023
d19ce80
Update meson file of sets
tobiasdiez Dec 19, 2023
192c26b
Revert "Remove old warning about sage.gaprc"
tobiasdiez Dec 19, 2023
88b6edd
fix farey header import
tobiasdiez Dec 19, 2023
cea7fd7
Print more infos during ci
tobiasdiez Dec 19, 2023
d2440c7
Implement gap root discovery in meson
tobiasdiez Dec 19, 2023
88b8b47
Install missing directory
tobiasdiez Dec 19, 2023
9879646
fix failing test
tobiasdiez Dec 19, 2023
2e44f4f
docs: uninstall other sage packages
tobiasdiez Dec 19, 2023
6a5a8da
include missing cython source file
tobiasdiez Dec 19, 2023
1ab5f9e
Install missing file in groups
tobiasdiez Dec 19, 2023
2fe2862
Merge remote-tracking branch 'upstream/develop' into init_files
tobiasdiez Dec 19, 2023
580e14d
Merge branch 'develop' into meson-compile
tobiasdiez Dec 27, 2023
76dfa79
Merge branch 'develop' into init_files
tobiasdiez Dec 27, 2023
7891c11
Remove unused setuptools versioning in pyproject.toml
tobiasdiez Dec 30, 2023
ff68103
Fix bug with Cython source code not appearing in tracebacks
tobiasdiez Dec 30, 2023
8793852
Fix runtime problem with lie algebras
tobiasdiez Dec 30, 2023
f930634
Cleanup meson files
tobiasdiez Dec 30, 2023
866000e
Update documentation
tobiasdiez Dec 30, 2023
dbef9cc
Add meson as an installation option in table of contents
tobiasdiez Dec 30, 2023
1174548
Use ccache action
tobiasdiez Dec 30, 2023
52f0032
Add ccache to project compilers as workaround
tobiasdiez Dec 30, 2023
76c36e3
Remove ccache from conda env
tobiasdiez Dec 30, 2023
ad1b8a7
Update ccache-action to use main branch
tobiasdiez Dec 30, 2023
482dd0d
Explicitly set path to ccache
tobiasdiez Dec 30, 2023
7943da6
Fix ccache-action version
tobiasdiez Dec 30, 2023
e8ae9cf
Update build configuration to force use ccache
tobiasdiez Dec 30, 2023
634512b
Fix reference to section-prereqs in meson.rst
tobiasdiez Dec 31, 2023
1c47bcd
Fix broken link in installation instructions
tobiasdiez Dec 31, 2023
46bc6b4
Fix ccache restore key
tobiasdiez Dec 31, 2023
d823087
Merge branch 'develop' into init_files
tobiasdiez Jan 15, 2024
b4bcaf1
Merge branch 'develop' into meson-compile
tobiasdiez Jan 15, 2024
37e9d49
Update flint meson file
tobiasdiez Jan 16, 2024
4ef94d4
Update test command to use 4 parallel processes
tobiasdiez Jan 16, 2024
0a4c97d
Merge branch 'develop' into meson-compile
tobiasdiez Jan 22, 2024
7ceba8a
Merge branch 'develop' into init_files
tobiasdiez Jan 28, 2024
ae4571d
Merge branch 'develop' into init_files
tobiasdiez Feb 11, 2024
2d0cbe7
Merge branch 'develop' into meson-compile
tobiasdiez Feb 11, 2024
30c7049
Remove gap_packages.py from py.install_sources()
tobiasdiez Feb 11, 2024
0d8b2d7
Add new Python files to various modules
tobiasdiez Feb 11, 2024
dc24eaf
Add order_ideal.py to number_field module
tobiasdiez Feb 13, 2024
dacc419
Delete unused meson files in algebras and combinatorics
tobiasdiez Feb 13, 2024
be36e74
Merge remote-tracking branch 'upstream/develop' into meson-compile
tobiasdiez Feb 15, 2024
6a89c45
Add new files to categories and designs
tobiasdiez Feb 15, 2024
6b14ccb
Remove unnecessary meson_version field from project configuration
tobiasdiez Feb 18, 2024
087df3f
Update install_sources in meson files
tobiasdiez Feb 18, 2024
e866cbc
update cython files
tobiasdiez Feb 19, 2024
bf0c7f7
Refactor matrix build dependencies and add meataxe dependency for mat…
tobiasdiez Feb 19, 2024
911e714
Merge branch 'develop' into init_files
tobiasdiez Feb 19, 2024
57b8a9e
Try to fix doctest on macos
tobiasdiez Feb 22, 2024
b578c77
Update library dependencies handling in meson.build files
tobiasdiez Feb 22, 2024
d2c8520
Revert "Try to fix doctest on macos"
tobiasdiez Feb 23, 2024
f538e1a
Fix exponent overflow bug in RingElement class
tobiasdiez Feb 23, 2024
71396c2
Improve handling of dependencies
tobiasdiez Feb 23, 2024
c4f21dd
Merge branch 'develop' into init_files
tobiasdiez Feb 25, 2024
bae9fb0
Merge branch 'develop' into meson-compile
tobiasdiez Feb 25, 2024
e509b11
Add script for updating Python sources and extension data in meson bu…
tobiasdiez Feb 27, 2024
62bf19f
Remove unnecessary code for finding include path for Cython modules
tobiasdiez Feb 27, 2024
5e7a899
Improve code for generating interpreters
tobiasdiez Feb 27, 2024
d129c03
Update CI workflow to use lock environment file
tobiasdiez Feb 27, 2024
434225c
Remove unnecessary arb include directory in meson.build files
tobiasdiez Feb 27, 2024
3fbe6a3
add meson to conda lock file
tobiasdiez Feb 28, 2024
8d1acf8
Remove unnecessary interpreters include_directories in meson.build files
tobiasdiez Feb 28, 2024
b26b887
Merge branch 'pr/antonio-rojas/37484' into meson-compile
tobiasdiez Feb 28, 2024
e435308
Fix compilation (arb)
tobiasdiez Feb 28, 2024
c83cc2f
try to fix interpreter build
tobiasdiez Feb 28, 2024
a1e41c1
More fun with interpreters
tobiasdiez Feb 28, 2024
0d5f088
Add build directory as include directory for Cython compilation
tobiasdiez Feb 28, 2024
0913750
Merge branch 'develop' into meson-compile
tobiasdiez Mar 5, 2024
765c5b9
Don't run pytest on builddir
tobiasdiez Mar 10, 2024
159d350
Restore --config-settings editable_mode=compat in ci-conda
tobiasdiez Mar 10, 2024
e036436
Cleanup workflow
tobiasdiez Mar 10, 2024
020cb40
Merge remote-tracking branch 'upstream/develop' into init_files
tobiasdiez Mar 10, 2024
0b2d76f
Ignore module-not-measured error during code coverage collection
tobiasdiez Mar 10, 2024
8c21bc5
Remove acidentially commited submodules
tobiasdiez Mar 10, 2024
16d8234
Move compilers to src/meson.build
tobiasdiez Mar 10, 2024
11cb41c
Remove acidentially commited submodules
tobiasdiez Mar 10, 2024
c8e3a18
Merge branch 'init_files' into meson-compile
tobiasdiez Mar 10, 2024
861506a
Fix tests
tobiasdiez Mar 10, 2024
5d62950
Try installing the generated init file to fix cython module name issues
tobiasdiez Mar 10, 2024
757932f
Generate init file for interpreters
tobiasdiez Mar 10, 2024
73c840a
Improve fflas dependency in meson.build
tobiasdiez Mar 10, 2024
3819a6e
Add fallback for gap
tobiasdiez Mar 10, 2024
ee096c9
Add more fallback subprojects
tobiasdiez Mar 10, 2024
614ad77
Merge branch 'develop' into meson-compile
dimpase Mar 25, 2024
a048c2a
Merge branch 'develop' into meson-compile
dimpase Apr 4, 2024
cf571d2
Merge branch 'develop' into meson-compile
tobiasdiez Apr 28, 2024
49dc635
Merge branch 'develop' into meson-compile
dimpase Jun 6, 2024
3b1c99d
Merge branch 'develop' into pr/tobiasdiez/36524
tobiasdiez Sep 27, 2024
e3b9006
update meson files
tobiasdiez Sep 27, 2024
cdc5efb
Autogenerate init files
tobiasdiez Sep 27, 2024
77b279f
specify all build dependencies
tobiasdiez Sep 27, 2024
65c08c1
Fix build
tobiasdiez Sep 27, 2024
d11815a
remove subprojects for now
tobiasdiez Sep 27, 2024
5dfe3a5
fix conda env
tobiasdiez Sep 27, 2024
a8f321b
fix tests
tobiasdiez Sep 27, 2024
01c801f
fix macos ci
tobiasdiez Sep 27, 2024
81dc33d
downgrade meson-python
tobiasdiez Sep 27, 2024
3ff0f36
fix ci
tobiasdiez Sep 27, 2024
366987c
fix jinja error
tobiasdiez Sep 28, 2024
587ed3b
ignore build dir
tobiasdiez Sep 28, 2024
ed10289
clarify build isolation
tobiasdiez Sep 28, 2024
8e34075
fix import
tobiasdiez Sep 28, 2024
734e0fe
run build only on linux for now
tobiasdiez Sep 28, 2024
fd13fd4
remove non-existing pynac dir
tobiasdiez Sep 28, 2024
c942abe
try to fix import
tobiasdiez Sep 28, 2024
ca168d8
fix sage.all import
tobiasdiez Sep 28, 2024
bf97775
fix tests
tobiasdiez Sep 28, 2024
45e8af6
fix autogen iterpreters path
tobiasdiez Sep 28, 2024
b4cd883
fix classic build
tobiasdiez Sep 28, 2024
2a9cd0e
fix import
tobiasdiez Sep 28, 2024
40c9f3d
Revert "fix import"
tobiasdiez Sep 28, 2024
f51e83c
Merge branch 'develop' into meson-compile
tobiasdiez Oct 3, 2024
17e1076
Merge branch 'develop' into meson-compile
dimpase Oct 13, 2024
f30e93b
unignore a meson.build file
dimpase Oct 13, 2024
f157a35
add missing matching.py to the list
dimpase Oct 14, 2024
6035173
add runtime dependencies to pyproject.toml
tobiasdiez Oct 14, 2024
ae996ad
improve numpy dependency discovery
tobiasdiez Oct 14, 2024
e2c1f8b
remove duplicate iml dep
tobiasdiez Oct 14, 2024
a6beefa
remove unused subproject
tobiasdiez Oct 14, 2024
9830859
cleanup subprojects
tobiasdiez Oct 14, 2024
8f72313
check for homfly header
tobiasdiez Oct 14, 2024
c82c1ee
specify default c and cpp std
tobiasdiez Oct 14, 2024
c590f5c
explain how to set include and library path manually
tobiasdiez Oct 14, 2024
bcdcb8a
fix imports in tests
tobiasdiez Oct 14, 2024
cb797be
Revert "improve numpy dependency discovery"
tobiasdiez Oct 14, 2024
1ba15a9
fix pyproject.toml metadata
tobiasdiez Oct 14, 2024
451f405
ignore also build dirs for other python versions
tobiasdiez Oct 14, 2024
f5d64cf
reformat meson files
tobiasdiez Oct 14, 2024
06e4dbe
improve meson update tool
tobiasdiez Oct 14, 2024
e96d54d
fix compilation
tobiasdiez Oct 14, 2024
e78e19b
exclude main files from testing
tobiasdiez Oct 14, 2024
c33134b
exclude symlink from vscode search
tobiasdiez Oct 14, 2024
4048c75
further improvements to flint dpendency handling
tobiasdiez Oct 14, 2024
e6d4f1a
fix test errors due to missing sage_setup
tobiasdiez Oct 14, 2024
3c61736
src/sage/libs/giac/meson.build: build extension only if libgiac is found
orlitzky Oct 14, 2024
0b82587
src/sage/plot/plot3d/meson.build: depend on interpreters
orlitzky Oct 14, 2024
4933a6c
meson.build: add "check: true" for the command that creates __init__.py
orlitzky Oct 14, 2024
8688aec
fix tests
tobiasdiez Oct 15, 2024
2f9a1c5
improve dependency handling by using disabler
tobiasdiez Oct 15, 2024
26f037f
add exception to update-meson helper
tobiasdiez Oct 15, 2024
46f490f
Improve handling of optional dependencies
tobiasdiez Oct 15, 2024
f9ba8d4
fix build
tobiasdiez Oct 15, 2024
43bb980
try to fix doctests of sage_setup
tobiasdiez Oct 15, 2024
45dabec
try with absolute import
tobiasdiez Oct 15, 2024
e57348d
try to add interpreters.internal to sage-setup/pyproject.toml
tobiasdiez Oct 15, 2024
ef630f7
fix more autogen tests
tobiasdiez Oct 15, 2024
43c6952
add -D_XOPEN_SOURCE=600 to the right place
dimpase Oct 15, 2024
233d350
use newer action
dimpase Oct 16, 2024
658b25a
Try to fix interpreters compilation
tobiasdiez Oct 17, 2024
e39a130
improve docs
tobiasdiez Oct 17, 2024
cad2253
Readd D_XOPEN_SOURCE c_arg
tobiasdiez Oct 17, 2024
2297338
Fix wonderful rst syntax (maybe)
tobiasdiez Oct 17, 2024
93be190
fix documentation
tobiasdiez Oct 18, 2024
a980b66
Add more optional tags for database_graphs
tobiasdiez Oct 18, 2024
d912171
properly copy sage.gaprc
tobiasdiez Oct 18, 2024
bc5af68
fix interpreters dependency by specifying generated headers as source
tobiasdiez Oct 18, 2024
7533a4e
Fix installation of sage.gaprc
tobiasdiez Oct 18, 2024
2bf9a09
add all pxd files
tobiasdiez Oct 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions .github/workflows/ci-meson.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Build & Test using Meson

on:
push:
branches:
- master
- develop
pull_request:
workflow_dispatch:
# Allow to run manually

concurrency:
# Cancel previous runs of this workflow for the same branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: Conda (${{ matrix.os }}, Python ${{ matrix.python }})
runs-on: ${{ matrix.os }}-latest

strategy:
fail-fast: false
matrix:
os: [ubuntu]
python: ['3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v4

- name: Merge CI fixes from sagemath/sage
run: |
.ci/merge-fixes.sh
env:
GH_TOKEN: ${{ github.token }}

- name: Cache conda packages
uses: actions/cache@v4
with:
path: ~/conda_pkgs_dir
key:
${{ runner.os }}-conda-${{ hashFiles('src/environment-3.11-linux.yml') }}

- name: Compiler cache
uses: hendrikmuhs/[email protected]
with:
key: ${{ runner.os }}-meson-${{ matrix.python }}

- name: Setup Conda environment
uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python }}
miniforge-version: latest
use-mamba: true
channels: conda-forge
channel-priority: true
activate-environment: sage
environment-file: src/environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml

- name: Print Conda environment
shell: bash -l {0}
run: |
conda info
conda list

- name: Build
shell: bash -l {0}
run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
export CC="ccache $CC"
export CXX="ccache $CXX"
pip install --no-build-isolation --config-settings=builddir=builddir . -v

- name: Test
shell: bash -l {0}
run: |
# We don't install sage_setup, so don't try to test it
rm -R ./src/sage_setup/
./sage -t --all -p4
170 changes: 170 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,12 @@ __pycache__/

# Generated by sage_setup.autogen
/src/sage/ext/interpreters
!/src/sage/ext/interpreters/meson.build

# Generated Cython files
*.so
**/*.so
**/*.so.old
/src/cython_debug
# Most C and C++ files are generated by Cython and should not
# be included in the sdist.
Expand Down Expand Up @@ -299,3 +301,171 @@ src/.coverage/
# git worktree
worktree*
**/worktree*

# Meson build directory
builddir
builddir-*
build-install
build/cp*

# Meson temporary files
src/sage/interfaces/__init__.py
src/sage/crypto/block_cipher/__init__.py
src/sage/crypto/public_key/__init__.py
src/sage/logic/__init__.py
src/sage/parallel/__init__.py
src/sage/dynamics/cellular_automata/__init__.py
src/sage/dynamics/arithmetic_dynamics/__init__.py
src/sage/dynamics/__init__.py
src/sage/dynamics/complex_dynamics/__init__.py
src/sage/knots/__init__.py
src/sage/topology/__init__.py
src/sage/functions/__init__.py
src/sage/manifolds/subsets/__init__.py
src/sage/manifolds/__init__.py
src/sage/manifolds/differentiable/examples/__init__.py
src/sage/manifolds/differentiable/__init__.py
src/sage/coding/source_coding/__init__.py
src/sage/coding/guruswami_sudan/__init__.py
src/sage/coding/__init__.py
src/sage/coding/codecan/__init__.py
src/sage/games/__init__.py
src/sage/quivers/__init__.py
src/sage/schemes/cyclic_covers/__init__.py
src/sage/schemes/plane_conics/__init__.py
src/sage/schemes/curves/__init__.py
src/sage/schemes/plane_quartics/__init__.py
src/sage/schemes/jacobians/__init__.py
src/sage/schemes/toric/sheaf/__init__.py
src/sage/schemes/toric/__init__.py
src/sage/schemes/product_projective/__init__.py
src/sage/schemes/elliptic_curves/__init__.py
src/sage/schemes/riemann_surfaces/__init__.py
src/sage/schemes/hyperelliptic_curves/__init__.py
src/sage/schemes/berkovich/__init__.py
src/sage/schemes/generic/__init__.py
src/sage/schemes/projective/__init__.py
src/sage/schemes/__init__.py
src/sage/schemes/affine/__init__.py
src/sage/modular/hecke/__init__.py
src/sage/modular/pollack_stevens/__init__.py
src/sage/modular/overconvergent/__init__.py
src/sage/modular/modform/__init__.py
src/sage/modular/quasimodform/__init__.py
src/sage/modular/modsym/__init__.py
src/sage/modular/local_comp/__init__.py
src/sage/modular/quatalg/__init__.py
src/sage/modular/ssmod/__init__.py
src/sage/modular/abvar/__init__.py
src/sage/modular/__init__.py
src/sage/modular/btquotients/__init__.py
src/sage/modular/arithgroup/__init__.py
src/sage/modular/modform_hecketriangle/__init__.py
src/sage/combinat/cluster_algebra_quiver/__init__.py
src/sage/combinat/root_system/__init__.py
src/sage/combinat/species/__init__.py
src/sage/combinat/designs/__init__.py
src/sage/combinat/posets/__init__.py
src/sage/combinat/matrices/__init__.py
src/sage/combinat/rigged_configurations/__init__.py
src/sage/combinat/ncsf_qsym/__init__.py
src/sage/combinat/path_tableaux/__init__.py
src/sage/combinat/sf/__init__.py
src/sage/combinat/__init__.py
src/sage/combinat/chas/__init__.py
src/sage/combinat/ncsym/__init__.py
src/sage/combinat/words/__init__.py
src/sage/combinat/crystals/__init__.py
src/sage/tensor/modules/__init__.py
src/sage/tensor/__init__.py
src/sage/groups/matrix_gps/__init__.py
src/sage/groups/semimonomial_transformations/__init__.py
src/sage/groups/perm_gps/partn_ref2/__init__.py
src/sage/groups/perm_gps/partn_ref/__init__.py
src/sage/groups/perm_gps/__init__.py
src/sage/groups/__init__.py
src/sage/groups/affine_gps/__init__.py
src/sage/groups/abelian_gps/__init__.py
src/sage/groups/additive_abelian/__init__.py
src/sage/groups/lie_gps/__init__.py
src/sage/groups/misc_gps/__init__.py
src/sage/symbolic/__init__.py
src/sage/symbolic/integration/__init__.py
src/sage/lfunctions/__init__.py
src/sage/arith/__init__.py
src/sage/ext/__init__.py
src/sage/categories/examples/__init__.py
src/sage/categories/__init__.py
src/sage/modules/fg_pid/__init__.py
src/sage/modules/__init__.py
src/sage/modules/with_basis/__init__.py
src/sage/modules/fp_graded/steenrod/__init__.py
src/sage/modules/fp_graded/__init__.py
src/sage/misc/__init__.py
src/sage/rings/convert/__init__.py
src/sage/rings/invariants/__init__.py
src/sage/rings/finite_rings/__init__.py
src/sage/rings/function_field/__init__.py
src/sage/rings/function_field/drinfeld_modules/__init__.py
src/sage/rings/semirings/__init__.py
src/sage/rings/number_field/__init__.py
src/sage/rings/__init__.py
src/sage/rings/padics/__init__.py
src/sage/rings/valuation/__init__.py
src/sage/rings/asymptotic/__init__.py
src/sage/rings/polynomial/weil/__init__.py
src/sage/rings/polynomial/__init__.py
src/sage/rings/polynomial/padics/__init__.py
src/sage/monoids/__init__.py
src/sage/matrix/__init__.py
src/sage/matroids/__init__.py
src/sage/interacts/__init__.py
src/sage/__init__.py
src/sage/plot/__init__.py
src/sage/plot/plot3d/__init__.py
src/sage/typeset/__init__.py
src/sage/algebras/lie_conformal_algebras/__init__.py
src/sage/algebras/fusion_rings/__init__.py
src/sage/algebras/letterplace/__init__.py
src/sage/algebras/quatalg/__init__.py
src/sage/algebras/steenrod/__init__.py
src/sage/algebras/finite_dimensional_algebras/__init__.py
src/sage/algebras/__init__.py
src/sage/algebras/hecke_algebras/__init__.py
src/sage/algebras/lie_algebras/__init__.py
src/sage/algebras/quantum_groups/__init__.py
src/sage/quadratic_forms/genera/__init__.py
src/sage/quadratic_forms/__init__.py
src/sage/game_theory/__init__.py
src/sage/sandpiles/__init__.py
src/sage/sat/__init__.py
src/sage/homology/__init__.py
src/sage/geometry/riemannian_manifolds/__init__.py
src/sage/geometry/hyperplane_arrangement/__init__.py
src/sage/geometry/triangulation/__init__.py
src/sage/geometry/polyhedron/modules/__init__.py
src/sage/geometry/polyhedron/__init__.py
src/sage/geometry/polyhedron/combinatorial_polyhedron/__init__.py
src/sage/geometry/__init__.py
src/sage/geometry/hyperbolic_space/__init__.py
src/sage/sets/__init__.py
src/sage/probability/__init__.py
src/sage/numerical/backends/__init__.py
src/sage/numerical/__init__.py
src/sage/data_structures/__init__.py
src/sage/graphs/graph_decompositions/__init__.py
src/sage/graphs/generators/__init__.py
src/sage/graphs/__init__.py
src/sage/graphs/base/__init__.py
src/sage/databases/__init__.py
src/sage/stats/hmm/__init__.py
src/sage/stats/__init__.py
src/sage/stats/distributions/__init__.py
src/sage/libs/gap/__init__.py
src/sage/libs/mpfi/__init__.py
src/sage/libs/__init__.py
src/sage/libs/polybori/__init__.py
src/sage/libs/mpfr/__init__.py
src/sage/libs/mpc/__init__.py
src/sage/calculus/transforms/__init__.py
src/sage/calculus/__init__.py
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"pkgs/sage-conf_pypi/sage_root": true,
"pkgs/sage-docbuild/sage_docbuild": true,
"pkgs/sage-setup/sage_setup": true,
"pkgs/sagemath-*/sage": true
"pkgs/sagemath-*/sage": true,
"pkgs/sagemath-*/sage_setup": true
},
"python.testing.pytestEnabled": true,
"python.testing.pytestArgs": [
Expand Down
3 changes: 3 additions & 0 deletions bootstrap-conda
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ echo >&2 $0:$LINENO: generate conda environment files
) > environment-template.yml
(
sed 's/name: sage-build/name: sage/' environment-template.yml
echo " - meson"
echo " - meson-python"
echo " - pytest"
echo " # Additional packages providing all dependencies for the Sage library"
for pkg in $SAGELIB_SYSTEM_PACKAGES; do
echo " - $pkg"
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/sage_setup/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython pkgconfig jinja2 $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN) $(PYTHON)
cython pkgconfig jinja2 $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/internal/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
Loading
Loading