Skip to content

Commit

Permalink
sagemathgh-36276: Yet more spkg_configure for standard python packages
Browse files Browse the repository at this point in the history
    
This is a continuation of sagemath#36256

- Fixes sagemath#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


- sagemath#36296: to use an up to date Sphinx
- sagemath#36267: updated ipympl, etc

Also, a Jupyter/Python issue was uncovered there, which might need work.
    
URL: sagemath#36276
Reported by: Dima Pasechnik
Reviewer(s): Matthias Köppe, Michael Orlitzky
  • Loading branch information
Release Manager committed Sep 24, 2023
2 parents 4a1e64f + 180e814 commit c1c7544
Show file tree
Hide file tree
Showing 79 changed files with 130 additions and 7 deletions.
38 changes: 37 additions & 1 deletion .github/workflows/ci-linux-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ jobs:
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
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
cat $GITHUB_OUTPUT
minimal:
test:
needs: [changed_files]
if: |
github.event_name != 'pull_request' ||
Expand Down Expand Up @@ -94,3 +95,38 @@ jobs:
["standard",
"minimal"]
docker_push_repository: ghcr.io/${{ github.repository }}/

site:
needs: [changed_files]
if: |
github.event_name != 'pull_request' ||
((github.event.action != 'labeled' &&
(contains(github.event.pull_request.labels.*.name, 'c: packages: standard') ||
contains(github.event.pull_request.labels.*.name, 'c: packages: optional'))) ||
(github.event.action == 'labeled' &&
(github.event.label.name == 'c: packages: optional' ||
github.event.label.name == 'c: packages: standard')))
uses: ./.github/workflows/docker.yml
with:
# Build incrementally from published Docker image
incremental: true
free_disk_space: true
from_docker_repository: ghcr.io/sagemath/sage/
from_docker_target: "with-targets"
from_docker_tag: "dev"
docker_targets: "with-targets"
targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
# Only test systems with a usable system python (>= 3.9)
tox_system_factors: >-
["ubuntu-jammy",
"ubuntu-mantic",
"debian-bullseye",
"debian-bookworm",
"fedora-33",
"fedora-38",
"gentoo-python3.11",
"archlinux",
"debian-bullseye-i386"]
tox_packages_factors: >-
["standard-sitepackages"]
docker_push_repository: ghcr.io/${{ github.repository }}/
1 change: 1 addition & 0 deletions build/pkgs/beautifulsoup4/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-beautifulsoup4
1 change: 1 addition & 0 deletions build/pkgs/beautifulsoup4/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-beautifulsoup4
1 change: 1 addition & 0 deletions build/pkgs/beautifulsoup4/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
beautifulsoup4
1 change: 1 addition & 0 deletions build/pkgs/beautifulsoup4/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-beautifulsoup4
1 change: 1 addition & 0 deletions build/pkgs/beautifulsoup4/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/beautifulsoup4
1 change: 1 addition & 0 deletions build/pkgs/beautifulsoup4/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-beautifulsoup4
1 change: 1 addition & 0 deletions build/pkgs/beautifulsoup4/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAGE_SPKG_CONFIGURE([beautifulsoup4], [SAGE_PYTHON_PACKAGE_CHECK([beautifulsoup4])])
1 change: 1 addition & 0 deletions build/pkgs/furo/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-sphinx-furo
1 change: 1 addition & 0 deletions build/pkgs/furo/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
furo
1 change: 1 addition & 0 deletions build/pkgs/furo/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-furo
1 change: 1 addition & 0 deletions build/pkgs/furo/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
textproc/py-furo
1 change: 1 addition & 0 deletions build/pkgs/furo/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/furo
3 changes: 3 additions & 0 deletions build/pkgs/furo/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([furo], [
SAGE_PYTHON_PACKAGE_CHECK([furo])
])
1 change: 1 addition & 0 deletions build/pkgs/ipympl/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-ipympl
1 change: 1 addition & 0 deletions build/pkgs/ipympl/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/py-ipympl
1 change: 1 addition & 0 deletions build/pkgs/ipympl/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-ipympl
1 change: 1 addition & 0 deletions build/pkgs/ipympl/distros/repology.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python:ipympl
3 changes: 3 additions & 0 deletions build/pkgs/ipympl/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([ipympl], [
SAGE_PYTHON_PACKAGE_CHECK([ipympl])
])
1 change: 1 addition & 0 deletions build/pkgs/jupyter_jsmol/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jupyter-jsmol
1 change: 1 addition & 0 deletions build/pkgs/jupyter_jsmol/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
science/py-jupyter_jsmol
3 changes: 3 additions & 0 deletions build/pkgs/jupyter_jsmol/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([jupyter_jsmol], [
SAGE_PYTHON_PACKAGE_CHECK([jupyter_jsmol])
])
1 change: 1 addition & 0 deletions build/pkgs/jupyter_sphinx/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-jupyter-sphinx
1 change: 1 addition & 0 deletions build/pkgs/jupyter_sphinx/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-jupyter-sphinx
1 change: 1 addition & 0 deletions build/pkgs/jupyter_sphinx/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
textproc/py-jupyter_sphinx
1 change: 1 addition & 0 deletions build/pkgs/jupyter_sphinx/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-jupyter_sphinx
1 change: 1 addition & 0 deletions build/pkgs/jupyter_sphinx/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-jupyter-sphinx
3 changes: 3 additions & 0 deletions build/pkgs/jupyter_sphinx/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([jupyter_sphinx], [
SAGE_PYTHON_PACKAGE_CHECK([jupyter_sphinx])
])
3 changes: 3 additions & 0 deletions build/pkgs/jupyterlab_widgets/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([jupyterlab_widgets], [
SAGE_PYTHON_PACKAGE_CHECK([jupyterlab_widgets])
])
1 change: 1 addition & 0 deletions build/pkgs/meson_python/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-meson-python
1 change: 1 addition & 0 deletions build/pkgs/meson_python/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
meson-python
1 change: 1 addition & 0 deletions build/pkgs/meson_python/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
meson-python
1 change: 1 addition & 0 deletions build/pkgs/meson_python/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-meson-python
1 change: 1 addition & 0 deletions build/pkgs/meson_python/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/meson-python
1 change: 1 addition & 0 deletions build/pkgs/meson_python/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-meson-python
1 change: 1 addition & 0 deletions build/pkgs/meson_python/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-meson-python
2 changes: 1 addition & 1 deletion build/pkgs/meson_python/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SAGE_SPKG_CONFIGURE([meson_python], [
SAGE_PYTHON_PACKAGE_CHECK([meson-python])
SAGE_PYTHON_PACKAGE_CHECK([meson_python])
])
1 change: 1 addition & 0 deletions build/pkgs/py/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/py
1 change: 1 addition & 0 deletions build/pkgs/setuptools_scm_git_archive/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-setuptools-scm-git-archive
1 change: 1 addition & 0 deletions build/pkgs/setuptools_scm_git_archive/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-setuptools-scm-git-archive
1 change: 1 addition & 0 deletions build/pkgs/setuptools_scm_git_archive/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
setuptools-scm-git-archive
1 change: 1 addition & 0 deletions build/pkgs/setuptools_scm_git_archive/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-setuptools_scm_git_archive
1 change: 1 addition & 0 deletions build/pkgs/setuptools_scm_git_archive/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/py-setuptools_scm_git_archive
1 change: 1 addition & 0 deletions build/pkgs/setuptools_scm_git_archive/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/setuptools_scm_git_archive
1 change: 1 addition & 0 deletions build/pkgs/setuptools_scm_git_archive/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAGE_SPKG_CONFIGURE([setuptools_scm_git_archive], [SAGE_PYTHON_PACKAGE_CHECK([setuptools_scm_git_archive])])
1 change: 1 addition & 0 deletions build/pkgs/setuptools_wheel/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAGE_SPKG_CONFIGURE([setuptools_wheel], [SAGE_PYTHON_PACKAGE_CHECK([setuptools_wheel])])
3 changes: 3 additions & 0 deletions build/pkgs/sphinx/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([sphinx], [
SAGE_PYTHON_PACKAGE_CHECK([sphinx])
])
1 change: 1 addition & 0 deletions build/pkgs/sphinx_basic_ng/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-sphinx-basic-ng
1 change: 1 addition & 0 deletions build/pkgs/sphinx_basic_ng/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sphinx-basic-ng
1 change: 1 addition & 0 deletions build/pkgs/sphinx_basic_ng/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-sphinx-basic-ng
1 change: 1 addition & 0 deletions build/pkgs/sphinx_basic_ng/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
textproc/py-sphinx-basic-ng
1 change: 1 addition & 0 deletions build/pkgs/sphinx_basic_ng/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/sphinx-basic-ng
3 changes: 3 additions & 0 deletions build/pkgs/sphinx_basic_ng/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([sphinx_basic_ng], [
SAGE_PYTHON_PACKAGE_CHECK([sphinx_basic_ng])
])
1 change: 1 addition & 0 deletions build/pkgs/sphinx_copybutton/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-sphinx-copybutton
1 change: 1 addition & 0 deletions build/pkgs/sphinx_copybutton/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-sphinx-copybutton
1 change: 1 addition & 0 deletions build/pkgs/sphinx_copybutton/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-sphinx-copybutton
1 change: 1 addition & 0 deletions build/pkgs/sphinx_copybutton/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
textproc/py-sphinx-copybutton
1 change: 1 addition & 0 deletions build/pkgs/sphinx_copybutton/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/sphinx-copybutton
1 change: 1 addition & 0 deletions build/pkgs/sphinx_copybutton/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-sphinx-copybutton
3 changes: 3 additions & 0 deletions build/pkgs/sphinx_copybutton/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([sphinx_copybutton], [
SAGE_PYTHON_PACKAGE_CHECK([sphinx_copybutton])
])
1 change: 1 addition & 0 deletions build/pkgs/sphinxcontrib_websupport/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-sphinxcontrib-websupport
1 change: 1 addition & 0 deletions build/pkgs/sphinxcontrib_websupport/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sphinxcontrib-websupport
1 change: 1 addition & 0 deletions build/pkgs/sphinxcontrib_websupport/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/sphinxcontrib-websupport
3 changes: 3 additions & 0 deletions build/pkgs/sphinxcontrib_websupport/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([sphinxcontrib_websupport], [
SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_websupport])
])
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-tinycss2
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-tinycss2
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-tinycss2
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-tinycss2
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
textproc/py-tinycss2
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/tinycss2
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-tinycss2
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-tinycss2
1 change: 1 addition & 0 deletions build/pkgs/tinycss2/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-tinycss2
3 changes: 3 additions & 0 deletions build/pkgs/tinycss2/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([tinycss2], [
SAGE_PYTHON_PACKAGE_CHECK([tinycss2])
])
1 change: 0 additions & 1 deletion build/pkgs/toml/distros/arch.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/toml/distros/debian.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/toml/distros/fedora.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/toml/distros/gentoo.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/toml/distros/opensuse.txt

This file was deleted.

0 comments on commit c1c7544

Please sign in to comment.