From 72a6ed5dddb14231b7e59da8e9acf2d9d9e77676 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 10 Sep 2023 19:27:15 -0400 Subject: [PATCH 01/16] build/pkgs/poetry_core: add Gentoo package information --- build/pkgs/poetry_core/distros/gentoo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/poetry_core/distros/gentoo.txt diff --git a/build/pkgs/poetry_core/distros/gentoo.txt b/build/pkgs/poetry_core/distros/gentoo.txt new file mode 100644 index 00000000000..758fd6e9e01 --- /dev/null +++ b/build/pkgs/poetry_core/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/poetry-core From c9e20678e8f9e213270ab74a56a4e3f94ba017e3 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 10 Sep 2023 19:28:33 -0400 Subject: [PATCH 02/16] build/pkgs/poetry_core: add standard python spkg-configure.m4 --- build/pkgs/poetry_core/spkg-configure.m4 | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/poetry_core/spkg-configure.m4 diff --git a/build/pkgs/poetry_core/spkg-configure.m4 b/build/pkgs/poetry_core/spkg-configure.m4 new file mode 100644 index 00000000000..ae5337520e7 --- /dev/null +++ b/build/pkgs/poetry_core/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([poetry_core], [SAGE_PYTHON_PACKAGE_CHECK([poetry-core])]) From 8f8394ceb3d1e4434276e20326587ce6e7f72425 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Fri, 15 Sep 2023 22:03:15 +0100 Subject: [PATCH 03/16] more spkg-configure.m4 for python packages --- build/pkgs/jupyter_packaging/spkg-configure.m4 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 build/pkgs/jupyter_packaging/spkg-configure.m4 diff --git a/build/pkgs/jupyter_packaging/spkg-configure.m4 b/build/pkgs/jupyter_packaging/spkg-configure.m4 new file mode 100644 index 00000000000..2d3ee6280dd --- /dev/null +++ b/build/pkgs/jupyter_packaging/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([jupyter_packaging], [ + SAGE_PYTHON_PACKAGE_CHECK([jupyter_packaging]) +]) From 41ed5b3028cbc195a866dcc45d39e19fccce58e5 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Sat, 16 Sep 2023 12:48:57 +0100 Subject: [PATCH 04/16] 7.1+ does not work with Sage, cf sagemath/sage/pull/35658 see https://github.com/sagemath/sage/pull/35658, in particular https://github.com/sagemath/sage/pull/35658#issuecomment-1722179207 and later --- build/pkgs/sphinx/install-requires.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sphinx/install-requires.txt b/build/pkgs/sphinx/install-requires.txt index 9003fdec2f8..1ad0ea81a41 100644 --- a/build/pkgs/sphinx/install-requires.txt +++ b/build/pkgs/sphinx/install-requires.txt @@ -1 +1 @@ -sphinx >=5.2, <8 +sphinx >=5.2, <7.1 From 76141a62076c7fee35657e8037675828ae34ab66 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Sep 2023 18:36:50 -0700 Subject: [PATCH 05/16] build/pkgs/pkgconfig: Update to 1.5.5, change to wheel package --- build/pkgs/pkgconfig/SPKG.rst | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/build/pkgs/pkgconfig/SPKG.rst b/build/pkgs/pkgconfig/SPKG.rst index 3c5d61a167a..9566fb4e409 100644 --- a/build/pkgs/pkgconfig/SPKG.rst +++ b/build/pkgs/pkgconfig/SPKG.rst @@ -1,19 +1,18 @@ -pkgconfig: Python interface to pkg-config -========================================= +pkgconfig: Interface Python with pkg-config +=========================================== Description ----------- -Pkgconfig is a Python module to interface with the pkg-config command -line tool. +Interface Python with pkg-config License ------- -MIT License - +MIT Upstream Contact ---------------- -https://github.com/matze/pkgconfig +https://pypi.org/project/pkgconfig/ + From 6107a04a7d1501347c6dcc9ffb12689c4c02f140 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 14 Sep 2023 11:39:03 -0700 Subject: [PATCH 06/16] build/pkgs/pkgconfig/SPKG.rst: Restore hand-edited version --- build/pkgs/pkgconfig/SPKG.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build/pkgs/pkgconfig/SPKG.rst b/build/pkgs/pkgconfig/SPKG.rst index 9566fb4e409..3c5d61a167a 100644 --- a/build/pkgs/pkgconfig/SPKG.rst +++ b/build/pkgs/pkgconfig/SPKG.rst @@ -1,18 +1,19 @@ -pkgconfig: Interface Python with pkg-config -=========================================== +pkgconfig: Python interface to pkg-config +========================================= Description ----------- -Interface Python with pkg-config +Pkgconfig is a Python module to interface with the pkg-config command +line tool. License ------- -MIT +MIT License + Upstream Contact ---------------- -https://pypi.org/project/pkgconfig/ - +https://github.com/matze/pkgconfig From 7d79db5b9e39977774899b325c202ee9c35dc554 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 19 Sep 2023 10:17:53 -0700 Subject: [PATCH 07/16] build/pkgs/poetry_core: Remove (again) --- build/pkgs/poetry_core/distros/gentoo.txt | 1 - build/pkgs/poetry_core/spkg-configure.m4 | 1 - 2 files changed, 2 deletions(-) delete mode 100644 build/pkgs/poetry_core/distros/gentoo.txt delete mode 100644 build/pkgs/poetry_core/spkg-configure.m4 diff --git a/build/pkgs/poetry_core/distros/gentoo.txt b/build/pkgs/poetry_core/distros/gentoo.txt deleted file mode 100644 index 758fd6e9e01..00000000000 --- a/build/pkgs/poetry_core/distros/gentoo.txt +++ /dev/null @@ -1 +0,0 @@ -dev-python/poetry-core diff --git a/build/pkgs/poetry_core/spkg-configure.m4 b/build/pkgs/poetry_core/spkg-configure.m4 deleted file mode 100644 index ae5337520e7..00000000000 --- a/build/pkgs/poetry_core/spkg-configure.m4 +++ /dev/null @@ -1 +0,0 @@ -SAGE_SPKG_CONFIGURE([poetry_core], [SAGE_PYTHON_PACKAGE_CHECK([poetry-core])]) From f073ed1df7fa66c4c5653fa463debff79a41c793 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 21 Sep 2023 18:06:30 +0100 Subject: [PATCH 08/16] sphinx 7.x is OK --- build/pkgs/sphinx/install-requires.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sphinx/install-requires.txt b/build/pkgs/sphinx/install-requires.txt index 1ad0ea81a41..9003fdec2f8 100644 --- a/build/pkgs/sphinx/install-requires.txt +++ b/build/pkgs/sphinx/install-requires.txt @@ -1 +1 @@ -sphinx >=5.2, <7.1 +sphinx >=5.2, <8 From bbd75f89b510c7ff272f86a0f5241f7324a92abb Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 21 Sep 2023 12:31:34 -0700 Subject: [PATCH 09/16] build/pkgs/jupyter_packaging: Remove (again) --- build/pkgs/jupyter_packaging/spkg-configure.m4 | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 build/pkgs/jupyter_packaging/spkg-configure.m4 diff --git a/build/pkgs/jupyter_packaging/spkg-configure.m4 b/build/pkgs/jupyter_packaging/spkg-configure.m4 deleted file mode 100644 index 2d3ee6280dd..00000000000 --- a/build/pkgs/jupyter_packaging/spkg-configure.m4 +++ /dev/null @@ -1,3 +0,0 @@ -SAGE_SPKG_CONFIGURE([jupyter_packaging], [ - SAGE_PYTHON_PACKAGE_CHECK([jupyter_packaging]) -]) From 43ac4adc719416855b445a76c647aecf6c75b846 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Mon, 25 Sep 2023 15:48:38 +0100 Subject: [PATCH 10/16] leftover standard packages without spkg-configures --- build/pkgs/calver/distros/alpine.txt | 1 + build/pkgs/calver/distros/arch.txt | 1 + build/pkgs/calver/distros/freebsd.txt | 1 + build/pkgs/calver/distros/gentoo.txt | 1 + build/pkgs/calver/distros/install-requires.txt | 1 + build/pkgs/calver/distros/macports.txt | 1 + build/pkgs/calver/distros/opensuse.txt | 1 + build/pkgs/calver/distros/package-version.txt | 1 + build/pkgs/calver/distros/void.txt | 1 + build/pkgs/calver/spkg-configure.m4 | 3 +++ build/pkgs/fastjsonschema/distros/alpine.txt | 1 + build/pkgs/fastjsonschema/distros/arch.txt | 1 + build/pkgs/fastjsonschema/distros/debian.txt | 1 + build/pkgs/fastjsonschema/distros/fedora.txt | 1 + build/pkgs/fastjsonschema/distros/freebsd.txt | 1 + build/pkgs/fastjsonschema/distros/gentoo.txt | 1 + build/pkgs/fastjsonschema/distros/macports.txt | 1 + build/pkgs/fastjsonschema/distros/opensuse.txt | 1 + build/pkgs/fastjsonschema/distros/void.txt | 1 + build/pkgs/fastjsonschema/spkg-configure.m4 | 3 +++ build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4 | 3 +++ build/pkgs/hatch_vcs/distros/alpine.txt | 1 + build/pkgs/hatch_vcs/distros/arch.txt | 1 + build/pkgs/hatch_vcs/distros/debian.txt | 1 + build/pkgs/hatch_vcs/distros/fedora.txt | 1 + build/pkgs/hatch_vcs/distros/freebsd.txt | 1 + build/pkgs/hatch_vcs/distros/gentoo.txt | 1 + build/pkgs/hatch_vcs/distros/macports.txt | 1 + build/pkgs/hatch_vcs/distros/opensuse.txt | 1 + build/pkgs/hatch_vcs/distros/void.txt | 1 + build/pkgs/hatch_vcs/spkg-configure.m4 | 3 +++ build/pkgs/trove_classifiers/distros/alpine.txt | 1 + build/pkgs/trove_classifiers/distros/arch.txt | 1 + build/pkgs/trove_classifiers/distros/fedora.txt | 1 + build/pkgs/trove_classifiers/distros/freebsd.txt | 1 + build/pkgs/trove_classifiers/distros/gentoo.txt | 1 + build/pkgs/trove_classifiers/distros/macports.txt | 1 + build/pkgs/trove_classifiers/spkg-configure.m4 | 3 +++ 46 files changed, 56 insertions(+) create mode 100644 build/pkgs/calver/distros/alpine.txt create mode 100644 build/pkgs/calver/distros/arch.txt create mode 100644 build/pkgs/calver/distros/freebsd.txt create mode 100644 build/pkgs/calver/distros/gentoo.txt create mode 100644 build/pkgs/calver/distros/install-requires.txt create mode 100644 build/pkgs/calver/distros/macports.txt create mode 100644 build/pkgs/calver/distros/opensuse.txt create mode 100644 build/pkgs/calver/distros/package-version.txt create mode 100644 build/pkgs/calver/distros/void.txt create mode 100644 build/pkgs/calver/spkg-configure.m4 create mode 100644 build/pkgs/fastjsonschema/distros/alpine.txt create mode 100644 build/pkgs/fastjsonschema/distros/arch.txt create mode 100644 build/pkgs/fastjsonschema/distros/debian.txt create mode 100644 build/pkgs/fastjsonschema/distros/fedora.txt create mode 100644 build/pkgs/fastjsonschema/distros/freebsd.txt create mode 100644 build/pkgs/fastjsonschema/distros/gentoo.txt create mode 100644 build/pkgs/fastjsonschema/distros/macports.txt create mode 100644 build/pkgs/fastjsonschema/distros/opensuse.txt create mode 100644 build/pkgs/fastjsonschema/distros/void.txt create mode 100644 build/pkgs/fastjsonschema/spkg-configure.m4 create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4 create mode 100644 build/pkgs/hatch_vcs/distros/alpine.txt create mode 100644 build/pkgs/hatch_vcs/distros/arch.txt create mode 100644 build/pkgs/hatch_vcs/distros/debian.txt create mode 100644 build/pkgs/hatch_vcs/distros/fedora.txt create mode 100644 build/pkgs/hatch_vcs/distros/freebsd.txt create mode 100644 build/pkgs/hatch_vcs/distros/gentoo.txt create mode 100644 build/pkgs/hatch_vcs/distros/macports.txt create mode 100644 build/pkgs/hatch_vcs/distros/opensuse.txt create mode 100644 build/pkgs/hatch_vcs/distros/void.txt create mode 100644 build/pkgs/hatch_vcs/spkg-configure.m4 create mode 100644 build/pkgs/trove_classifiers/distros/alpine.txt create mode 100644 build/pkgs/trove_classifiers/distros/arch.txt create mode 100644 build/pkgs/trove_classifiers/distros/fedora.txt create mode 100644 build/pkgs/trove_classifiers/distros/freebsd.txt create mode 100644 build/pkgs/trove_classifiers/distros/gentoo.txt create mode 100644 build/pkgs/trove_classifiers/distros/macports.txt create mode 100644 build/pkgs/trove_classifiers/spkg-configure.m4 diff --git a/build/pkgs/calver/distros/alpine.txt b/build/pkgs/calver/distros/alpine.txt new file mode 100644 index 00000000000..8255792e691 --- /dev/null +++ b/build/pkgs/calver/distros/alpine.txt @@ -0,0 +1 @@ +py3-calver diff --git a/build/pkgs/calver/distros/arch.txt b/build/pkgs/calver/distros/arch.txt new file mode 100644 index 00000000000..d55fc26d242 --- /dev/null +++ b/build/pkgs/calver/distros/arch.txt @@ -0,0 +1 @@ +python-calver diff --git a/build/pkgs/calver/distros/freebsd.txt b/build/pkgs/calver/distros/freebsd.txt new file mode 100644 index 00000000000..de235fba4a8 --- /dev/null +++ b/build/pkgs/calver/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-calver diff --git a/build/pkgs/calver/distros/gentoo.txt b/build/pkgs/calver/distros/gentoo.txt new file mode 100644 index 00000000000..62948b78bc0 --- /dev/null +++ b/build/pkgs/calver/distros/gentoo.txt @@ -0,0 +1 @@ +calver diff --git a/build/pkgs/calver/distros/install-requires.txt b/build/pkgs/calver/distros/install-requires.txt new file mode 100644 index 00000000000..62948b78bc0 --- /dev/null +++ b/build/pkgs/calver/distros/install-requires.txt @@ -0,0 +1 @@ +calver diff --git a/build/pkgs/calver/distros/macports.txt b/build/pkgs/calver/distros/macports.txt new file mode 100644 index 00000000000..69e97601935 --- /dev/null +++ b/build/pkgs/calver/distros/macports.txt @@ -0,0 +1 @@ +py-calver diff --git a/build/pkgs/calver/distros/opensuse.txt b/build/pkgs/calver/distros/opensuse.txt new file mode 100644 index 00000000000..d55fc26d242 --- /dev/null +++ b/build/pkgs/calver/distros/opensuse.txt @@ -0,0 +1 @@ +python-calver diff --git a/build/pkgs/calver/distros/package-version.txt b/build/pkgs/calver/distros/package-version.txt new file mode 100644 index 00000000000..42376d1100a --- /dev/null +++ b/build/pkgs/calver/distros/package-version.txt @@ -0,0 +1 @@ +2022.6.26 diff --git a/build/pkgs/calver/distros/void.txt b/build/pkgs/calver/distros/void.txt new file mode 100644 index 00000000000..f26512ac1ec --- /dev/null +++ b/build/pkgs/calver/distros/void.txt @@ -0,0 +1 @@ +python3-calver diff --git a/build/pkgs/calver/spkg-configure.m4 b/build/pkgs/calver/spkg-configure.m4 new file mode 100644 index 00000000000..8b3e503802c --- /dev/null +++ b/build/pkgs/calver/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([calver], [ + SAGE_PYTHON_PACKAGE_CHECK([calver]) +]) diff --git a/build/pkgs/fastjsonschema/distros/alpine.txt b/build/pkgs/fastjsonschema/distros/alpine.txt new file mode 100644 index 00000000000..6bc734d2640 --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/alpine.txt @@ -0,0 +1 @@ +py3-fastjsonschema diff --git a/build/pkgs/fastjsonschema/distros/arch.txt b/build/pkgs/fastjsonschema/distros/arch.txt new file mode 100644 index 00000000000..7a8bdf5369b --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/arch.txt @@ -0,0 +1 @@ +python-fastjsonschema diff --git a/build/pkgs/fastjsonschema/distros/debian.txt b/build/pkgs/fastjsonschema/distros/debian.txt new file mode 100644 index 00000000000..7a8bdf5369b --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/debian.txt @@ -0,0 +1 @@ +python-fastjsonschema diff --git a/build/pkgs/fastjsonschema/distros/fedora.txt b/build/pkgs/fastjsonschema/distros/fedora.txt new file mode 100644 index 00000000000..7a8bdf5369b --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/fedora.txt @@ -0,0 +1 @@ +python-fastjsonschema diff --git a/build/pkgs/fastjsonschema/distros/freebsd.txt b/build/pkgs/fastjsonschema/distros/freebsd.txt new file mode 100644 index 00000000000..cd3d138fdea --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-fastjsonschema diff --git a/build/pkgs/fastjsonschema/distros/gentoo.txt b/build/pkgs/fastjsonschema/distros/gentoo.txt new file mode 100644 index 00000000000..1c7b95ab7a7 --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/fastjsonschema diff --git a/build/pkgs/fastjsonschema/distros/macports.txt b/build/pkgs/fastjsonschema/distros/macports.txt new file mode 100644 index 00000000000..a071757bc5b --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/macports.txt @@ -0,0 +1 @@ +py-fastjsonschema diff --git a/build/pkgs/fastjsonschema/distros/opensuse.txt b/build/pkgs/fastjsonschema/distros/opensuse.txt new file mode 100644 index 00000000000..7a8bdf5369b --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/opensuse.txt @@ -0,0 +1 @@ +python-fastjsonschema diff --git a/build/pkgs/fastjsonschema/distros/void.txt b/build/pkgs/fastjsonschema/distros/void.txt new file mode 100644 index 00000000000..aba120db917 --- /dev/null +++ b/build/pkgs/fastjsonschema/distros/void.txt @@ -0,0 +1 @@ +python3-fastjsonschema diff --git a/build/pkgs/fastjsonschema/spkg-configure.m4 b/build/pkgs/fastjsonschema/spkg-configure.m4 new file mode 100644 index 00000000000..944aeddbfaf --- /dev/null +++ b/build/pkgs/fastjsonschema/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([fastjsonschema], [ + SAGE_PYTHON_PACKAGE_CHECK([fastjsonschema]) +]) diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt new file mode 100644 index 00000000000..0046a6941d0 --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt @@ -0,0 +1 @@ +py3-hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt new file mode 100644 index 00000000000..7df4edcccd3 --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt @@ -0,0 +1 @@ +python-hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt new file mode 100644 index 00000000000..7df4edcccd3 --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt @@ -0,0 +1 @@ +python-hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt new file mode 100644 index 00000000000..7df4edcccd3 --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt @@ -0,0 +1 @@ +python-hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt new file mode 100644 index 00000000000..b3e8d47dc5a --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt new file mode 100644 index 00000000000..88ad9653448 --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt new file mode 100644 index 00000000000..442557c9f7f --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt @@ -0,0 +1 @@ +py-hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt new file mode 100644 index 00000000000..7df4edcccd3 --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt @@ -0,0 +1 @@ +python-hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4 b/build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4 new file mode 100644 index 00000000000..864f889676d --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([hatch_fancy_pypi_readme], [ + SAGE_PYTHON_PACKAGE_CHECK([hatch_fancy_pypi_readme]) +]) diff --git a/build/pkgs/hatch_vcs/distros/alpine.txt b/build/pkgs/hatch_vcs/distros/alpine.txt new file mode 100644 index 00000000000..f83237884b5 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/alpine.txt @@ -0,0 +1 @@ +py3-hatch-vcs diff --git a/build/pkgs/hatch_vcs/distros/arch.txt b/build/pkgs/hatch_vcs/distros/arch.txt new file mode 100644 index 00000000000..8441f14bba2 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/arch.txt @@ -0,0 +1 @@ +python-hatch-vcs diff --git a/build/pkgs/hatch_vcs/distros/debian.txt b/build/pkgs/hatch_vcs/distros/debian.txt new file mode 100644 index 00000000000..04e2069fbb3 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/debian.txt @@ -0,0 +1 @@ +hatch-vcs diff --git a/build/pkgs/hatch_vcs/distros/fedora.txt b/build/pkgs/hatch_vcs/distros/fedora.txt new file mode 100644 index 00000000000..8441f14bba2 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/fedora.txt @@ -0,0 +1 @@ +python-hatch-vcs diff --git a/build/pkgs/hatch_vcs/distros/freebsd.txt b/build/pkgs/hatch_vcs/distros/freebsd.txt new file mode 100644 index 00000000000..53c6f650d58 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-hatch-vcs diff --git a/build/pkgs/hatch_vcs/distros/gentoo.txt b/build/pkgs/hatch_vcs/distros/gentoo.txt new file mode 100644 index 00000000000..ad6e0d96197 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/hatch-vcs diff --git a/build/pkgs/hatch_vcs/distros/macports.txt b/build/pkgs/hatch_vcs/distros/macports.txt new file mode 100644 index 00000000000..cdccfd5952e --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/macports.txt @@ -0,0 +1 @@ +py-hatch-vcs diff --git a/build/pkgs/hatch_vcs/distros/opensuse.txt b/build/pkgs/hatch_vcs/distros/opensuse.txt new file mode 100644 index 00000000000..cb34dc58d71 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/opensuse.txt @@ -0,0 +1 @@ +python-hatch_vcs diff --git a/build/pkgs/hatch_vcs/distros/void.txt b/build/pkgs/hatch_vcs/distros/void.txt new file mode 100644 index 00000000000..04e2069fbb3 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/void.txt @@ -0,0 +1 @@ +hatch-vcs diff --git a/build/pkgs/hatch_vcs/spkg-configure.m4 b/build/pkgs/hatch_vcs/spkg-configure.m4 new file mode 100644 index 00000000000..aa5a1c212df --- /dev/null +++ b/build/pkgs/hatch_vcs/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([hatch_vcs], [ + SAGE_PYTHON_PACKAGE_CHECK([hatch_vcs]) +]) diff --git a/build/pkgs/trove_classifiers/distros/alpine.txt b/build/pkgs/trove_classifiers/distros/alpine.txt new file mode 100644 index 00000000000..432fb829920 --- /dev/null +++ b/build/pkgs/trove_classifiers/distros/alpine.txt @@ -0,0 +1 @@ +py3-trove-classifiers diff --git a/build/pkgs/trove_classifiers/distros/arch.txt b/build/pkgs/trove_classifiers/distros/arch.txt new file mode 100644 index 00000000000..faa3f51e677 --- /dev/null +++ b/build/pkgs/trove_classifiers/distros/arch.txt @@ -0,0 +1 @@ +python-trove-classifiers diff --git a/build/pkgs/trove_classifiers/distros/fedora.txt b/build/pkgs/trove_classifiers/distros/fedora.txt new file mode 100644 index 00000000000..faa3f51e677 --- /dev/null +++ b/build/pkgs/trove_classifiers/distros/fedora.txt @@ -0,0 +1 @@ +python-trove-classifiers diff --git a/build/pkgs/trove_classifiers/distros/freebsd.txt b/build/pkgs/trove_classifiers/distros/freebsd.txt new file mode 100644 index 00000000000..661ffd3cb2f --- /dev/null +++ b/build/pkgs/trove_classifiers/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-trove-classifiers diff --git a/build/pkgs/trove_classifiers/distros/gentoo.txt b/build/pkgs/trove_classifiers/distros/gentoo.txt new file mode 100644 index 00000000000..5b2a99ef1a2 --- /dev/null +++ b/build/pkgs/trove_classifiers/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/trove-classifiers diff --git a/build/pkgs/trove_classifiers/distros/macports.txt b/build/pkgs/trove_classifiers/distros/macports.txt new file mode 100644 index 00000000000..01f8c85049e --- /dev/null +++ b/build/pkgs/trove_classifiers/distros/macports.txt @@ -0,0 +1 @@ +py-trove-classifiers diff --git a/build/pkgs/trove_classifiers/spkg-configure.m4 b/build/pkgs/trove_classifiers/spkg-configure.m4 new file mode 100644 index 00000000000..f364bd7b67c --- /dev/null +++ b/build/pkgs/trove_classifiers/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([trove_classifiers], [ + SAGE_PYTHON_PACKAGE_CHECK([trove_classifiers]) +]) From c259524566ef240296a58b445c95b68dc275cf3f Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Mon, 25 Sep 2023 19:47:23 +0100 Subject: [PATCH 11/16] spkg-configure for cython --- build/pkgs/cython/spkg-configure.m4 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 build/pkgs/cython/spkg-configure.m4 diff --git a/build/pkgs/cython/spkg-configure.m4 b/build/pkgs/cython/spkg-configure.m4 new file mode 100644 index 00000000000..5e4bfb9aa12 --- /dev/null +++ b/build/pkgs/cython/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([cython], [ + SAGE_PYTHON_PACKAGE_CHECK([cython]) +]) From aff12df6aa2125dc1be8e5736d0b2eb7f1c8a74b Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Tue, 26 Sep 2023 14:20:59 +0100 Subject: [PATCH 12/16] more spkg-configures and distros info --- build/pkgs/appnope/spkg-configure.m4 | 3 +++ build/pkgs/argon2_cffi_bindings/distros/alpine.txt | 1 + build/pkgs/argon2_cffi_bindings/distros/arch.txt | 1 + build/pkgs/argon2_cffi_bindings/distros/fedora.txt | 1 + build/pkgs/argon2_cffi_bindings/distros/freebsd.txt | 1 + build/pkgs/argon2_cffi_bindings/distros/gentoo.txt | 1 + build/pkgs/argon2_cffi_bindings/distros/macports.txt | 1 + build/pkgs/argon2_cffi_bindings/distros/opensuse.txt | 1 + build/pkgs/argon2_cffi_bindings/spkg-configure.m4 | 3 +++ build/pkgs/hatch_nodejs_version/distros/alpine.txt | 1 + build/pkgs/hatch_nodejs_version/distros/arch.txt | 1 + build/pkgs/hatch_nodejs_version/distros/debian.txt | 1 + build/pkgs/hatch_nodejs_version/distros/freebsd.txt | 1 + build/pkgs/hatch_nodejs_version/distros/opensuse.txt | 1 + build/pkgs/hatch_nodejs_version/spkg-configure.m4 | 3 +++ 15 files changed, 21 insertions(+) create mode 100644 build/pkgs/appnope/spkg-configure.m4 create mode 100644 build/pkgs/argon2_cffi_bindings/distros/alpine.txt create mode 100644 build/pkgs/argon2_cffi_bindings/distros/arch.txt create mode 100644 build/pkgs/argon2_cffi_bindings/distros/fedora.txt create mode 100644 build/pkgs/argon2_cffi_bindings/distros/freebsd.txt create mode 100644 build/pkgs/argon2_cffi_bindings/distros/gentoo.txt create mode 100644 build/pkgs/argon2_cffi_bindings/distros/macports.txt create mode 100644 build/pkgs/argon2_cffi_bindings/distros/opensuse.txt create mode 100644 build/pkgs/argon2_cffi_bindings/spkg-configure.m4 create mode 100644 build/pkgs/hatch_nodejs_version/distros/alpine.txt create mode 100644 build/pkgs/hatch_nodejs_version/distros/arch.txt create mode 100644 build/pkgs/hatch_nodejs_version/distros/debian.txt create mode 100644 build/pkgs/hatch_nodejs_version/distros/freebsd.txt create mode 100644 build/pkgs/hatch_nodejs_version/distros/opensuse.txt create mode 100644 build/pkgs/hatch_nodejs_version/spkg-configure.m4 diff --git a/build/pkgs/appnope/spkg-configure.m4 b/build/pkgs/appnope/spkg-configure.m4 new file mode 100644 index 00000000000..059e63eb4fd --- /dev/null +++ b/build/pkgs/appnope/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([appnope], [ + SAGE_PYTHON_PACKAGE_CHECK([appnope]) +]) diff --git a/build/pkgs/argon2_cffi_bindings/distros/alpine.txt b/build/pkgs/argon2_cffi_bindings/distros/alpine.txt new file mode 100644 index 00000000000..ae49cefff4e --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/distros/alpine.txt @@ -0,0 +1 @@ +py3-argon2-cffi-bindings diff --git a/build/pkgs/argon2_cffi_bindings/distros/arch.txt b/build/pkgs/argon2_cffi_bindings/distros/arch.txt new file mode 100644 index 00000000000..9da9b3cf29a --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/distros/arch.txt @@ -0,0 +1 @@ +python-argon2-cffi-bindings diff --git a/build/pkgs/argon2_cffi_bindings/distros/fedora.txt b/build/pkgs/argon2_cffi_bindings/distros/fedora.txt new file mode 100644 index 00000000000..9da9b3cf29a --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/distros/fedora.txt @@ -0,0 +1 @@ +python-argon2-cffi-bindings diff --git a/build/pkgs/argon2_cffi_bindings/distros/freebsd.txt b/build/pkgs/argon2_cffi_bindings/distros/freebsd.txt new file mode 100644 index 00000000000..70621e55ccc --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/distros/freebsd.txt @@ -0,0 +1 @@ +security/py-argon2-cffi-bindings diff --git a/build/pkgs/argon2_cffi_bindings/distros/gentoo.txt b/build/pkgs/argon2_cffi_bindings/distros/gentoo.txt new file mode 100644 index 00000000000..8a1d2c01312 --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/argon2-cffi-bindings diff --git a/build/pkgs/argon2_cffi_bindings/distros/macports.txt b/build/pkgs/argon2_cffi_bindings/distros/macports.txt new file mode 100644 index 00000000000..42e046a898d --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/distros/macports.txt @@ -0,0 +1 @@ +py-argon2-cffi-bindings diff --git a/build/pkgs/argon2_cffi_bindings/distros/opensuse.txt b/build/pkgs/argon2_cffi_bindings/distros/opensuse.txt new file mode 100644 index 00000000000..9da9b3cf29a --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/distros/opensuse.txt @@ -0,0 +1 @@ +python-argon2-cffi-bindings diff --git a/build/pkgs/argon2_cffi_bindings/spkg-configure.m4 b/build/pkgs/argon2_cffi_bindings/spkg-configure.m4 new file mode 100644 index 00000000000..e0c637d0757 --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([argon2_cffi_bindings], [ + SAGE_PYTHON_PACKAGE_CHECK([argon2_cffi_bindings]) +]) diff --git a/build/pkgs/hatch_nodejs_version/distros/alpine.txt b/build/pkgs/hatch_nodejs_version/distros/alpine.txt new file mode 100644 index 00000000000..6e393cf297b --- /dev/null +++ b/build/pkgs/hatch_nodejs_version/distros/alpine.txt @@ -0,0 +1 @@ +py3-hatch-nodejs-version diff --git a/build/pkgs/hatch_nodejs_version/distros/arch.txt b/build/pkgs/hatch_nodejs_version/distros/arch.txt new file mode 100644 index 00000000000..e045ff5442e --- /dev/null +++ b/build/pkgs/hatch_nodejs_version/distros/arch.txt @@ -0,0 +1 @@ +python-hatch-nodejs-version diff --git a/build/pkgs/hatch_nodejs_version/distros/debian.txt b/build/pkgs/hatch_nodejs_version/distros/debian.txt new file mode 100644 index 00000000000..e045ff5442e --- /dev/null +++ b/build/pkgs/hatch_nodejs_version/distros/debian.txt @@ -0,0 +1 @@ +python-hatch-nodejs-version diff --git a/build/pkgs/hatch_nodejs_version/distros/freebsd.txt b/build/pkgs/hatch_nodejs_version/distros/freebsd.txt new file mode 100644 index 00000000000..83177ce5196 --- /dev/null +++ b/build/pkgs/hatch_nodejs_version/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-hatch-nodejs-version diff --git a/build/pkgs/hatch_nodejs_version/distros/opensuse.txt b/build/pkgs/hatch_nodejs_version/distros/opensuse.txt new file mode 100644 index 00000000000..439415283d6 --- /dev/null +++ b/build/pkgs/hatch_nodejs_version/distros/opensuse.txt @@ -0,0 +1 @@ +python-hatch_nodejs_version diff --git a/build/pkgs/hatch_nodejs_version/spkg-configure.m4 b/build/pkgs/hatch_nodejs_version/spkg-configure.m4 new file mode 100644 index 00000000000..bc1b2c772cb --- /dev/null +++ b/build/pkgs/hatch_nodejs_version/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([hatch_nodejs_version], [ + SAGE_PYTHON_PACKAGE_CHECK([hatch_nodejs_version]) +]) From 0df6885ba69e39b924e3c2f01c9e2d22a1b55220 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 28 Sep 2023 22:35:17 +0100 Subject: [PATCH 13/16] leave hatch_nodejs_version intact, in preparation for its removal --- build/pkgs/hatch_nodejs_version/distros/alpine.txt | 1 - build/pkgs/hatch_nodejs_version/distros/arch.txt | 1 - build/pkgs/hatch_nodejs_version/distros/debian.txt | 1 - build/pkgs/hatch_nodejs_version/distros/freebsd.txt | 1 - build/pkgs/hatch_nodejs_version/distros/opensuse.txt | 1 - build/pkgs/hatch_nodejs_version/spkg-configure.m4 | 3 --- 6 files changed, 8 deletions(-) delete mode 100644 build/pkgs/hatch_nodejs_version/distros/alpine.txt delete mode 100644 build/pkgs/hatch_nodejs_version/distros/arch.txt delete mode 100644 build/pkgs/hatch_nodejs_version/distros/debian.txt delete mode 100644 build/pkgs/hatch_nodejs_version/distros/freebsd.txt delete mode 100644 build/pkgs/hatch_nodejs_version/distros/opensuse.txt delete mode 100644 build/pkgs/hatch_nodejs_version/spkg-configure.m4 diff --git a/build/pkgs/hatch_nodejs_version/distros/alpine.txt b/build/pkgs/hatch_nodejs_version/distros/alpine.txt deleted file mode 100644 index 6e393cf297b..00000000000 --- a/build/pkgs/hatch_nodejs_version/distros/alpine.txt +++ /dev/null @@ -1 +0,0 @@ -py3-hatch-nodejs-version diff --git a/build/pkgs/hatch_nodejs_version/distros/arch.txt b/build/pkgs/hatch_nodejs_version/distros/arch.txt deleted file mode 100644 index e045ff5442e..00000000000 --- a/build/pkgs/hatch_nodejs_version/distros/arch.txt +++ /dev/null @@ -1 +0,0 @@ -python-hatch-nodejs-version diff --git a/build/pkgs/hatch_nodejs_version/distros/debian.txt b/build/pkgs/hatch_nodejs_version/distros/debian.txt deleted file mode 100644 index e045ff5442e..00000000000 --- a/build/pkgs/hatch_nodejs_version/distros/debian.txt +++ /dev/null @@ -1 +0,0 @@ -python-hatch-nodejs-version diff --git a/build/pkgs/hatch_nodejs_version/distros/freebsd.txt b/build/pkgs/hatch_nodejs_version/distros/freebsd.txt deleted file mode 100644 index 83177ce5196..00000000000 --- a/build/pkgs/hatch_nodejs_version/distros/freebsd.txt +++ /dev/null @@ -1 +0,0 @@ -devel/py-hatch-nodejs-version diff --git a/build/pkgs/hatch_nodejs_version/distros/opensuse.txt b/build/pkgs/hatch_nodejs_version/distros/opensuse.txt deleted file mode 100644 index 439415283d6..00000000000 --- a/build/pkgs/hatch_nodejs_version/distros/opensuse.txt +++ /dev/null @@ -1 +0,0 @@ -python-hatch_nodejs_version diff --git a/build/pkgs/hatch_nodejs_version/spkg-configure.m4 b/build/pkgs/hatch_nodejs_version/spkg-configure.m4 deleted file mode 100644 index bc1b2c772cb..00000000000 --- a/build/pkgs/hatch_nodejs_version/spkg-configure.m4 +++ /dev/null @@ -1,3 +0,0 @@ -SAGE_SPKG_CONFIGURE([hatch_nodejs_version], [ - SAGE_PYTHON_PACKAGE_CHECK([hatch_nodejs_version]) -]) From a9c3665f8acd802e249f8e94a39fb30f0ea98e29 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Sat, 30 Sep 2023 23:45:14 +0100 Subject: [PATCH 14/16] adjust gentoo package name --- build/pkgs/stack_data/distros/gentoo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/stack_data/distros/gentoo.txt b/build/pkgs/stack_data/distros/gentoo.txt index 6f94c8c7fdc..88d042a3231 100644 --- a/build/pkgs/stack_data/distros/gentoo.txt +++ b/build/pkgs/stack_data/distros/gentoo.txt @@ -1 +1 @@ -dev-python/stack_data +dev-python/stack-data From 7c7ba0447ec9cc0b588e05835c729d9499e69846 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Mon, 2 Oct 2023 16:15:53 +0100 Subject: [PATCH 15/16] remove an extra copy --- build/pkgs/calver/distros/install-requires.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 build/pkgs/calver/distros/install-requires.txt diff --git a/build/pkgs/calver/distros/install-requires.txt b/build/pkgs/calver/distros/install-requires.txt deleted file mode 100644 index 62948b78bc0..00000000000 --- a/build/pkgs/calver/distros/install-requires.txt +++ /dev/null @@ -1 +0,0 @@ -calver From 27e037f0e98f4703830413b34656451aa78f8502 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Tue, 10 Oct 2023 14:30:37 +0100 Subject: [PATCH 16/16] allows system cython packages to work --- build/pkgs/cython/patches/5690.patch | 48 ++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 build/pkgs/cython/patches/5690.patch diff --git a/build/pkgs/cython/patches/5690.patch b/build/pkgs/cython/patches/5690.patch new file mode 100644 index 00000000000..cc927879e1f --- /dev/null +++ b/build/pkgs/cython/patches/5690.patch @@ -0,0 +1,48 @@ +diff --git a/Cython/Debugger/DebugWriter.py b/Cython/Debugger/DebugWriter.py +index 8b1fb75b027..2c3c310fc64 100644 +--- a/Cython/Debugger/DebugWriter.py ++++ b/Cython/Debugger/DebugWriter.py +@@ -18,6 +18,21 @@ + etree = None + + from ..Compiler import Errors ++from ..Compiler.StringEncoding import EncodedString ++ ++ ++def is_valid_tag(name): ++ """ ++ Names like '.0' are used internally for arguments ++ to functions creating generator expressions, ++ however they are not identifiers. ++ ++ See https://github.com/cython/cython/issues/5552 ++ """ ++ if isinstance(name, EncodedString): ++ if name.startswith(".") and name[1:].isdecimal(): ++ return False ++ return True + + + class CythonDebugWriter(object): +@@ -39,14 +54,17 @@ def __init__(self, output_dir): + self.start('cython_debug', attrs=dict(version='1.0')) + + def start(self, name, attrs=None): +- self.tb.start(name, attrs or {}) ++ if is_valid_tag(name): ++ self.tb.start(name, attrs or {}) + + def end(self, name): +- self.tb.end(name) ++ if is_valid_tag(name): ++ self.tb.end(name) + + def add_entry(self, name, **attrs): +- self.tb.start(name, attrs) +- self.tb.end(name) ++ if is_valid_tag(name): ++ self.tb.start(name, attrs) ++ self.tb.end(name) + + def serialize(self): + self.tb.end('Module')