Skip to content

Commit 6d7fe91

Browse files
authored
Fix compilation and runtime errors on Fedora 42
1 parent e52e688 commit 6d7fe91

File tree

8 files changed

+13
-8
lines changed

8 files changed

+13
-8
lines changed

.devcontainer/onCreate-meson.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ eval $(build/bin/sage-print-system-package-command $SYSTEM --yes --ignore-missin
1616

1717
# Disable build isolation following the advice of https://mesonbuild.com/meson-python/how-to-guides/editable-installs.html#build-dependencies
1818
# Install build dependencies manually as workaround for https://github.com/astral-sh/uv/issues/1516
19+
uv venv
1920
uv pip install \
2021
meson-python \
2122
"cypari2 >=2.2.1" \
@@ -25,4 +26,4 @@ uv pip install \
2526
memory_allocator \
2627
"numpy >=1.25" \
2728
jinja2
28-
uv sync --frozen --no-build-isolation-package=sagemath
29+
uv sync --frozen --inexact --no-build-isolation-package=sagemath

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
"numpy >=1.25" \
7070
jinja2
7171
72-
uv sync --frozen --no-build-isolation-package=sagemath
72+
uv sync --frozen --inexact --no-build-isolation-package=sagemath
7373
7474
- name: Test
7575
run: |

pyproject.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ dependencies = [
4949
'fpylll >=0.5.9',
5050
'ptyprocess > 0.5',
5151
# TODO: Remove this once the migration to meson is complete
52-
'pkgconfig'
52+
'pkgconfig',
53+
'traitlets',
5354
]
5455
dynamic = ["version"]
5556
license = {text = "GNU General Public License (GPL) v2 or later"}
@@ -205,3 +206,7 @@ ignore = [
205206
"all.py" = [
206207
"F401", # Unused import - these files are by definition collections of imports.
207208
]
209+
210+
[tool.uv]
211+
# Don't use build isolation for sage (it's incompatible with meson-python's editable install)
212+
no-build-isolation-package = ["sagemath"]

src/sage/graphs/graph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9480,7 +9480,7 @@ def bipartite_double(self, extended=False):
94809480
from sage.graphs.weakly_chordal import is_long_hole_free, is_long_antihole_free, is_weakly_chordal
94819481
from sage.graphs.asteroidal_triples import is_asteroidal_triple_free
94829482
chromatic_polynomial = LazyImport('sage.graphs.chrompoly', 'chromatic_polynomial', at_startup=True)
9483-
from sage.graphs.graph_decompositions.rankwidth import rank_decomposition
9483+
rank_decomposition = LazyImport('sage.graphs.graph_decompositions.rankwidth', 'rank_decomposition', at_startup=True)
94849484
from sage.graphs.graph_decompositions.tree_decomposition import treewidth
94859485
from sage.graphs.graph_decompositions.vertex_separation import pathwidth
94869486
from sage.graphs.graph_decompositions.tree_decomposition import treelength

src/sage/libs/ecl.pxd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ cdef extern from "ecl/ecl.h":
8989
# Type predicates returning a C boolean
9090

9191
bint bint_floatp "floatp" (cl_object x)
92-
bint bint_numberp "ecl_numberp" (cl_object x)
9392
bint bint_eql "ecl_eql"(cl_object x, cl_object y)
9493
bint bint_equal "ecl_equal"(cl_object x, cl_object y)
9594
bint bint_equalp "ecl_equalp"(cl_object x, cl_object y)

src/sage/libs/ecl.pyx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ cdef bint bint_symbolp(cl_object obj) noexcept:
3434
# these type predicates are only provided in "cl_*" form, so we wrap them
3535
# with the proper type cast.
3636

37-
cdef bint bint_numberp(cl_object obj) noexcept:
38-
return not(cl_numberp(obj) == ECL_NIL)
3937
cdef bint bint_integerp(cl_object obj) noexcept:
4038
return not(cl_integerp(obj) == ECL_NIL)
4139
cdef bint bint_rationalp(cl_object obj) noexcept:

subprojects/ecl.wrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[wrap-git]
22
url = https://gitlab.com/embeddable-common-lisp/ecl.git
3-
revision = 24.5.10
3+
revision = develop
44
depth = 1
55
patch_directory = ecl

uv.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)