Fix more dependencies

Matthias Koeppe · Matthias Koeppe · commit f20cc6bcd3d6 · 2023-05-22T11:05:32.000-07:00
diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies
@@ -1 +1 @@
-$(PYTHON) bliss | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig
+$(PYTHON) bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
diff --git a/build/pkgs/sagemath_coxeter3/dependencies b/build/pkgs/sagemath_coxeter3/dependencies
@@ -1 +1 @@
-$(PYTHON) coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig
+$(PYTHON) coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
diff --git a/build/pkgs/sagemath_meataxe/dependencies b/build/pkgs/sagemath_meataxe/dependencies
@@ -1 +1 @@
-$(PYTHON) meataxe | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig
+$(PYTHON) meataxe | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
diff --git a/build/pkgs/sagemath_sirocco/dependencies b/build/pkgs/sagemath_sirocco/dependencies
@@ -1 +1 @@
-$(PYTHON) sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig
+$(PYTHON) sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
diff --git a/build/pkgs/sagemath_tdlib/dependencies b/build/pkgs/sagemath_tdlib/dependencies
@@ -1 +1 @@
-$(PYTHON) tdlib | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig
+$(PYTHON) tdlib cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4
@@ -3,12 +3,9 @@
 requires = [
     esyscmd(`sage-get-system-packages install-requires-toml \
         setuptools     \
-        wheel          \
         sage_setup     \
         sagemath_environment \
-        sagemath_standard \
         cython         \
-        gmpy2          \
         cysignals      \
                     ')]
 build-backend = "setuptools.build_meta"
diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4
@@ -28,3 +28,6 @@ classifiers =
 [options]
 python_requires = >=3.8, <3.12
 install_requires =
+    esyscmd(`sage-get-system-packages install-requires \
+        cysignals \
+        | sed "2,\$s/^/    /;"')dnl
diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4
@@ -3,12 +3,9 @@
 requires = [
     esyscmd(`sage-get-system-packages install-requires-toml \
         setuptools     \
-        wheel          \
         sage_setup     \
         sagemath_environment \
-        sagemath_standard \
         cython         \
-        gmpy2          \
         cysignals      \
                     ')]
 build-backend = "setuptools.build_meta"
diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4
@@ -3,12 +3,9 @@
 requires = [
     esyscmd(`sage-get-system-packages install-requires-toml \
         setuptools     \
-        wheel          \
         sage_setup     \
         sagemath_environment \
-        sagemath_standard \
         cython         \
-        gmpy2          \
         cysignals      \
                     ')]
 build-backend = "setuptools.build_meta"
diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4
@@ -3,12 +3,9 @@
 requires = [
     esyscmd(`sage-get-system-packages install-requires-toml \
         setuptools     \
-        wheel          \
         sage_setup     \
         sagemath_environment \
-        sagemath_standard \
         cython         \
-        gmpy2          \
         cysignals      \
                     ')]
 build-backend = "setuptools.build_meta"
diff --git a/pkgs/sagemath-tdlib/setup.cfg.m4 b/pkgs/sagemath-tdlib/setup.cfg.m4
@@ -28,3 +28,6 @@ classifiers =
 [options]
 python_requires = >=3.8, <3.12
 install_requires =
+    esyscmd(`sage-get-system-packages install-requires \
+        cysignals \
+        | sed "2,\$s/^/    /;"')dnl

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-$(PYTHON) bliss \| $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig`
	`1`	`+$(PYTHON) bliss cysignals \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-$(PYTHON) coxeter3 \| $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig`
	`1`	`+$(PYTHON) coxeter3 \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-$(PYTHON) meataxe \| $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig`
	`1`	`+$(PYTHON) meataxe \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-$(PYTHON) sirocco cypari cysignals mpfr \| $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig`
	`1`	`+$(PYTHON) sirocco cypari cysignals mpfr \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-$(PYTHON) tdlib \| $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig`
	`1`	`+$(PYTHON) tdlib cysignals \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig`