Merge branch 'pyproject_toml_setuptools' into tox_4

sagemath · Sep 14, 2023 · d4bd789 · d4bd789
2 parents a4a438c + 366725c
commit d4bd789
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/build/pkgs/setuptools_wheel/install-requires.txt b/build/pkgs/setuptools_wheel/install-requires.txt
@@ -1 +1 @@
-# We use this file to mark the package as a Python package
+setuptools >= 65.6
diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_sage_conf
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment

diff --git a/pkgs/sagemath-categories/pyproject.toml.m4 b/pkgs/sagemath-categories/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment

diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython

diff --git a/pkgs/sagemath-environment/pyproject.toml.m4 b/pkgs/sagemath-environment/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_wheel
 ]
 build-backend = "setuptools.build_meta"
diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython

diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython

diff --git a/pkgs/sagemath-objects/pyproject.toml.m4 b/pkgs/sagemath-objects/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment

diff --git a/pkgs/sagemath-repl/pyproject.toml.m4 b/pkgs/sagemath-repl/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_wheel
 ]
 build-backend = "setuptools.build_meta"
diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython

diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_setuptools_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython

diff --git a/src/pyproject.toml.m4 b/src/pyproject.toml.m4
@@ -6,7 +6,7 @@ requires = [
     # https://github.com/pypa/pip/issues/6144
      esyscmd(`sage-get-system-packages install-requires-toml \
         sage_conf      \
-        setuptools     \
+        setuptools_wheel \
         wheel          \
         sage_setup     \
         cypari         \