Skip to content

Commit 9dd8a77

Browse files
author
Release Manager
committed
gh-36168: `sage.groups`: Modularization fixes, `# needs`, doctest cosmetics <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> - Part of: #29705 - Cherry-picked from: #35095 <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> - Depends on #36240 (merged here) - Depends on #36263 (merged here) <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36168 Reported by: Matthias Köppe Reviewer(s): David Coudert
2 parents 4f4fbc2 + 02c01f3 commit 9dd8a77

File tree

80 files changed

+2176
-1781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2176
-1781
lines changed

bootstrap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
9898
if test -f "$DIR/requirements.txt" -o -f "$DIR/install-requires.txt"; then
9999
# A Python package
100100
SPKG_TREE_VAR=SAGE_VENV
101-
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions.m4
102-
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4
101+
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packages install-requires ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions.m4
102+
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4
103103
fi
104104
fi
105105
spkg_configures="$spkg_configures
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# We use this file to mark the package as a Python package
1+
setuptools >= 65.6

pkgs/sagemath-bliss/pyproject.toml.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
22
[build-system]
33
# Minimum requirements for the build system to execute.
44
requires = [
5-
SPKG_INSTALL_REQUIRES_setuptools
5+
SPKG_INSTALL_REQUIRES_setuptools_wheel
66
SPKG_INSTALL_REQUIRES_sage_conf
77
SPKG_INSTALL_REQUIRES_sage_setup
88
SPKG_INSTALL_REQUIRES_sagemath_environment

pkgs/sagemath-categories/pyproject.toml.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
22
[build-system]
33
# Minimum requirements for the build system to execute.
44
requires = [
5-
SPKG_INSTALL_REQUIRES_setuptools
5+
SPKG_INSTALL_REQUIRES_setuptools_wheel
66
SPKG_INSTALL_REQUIRES_wheel
77
SPKG_INSTALL_REQUIRES_sage_setup
88
SPKG_INSTALL_REQUIRES_sagemath_environment

pkgs/sagemath-coxeter3/pyproject.toml.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
22
[build-system]
33
# Minimum requirements for the build system to execute.
44
requires = [
5-
SPKG_INSTALL_REQUIRES_setuptools
5+
SPKG_INSTALL_REQUIRES_setuptools_wheel
66
SPKG_INSTALL_REQUIRES_sage_setup
77
SPKG_INSTALL_REQUIRES_sagemath_environment
88
SPKG_INSTALL_REQUIRES_cython

pkgs/sagemath-environment/pyproject.toml.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
22
[build-system]
33
# Minimum requirements for the build system to execute.
44
requires = [
5-
SPKG_INSTALL_REQUIRES_setuptools
5+
SPKG_INSTALL_REQUIRES_setuptools_wheel
66
SPKG_INSTALL_REQUIRES_wheel
77
]
88
build-backend = "setuptools.build_meta"

pkgs/sagemath-mcqd/pyproject.toml.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
22
[build-system]
33
# Minimum requirements for the build system to execute.
44
requires = [
5-
SPKG_INSTALL_REQUIRES_setuptools
5+
SPKG_INSTALL_REQUIRES_setuptools_wheel
66
SPKG_INSTALL_REQUIRES_sage_setup
77
SPKG_INSTALL_REQUIRES_sagemath_environment
88
SPKG_INSTALL_REQUIRES_cython

pkgs/sagemath-meataxe/pyproject.toml.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
22
[build-system]
33
# Minimum requirements for the build system to execute.
44
requires = [
5-
SPKG_INSTALL_REQUIRES_setuptools
5+
SPKG_INSTALL_REQUIRES_setuptools_wheel
66
SPKG_INSTALL_REQUIRES_sage_setup
77
SPKG_INSTALL_REQUIRES_sagemath_environment
88
SPKG_INSTALL_REQUIRES_cython

pkgs/sagemath-objects/pyproject.toml.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
22
[build-system]
33
# Minimum requirements for the build system to execute.
44
requires = [
5-
SPKG_INSTALL_REQUIRES_setuptools
5+
SPKG_INSTALL_REQUIRES_setuptools_wheel
66
SPKG_INSTALL_REQUIRES_wheel
77
SPKG_INSTALL_REQUIRES_sage_setup
88
SPKG_INSTALL_REQUIRES_sagemath_environment

pkgs/sagemath-repl/pyproject.toml.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
22
[build-system]
33
# Minimum requirements for the build system to execute.
44
requires = [
5-
SPKG_INSTALL_REQUIRES_setuptools
5+
SPKG_INSTALL_REQUIRES_setuptools_wheel
66
SPKG_INSTALL_REQUIRES_wheel
77
]
88
build-backend = "setuptools.build_meta"

0 commit comments

Comments
 (0)