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.

Sign up for GitHub

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

Use meson in sage-the-distro #39030

Draft
wants to merge 41 commits into
base: develop
Choose a base branch
from
Draft

Use meson in sage-the-distro #39030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4c2c379
Use meson project for building sagelib
tobiasdiez Nov 25, 2024
bceddbe
Remove unneeded sagemath-standard package
tobiasdiez Nov 25, 2024
0d8ab45
Remove old build infrastructure
tobiasdiez Nov 25, 2024
30ff9fc
Remove old conda tests
tobiasdiez Nov 25, 2024
4d48bdb
Cleanup
tobiasdiez Nov 25, 2024
fd2320f
Fix dockerfile
tobiasdiez Nov 25, 2024
5240382
more cleanup
tobiasdiez Nov 25, 2024
b49286c
Fix reference to src/VERSION.txt
tobiasdiez Nov 25, 2024
b38b6a6
Use meson as backend for numpy.f2py
tobiasdiez Oct 29, 2024
9ac4650
Add dependency groups to `pyproject.toml`
tobiasdiez Nov 26, 2024
28583a3
Replace bootstrap-conda by grayskull and update conda lock files
tobiasdiez Nov 17, 2024
7d2a7f7
Add toml as requirement to running the `update-conda` script
tobiasdiez Nov 26, 2024
ab65ab1
Add prerequisites for bootstrap/configure to conda lock files
tobiasdiez Nov 26, 2024
f8b1d44
Downgrade macos again
tobiasdiez Nov 26, 2024
706af72
Manually add expat to conda lock files
tobiasdiez Nov 29, 2024
6a498f7
Add fortran compiler as host requirement
tobiasdiez Nov 29, 2024
397b0a6
Merge remote-tracking branch 'upstream/develop' into distro-meson
tobiasdiez Dec 1, 2024
ae33069
Fix version symlink
tobiasdiez Dec 1, 2024
ccd2770
fix symlinks to VERSION.txt
dimpase Dec 2, 2024
1ee3178
fix versions of build/pkgs/sagemath_* and build/pkgs/sage_*
dimpase Dec 2, 2024
b410321
cd to the correct place
dimpase Dec 2, 2024
e2aec7c
Fix relative includes
tobiasdiez Dec 2, 2024
25f7f28
Merge remote-tracking branch 'origin/conda-grayskull' into distro-meson
tobiasdiez Dec 2, 2024
8e6f51b
Fix symlinks
tobiasdiez Dec 2, 2024
fd88b98
Fix typo
tobiasdiez Dec 2, 2024
a01d26c
fix another typo
tobiasdiez Dec 2, 2024
82dd731
made symlinks correct (on Linux) again
dimpase Dec 2, 2024
b382584
fix indentation
dimpase Dec 2, 2024
e9bb4b8
remove a stray (?) `cd ..`
dimpase Dec 2, 2024
7a24b8d
Replace inc_numpy by numpy dependency in meson
tobiasdiez Dec 3, 2024
c828f6c
Merge branch 'distro-meson' of https://github.com/tobiasdiez/sage int…
tobiasdiez Dec 3, 2024
19aa397
Fix numpy typo
tobiasdiez Dec 4, 2024
d7004e7
Merge remote-tracking branch 'upstream/develop' into distro-meson
tobiasdiez Dec 4, 2024
56f95c9
Fix coyping of src in conftest
tobiasdiez Dec 6, 2024
48c8b4a
allow ./sage to start; also, fix old error message
dimpase Dec 8, 2024
cf2be9d
fixing cythonisation in doctests
dimpase Dec 9, 2024
72f62eb
Merge remote-tracking branch 'origin/develop' into distro-meson-unreb…
dimpase Dec 10, 2024
4a3fb3c
don't ADD removed files
dimpase Dec 10, 2024
e1167ee
remove no longer relevant test
dimpase Dec 13, 2024
058b8b5
wrong tags for combinat/designs
dimpase Dec 14, 2024
e436289
Merge remote-tracking branch 'upstream/develop' into distro-meson
tobiasdiez Dec 16, 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
Prev Previous commit
Next Next commit
made symlinks correct (on Linux) again
  • Loading branch information
@dimpase
dimpase committed Dec 2, 2024
commit 82dd73170eed879f1503fd6ffdb2b4369917a068
2 changes: 1 addition & 1 deletion build/pkgs/sage_docbuild/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
1 change: 0 additions & 1 deletion build/pkgs/sage_numerical_backends_coin/package-version.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/pkgs/sage_numerical_backends_coin/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../VERSION.txt
1 change: 0 additions & 1 deletion build/pkgs/sage_numerical_backends_cplex/package-version.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/pkgs/sage_numerical_backends_cplex/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../VERSION.txt
1 change: 0 additions & 1 deletion build/pkgs/sage_numerical_backends_gurobi/package-version.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/pkgs/sage_numerical_backends_gurobi/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sage_setup/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sage_sws2rst/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_bliss/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_categories/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_coxeter3/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_environment/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_mcqd/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_meataxe/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_objects/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_repl/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_sirocco/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_tdlib/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../VERSION.txt
../../../VERSION.txt
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ AS_IF([test "x$enable_download_from_upstream_url" = "xyes"], [
])
AC_SUBST([SAGE_SPKG_OPTIONS])

AC_ARG_ENABLE([sagelib],
AC_ARG_ENABLE([sage_conf],
AS_HELP_STRING([--disable-sage_conf],
[disable build of the sage_conf package]), [
for pkg in sage_conf; do
Expand Down