Skip to content

Commit 3a51d8c

Browse files
author
Release Manager
committed
gh-35661: New modularized distributions sagemath-{sirocco,bliss,meataxe,mcqd,coxeter3,tdlib} <!-- Please provide a concise, informative and self-explanatory title. --> <!-- Don't put issue numbers in the title. Put it in the Description below. --> <!-- For example, instead of "Fixes #12345", use "Add a new method to multiply two integers" --> ### 📚 Description <!-- Describe your changes here in detail. --> <!-- Why is this change required? What problem does it solve? --> As reported by @kiwifb in https://groups.google.com/g/sage- release/c/BdHjadsnYUc/m/Qb1SVmn4AAAJ, the sagemath-standard-10.0 distribution does not include the file `src/sage/graphs/bliss.pyx`. We create separate distributions that ship the missing files: - https://pypi.org/project/sagemath-tdlib/10.0/ - https://pypi.org/project/sagemath-meataxe/10.0/ - https://pypi.org/project/sagemath-coxeter3/10.0/ - https://pypi.org/project/sagemath-bliss/10.0/ - https://pypi.org/project/sagemath-mcqd/10.0/ - https://pypi.org/project/sagemath-sirocco/10.0/ <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> - Resolves #34346 <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x ]`. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [x] 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: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #35661 Reported by: Matthias Köppe Reviewer(s): François Bissey
2 parents 1436ea2 + 9bb15bc commit 3a51d8c

File tree

145 files changed

+1313
-15
lines changed

Some content is hidden

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

145 files changed

+1313
-15
lines changed

.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,32 @@ build/bin/sage-build-env-config
176176
/pkgs/*/.tox
177177

178178
/pkgs/sagemath-objects/setup.cfg
179+
/pkgs/sagemath-bliss/setup.cfg
180+
/pkgs/sagemath-coxeter3/setup.cfg
181+
/pkgs/sagemath-mcqd/setup.cfg
182+
/pkgs/sagemath-meataxe/setup.cfg
183+
/pkgs/sagemath-sirocco/setup.cfg
184+
/pkgs/sagemath-tdlib/setup.cfg
179185
/pkgs/sagemath-categories/setup.cfg
180186
/pkgs/sagemath-environment/setup.cfg
181187
/pkgs/sagemath-repl/setup.cfg
182188
/pkgs/sagemath-objects/pyproject.toml
189+
/pkgs/sagemath-bliss/pyproject.toml
190+
/pkgs/sagemath-coxeter3/pyproject.toml
191+
/pkgs/sagemath-mcqd/pyproject.toml
192+
/pkgs/sagemath-meataxe/pyproject.toml
193+
/pkgs/sagemath-sirocco/pyproject.toml
194+
/pkgs/sagemath-tdlib/pyproject.toml
183195
/pkgs/sagemath-categories/pyproject.toml
184196
/pkgs/sagemath-environment/pyproject.toml
185197
/pkgs/sagemath-repl/pyproject.toml
186198
/pkgs/sagemath-objects/requirements.txt
199+
/pkgs/sagemath-bliss/requirements.txt
200+
/pkgs/sagemath-coxeter3/requirements.txt
201+
/pkgs/sagemath-mcqd/requirements.txt
202+
/pkgs/sagemath-meataxe/requirements.txt
203+
/pkgs/sagemath-sirocco/requirements.txt
204+
/pkgs/sagemath-tdlib/requirements.txt
187205
/pkgs/sagemath-categories/requirements.txt
188206
/pkgs/sagemath-environment/requirements.txt
189207
/pkgs/sagemath-repl/requirements.txt

README.md

Lines changed: 1 addition & 1 deletion

build/make/Makefile.in

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,13 @@ PYPI_WHEEL_PACKAGES = \
135135
sagemath_environment \
136136
sagemath_objects \
137137
sagemath_repl \
138-
sagemath_categories
138+
sagemath_categories \
139+
sagemath_bliss \
140+
sagemath_mcqd \
141+
sagemath_tdlib \
142+
sagemath_coxeter3 \
143+
sagemath_sirocco \
144+
sagemath_meataxe
139145

140146
# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
141147
WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) \

build/pkgs/bliss/distros/gentoo.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sci-libs/bliss
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagelib ~= 10.1b7
2+
sagemath-standard ~= 10.1b7

build/pkgs/sagelib/spkg-install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ unset SAGE_PKG_CONFIG_PATH
5555

5656
SITEPACKAGESDIR=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
5757

58+
export SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS=""
59+
5860
if [ "$SAGE_EDITABLE" = yes ]; then
5961
# In an incremental build, we may need to uninstall old versions installed by distutils
6062
# under the old distribution name "sage" (before #30912, which switched to setuptools
@@ -79,6 +81,7 @@ else
7981
# Compiling sage/interfaces/sagespawn.pyx because it depends on /private/var/folders/38/wnh4gf1552g_crsjnv2vmmww0000gp/T/pip-build-env-609n5985/overlay/lib/python3.10/site-packages/Cython/Includes/posix/unistd.pxd
8082
time sdh_pip_install --no-build-isolation .
8183
else
84+
SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS+="mcqd,tdlib,coxeter3,sirocco,meataxe,bliss"
8285
time python3 -u setup.py --no-user-cfg build install || exit 1
8386
fi
8487
fi

build/pkgs/sagemath_bliss/SPKG.rst

Lines changed: 1 addition & 0 deletions

build/pkgs/sagemath_bliss/bootstrap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../sagelib/bootstrap
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$(PYTHON) bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sage_conf sagemath_environment cython pkgconfig
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sagemath-bliss

0 commit comments

Comments
 (0)