From 3442ccc390a365a6dc5146d3f5e774104e8b4c5b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 28 Jan 2024 21:02:21 -0800 Subject: [PATCH 1/5] Update debian.txt for various Python packages --- build/pkgs/beautifulsoup4/distros/debian.txt | 2 +- build/pkgs/cython/distros/debian.txt | 2 +- build/pkgs/fastjsonschema/distros/debian.txt | 2 +- build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt | 2 +- build/pkgs/hatch_vcs/distros/debian.txt | 2 +- build/pkgs/importlib_resources/distros/debian.txt | 1 + build/pkgs/ipykernel/distros/debian.txt | 2 +- build/pkgs/rpy2/distros/debian.txt | 2 +- build/pkgs/setuptools_scm/distros/debian.txt | 2 +- build/pkgs/sphinxcontrib_websupport/distros/debian.txt | 2 +- build/pkgs/tinycss2/distros/debian.txt | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 build/pkgs/importlib_resources/distros/debian.txt diff --git a/build/pkgs/beautifulsoup4/distros/debian.txt b/build/pkgs/beautifulsoup4/distros/debian.txt index c1f5f713cda..7195aa7f3df 100644 --- a/build/pkgs/beautifulsoup4/distros/debian.txt +++ b/build/pkgs/beautifulsoup4/distros/debian.txt @@ -1 +1 @@ -beautifulsoup4 +python3-bs4 diff --git a/build/pkgs/cython/distros/debian.txt b/build/pkgs/cython/distros/debian.txt index f6629e02456..1523026d4cd 100644 --- a/build/pkgs/cython/distros/debian.txt +++ b/build/pkgs/cython/distros/debian.txt @@ -1 +1 @@ -cython +cython3 diff --git a/build/pkgs/fastjsonschema/distros/debian.txt b/build/pkgs/fastjsonschema/distros/debian.txt index 7a8bdf5369b..aba120db917 100644 --- a/build/pkgs/fastjsonschema/distros/debian.txt +++ b/build/pkgs/fastjsonschema/distros/debian.txt @@ -1 +1 @@ -python-fastjsonschema +python3-fastjsonschema diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt index 7df4edcccd3..804dbbd0a98 100644 --- a/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt @@ -1 +1 @@ -python-hatch-fancy-pypi-readme +python3-hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_vcs/distros/debian.txt b/build/pkgs/hatch_vcs/distros/debian.txt index 04e2069fbb3..5480b8bcdd9 100644 --- a/build/pkgs/hatch_vcs/distros/debian.txt +++ b/build/pkgs/hatch_vcs/distros/debian.txt @@ -1 +1 @@ -hatch-vcs +python3-hatch-vcs diff --git a/build/pkgs/importlib_resources/distros/debian.txt b/build/pkgs/importlib_resources/distros/debian.txt new file mode 100644 index 00000000000..ff0b1d12f70 --- /dev/null +++ b/build/pkgs/importlib_resources/distros/debian.txt @@ -0,0 +1 @@ +python3-importlib-resources diff --git a/build/pkgs/ipykernel/distros/debian.txt b/build/pkgs/ipykernel/distros/debian.txt index d919f6f3190..71e84c46f0e 100644 --- a/build/pkgs/ipykernel/distros/debian.txt +++ b/build/pkgs/ipykernel/distros/debian.txt @@ -1 +1 @@ -ipykernel +python3-ipykernel diff --git a/build/pkgs/rpy2/distros/debian.txt b/build/pkgs/rpy2/distros/debian.txt index 8f389862688..27a564a98eb 100644 --- a/build/pkgs/rpy2/distros/debian.txt +++ b/build/pkgs/rpy2/distros/debian.txt @@ -1 +1 @@ -rpy2 +python3-rpy2 diff --git a/build/pkgs/setuptools_scm/distros/debian.txt b/build/pkgs/setuptools_scm/distros/debian.txt index bcfdd6ebcdd..7aa8bf5ebdf 100644 --- a/build/pkgs/setuptools_scm/distros/debian.txt +++ b/build/pkgs/setuptools_scm/distros/debian.txt @@ -1 +1 @@ -setuptools-scm +python3-setuptools-scm diff --git a/build/pkgs/sphinxcontrib_websupport/distros/debian.txt b/build/pkgs/sphinxcontrib_websupport/distros/debian.txt index 141994ece36..3ee07fb2279 100644 --- a/build/pkgs/sphinxcontrib_websupport/distros/debian.txt +++ b/build/pkgs/sphinxcontrib_websupport/distros/debian.txt @@ -1 +1 @@ -sphinxcontrib-websupport +python3-sphinxcontrib.websupport diff --git a/build/pkgs/tinycss2/distros/debian.txt b/build/pkgs/tinycss2/distros/debian.txt index cb5becfe9eb..a2c2cb2f4ab 100644 --- a/build/pkgs/tinycss2/distros/debian.txt +++ b/build/pkgs/tinycss2/distros/debian.txt @@ -1 +1 @@ -python-tinycss2 +python3-tinycss2 From 2b51ed5d10ad5e6daaca644de3858c7be87b14ea Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 8 Feb 2024 16:35:24 -0800 Subject: [PATCH 2/5] build/pkgs/_sagemath/distros/debian.txt: sagemath-doc, not sagemath-doc-en --- build/pkgs/_sagemath/distros/debian.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/_sagemath/distros/debian.txt b/build/pkgs/_sagemath/distros/debian.txt index 453676a64e6..08bf00d165f 100644 --- a/build/pkgs/_sagemath/distros/debian.txt +++ b/build/pkgs/_sagemath/distros/debian.txt @@ -1,3 +1,3 @@ sagemath -sagemath-doc-en +sagemath-doc sagemath-jupyter From a78ebce3089dd0a62cb62b26f53a2bfdf5deeb63 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 8 Feb 2024 16:39:44 -0800 Subject: [PATCH 3/5] build/pkgs/_sagemath/SPKG.rst: Fix link to wiki --- build/pkgs/_sagemath/SPKG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/_sagemath/SPKG.rst b/build/pkgs/_sagemath/SPKG.rst index 8f0311864ec..4d48472f144 100644 --- a/build/pkgs/_sagemath/SPKG.rst +++ b/build/pkgs/_sagemath/SPKG.rst @@ -12,4 +12,4 @@ including documentation and Jupyter. Downstream Contact ------------------ -See :trac:`Trac wiki page Distribution ` +See `wiki page Distribution `_ From 7da7b5a7fd2f61fd0bfc7c544f1f3adc1423d65d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 8 Feb 2024 16:55:27 -0800 Subject: [PATCH 4/5] build/bin/sage-spkg-info: Suppress a confusing message for _bootstrap, _sagemath --- build/bin/sage-spkg-info | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info index b7b91a63339..6277be3adec 100755 --- a/build/bin/sage-spkg-info +++ b/build/bin/sage-spkg-info @@ -155,9 +155,17 @@ else echo "If the system package is installed, $(code ./configure) will check if it can be used." fi else - echo "However, these system packages will not be used for building Sage" - echo "because $(code spkg-configure.m4) has not been written for this package;" - echo "see $(issue 27330)" + case $PKG_BASE in + _*) + # Suppress the message, as it makes no sense for these special packages + # (_bootstrap, _sagemath) + ;; + *) + echo "However, these system packages will not be used for building Sage" + echo "because $(code spkg-configure.m4) has not been written for this package;" + echo "see $(issue 27330)" + ;; + esac fi fi echo From 6eab2a1355abb2d106174e5e438037ed469c91fe Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 8 Feb 2024 16:57:34 -0800 Subject: [PATCH 5/5] build/bin/sage-spkg-info: Complete a sentence --- build/bin/sage-spkg-info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info index 6277be3adec..fbf7036c4a2 100755 --- a/build/bin/sage-spkg-info +++ b/build/bin/sage-spkg-info @@ -163,7 +163,7 @@ else *) echo "However, these system packages will not be used for building Sage" echo "because $(code spkg-configure.m4) has not been written for this package;" - echo "see $(issue 27330)" + echo "see $(issue 27330) for more information." ;; esac fi