Skip to content

Commit 0b5fc8e

Browse files
author
Release Manager
committed
gh-36276: Yet more spkg_configure for standard python packages This is a continuation of #36256 - Fixes #36301 - Fixes https://groups.google.com/g/sage- release/c/1wOBmhvNJqc/m/Jk14VAbjBAAJ (hence marked critical) ### 📝 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. - [x] 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 - #36296: to use an up to date Sphinx - #36267: updated ipympl, etc Also, a Jupyter/Python issue was uncovered there, which might need work. URL: #36276 Reported by: Dima Pasechnik Reviewer(s): Matthias Köppe, Michael Orlitzky
2 parents ed478e7 + 180e814 commit 0b5fc8e

Some content is hidden

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

79 files changed

+130
-7
lines changed

‎.github/workflows/ci-linux-incremental.yml

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ jobs:
6060
echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
6161
echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([-_.a-z0-9]*)/[^ ]* *,\2-ensure,;'; done | sort -u))" >> $GITHUB_OUTPUT
6262
cat $GITHUB_OUTPUT
63-
minimal:
63+
64+
test:
6465
needs: [changed_files]
6566
if: |
6667
github.event_name != 'pull_request' ||
@@ -94,3 +95,38 @@ jobs:
9495
["standard",
9596
"minimal"]
9697
docker_push_repository: ghcr.io/${{ github.repository }}/
98+
99+
site:
100+
needs: [changed_files]
101+
if: |
102+
github.event_name != 'pull_request' ||
103+
((github.event.action != 'labeled' &&
104+
(contains(github.event.pull_request.labels.*.name, 'c: packages: standard') ||
105+
contains(github.event.pull_request.labels.*.name, 'c: packages: optional'))) ||
106+
(github.event.action == 'labeled' &&
107+
(github.event.label.name == 'c: packages: optional' ||
108+
github.event.label.name == 'c: packages: standard')))
109+
uses: ./.github/workflows/docker.yml
110+
with:
111+
# Build incrementally from published Docker image
112+
incremental: true
113+
free_disk_space: true
114+
from_docker_repository: ghcr.io/sagemath/sage/
115+
from_docker_target: "with-targets"
116+
from_docker_tag: "dev"
117+
docker_targets: "with-targets"
118+
targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
119+
# Only test systems with a usable system python (>= 3.9)
120+
tox_system_factors: >-
121+
["ubuntu-jammy",
122+
"ubuntu-mantic",
123+
"debian-bullseye",
124+
"debian-bookworm",
125+
"fedora-33",
126+
"fedora-38",
127+
"gentoo-python3.11",
128+
"archlinux",
129+
"debian-bullseye-i386"]
130+
tox_packages_factors: >-
131+
["standard-sitepackages"]
132+
docker_push_repository: ghcr.io/${{ github.repository }}/

‎build/pkgs/beautifulsoup4/distros/alpine.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
py3-beautifulsoup4

‎build/pkgs/beautifulsoup4/distros/arch.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python-beautifulsoup4

‎build/pkgs/beautifulsoup4/distros/debian.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
beautifulsoup4

‎build/pkgs/beautifulsoup4/distros/fedora.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python-beautifulsoup4

‎build/pkgs/beautifulsoup4/distros/gentoo.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dev-python/beautifulsoup4

‎build/pkgs/beautifulsoup4/distros/opensuse.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python-beautifulsoup4

‎build/pkgs/beautifulsoup4/spkg-configure.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SAGE_SPKG_CONFIGURE([beautifulsoup4], [SAGE_PYTHON_PACKAGE_CHECK([beautifulsoup4])])

‎build/pkgs/furo/distros/arch.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python-sphinx-furo

‎build/pkgs/furo/distros/debian.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
furo

0 commit comments

Comments
 (0)