From d514d8d4a124e3b98a00e36426db3715c95c1bd6 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 19 Dec 2022 19:17:31 -0800 Subject: [PATCH 1/8] pkgs/sage-sws2rst (pyproject.toml): Convert from setup.cfg using ini2toml-0.11.3 --- pkgs/sage-sws2rst/pyproject.toml | 25 +++++++++++++++++++++++++ pkgs/sage-sws2rst/setup.cfg | 16 ---------------- 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/sage-sws2rst/pyproject.toml delete mode 100644 pkgs/sage-sws2rst/setup.cfg diff --git a/pkgs/sage-sws2rst/pyproject.toml b/pkgs/sage-sws2rst/pyproject.toml new file mode 100644 index 00000000000..1232437fb1e --- /dev/null +++ b/pkgs/sage-sws2rst/pyproject.toml @@ -0,0 +1,25 @@ +[build-system] +requires = ["setuptools>=61.2"] +build-backend = "setuptools.build_meta" + +[project] +name = "sage-sws2rst" +description = "Sage: Open Source Mathematics Software: SageNB worksheet converter" +license = {text = "GNU General Public License (GPL) v3 or later"} +authors = [{name = "The Sage Developers", email = "sage-support@googlegroups.com"}] +urls = {Homepage = "https://www.sagemath.org"} +dynamic = ["version"] + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[tool.setuptools] +script-files = ["bin/sage-sws2rst"] +include-package-data = false + +[tool.setuptools.packages] +find = {namespaces = false} + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} diff --git a/pkgs/sage-sws2rst/setup.cfg b/pkgs/sage-sws2rst/setup.cfg deleted file mode 100644 index 129f46d55e2..00000000000 --- a/pkgs/sage-sws2rst/setup.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[metadata] -name = sage-sws2rst -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: SageNB worksheet converter -long_description = file: README.rst -long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v3 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -[options] -packages = find: - -scripts = - bin/sage-sws2rst From 6fa10e9add40e04d0faa9525adcdb299543b2b05 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 28 Oct 2023 11:03:06 -0700 Subject: [PATCH 2/8] pkgs/sage-docbuild (pyproject.toml): Convert from setup.cfg using ini2toml-0.13 --- pkgs/sage-docbuild/pyproject.toml | 40 +++++++++++++++++++++++++++++++ pkgs/sage-docbuild/setup.cfg | 32 ------------------------- 2 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 pkgs/sage-docbuild/pyproject.toml delete mode 100644 pkgs/sage-docbuild/setup.cfg diff --git a/pkgs/sage-docbuild/pyproject.toml b/pkgs/sage-docbuild/pyproject.toml new file mode 100644 index 00000000000..77840653af0 --- /dev/null +++ b/pkgs/sage-docbuild/pyproject.toml @@ -0,0 +1,40 @@ +[build-system] +requires = ["setuptools>=61.2"] +build-backend = "setuptools.build_meta" + +[project] +name = "sage-docbuild" +description = "Sage: Open Source Mathematics Software: Build system of the Sage documentation" +license = {text = "GNU General Public License (GPL) v2 or later"} +authors = [{name = "The Sage Developers", email = "sage-support@googlegroups.com"}] +classifiers = [ + "Development Status :: 6 - Mature", + "Intended Audience :: Education", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", + "Operating System :: POSIX", + "Operating System :: MacOS :: MacOS X", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: Implementation :: CPython", + "Topic :: Scientific/Engineering :: Mathematics", +] +urls = {Homepage = "https://www.sagemath.org"} +dependencies = ["sphinx"] +dynamic = ["version"] + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[tool.setuptools] +packages = [ + "sage_docbuild", + "sage_docbuild.ext", +] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} diff --git a/pkgs/sage-docbuild/setup.cfg b/pkgs/sage-docbuild/setup.cfg deleted file mode 100644 index 596f9b4506e..00000000000 --- a/pkgs/sage-docbuild/setup.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[metadata] -name = sage-docbuild -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Build system of the Sage documentation -long_description = file: README.rst -long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics - -[options] -packages = - sage_docbuild - sage_docbuild.ext - -install_requires = - sphinx From c67bd9a39f8c5556c335a36a788f9fbde2504789 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 28 Oct 2023 11:04:33 -0700 Subject: [PATCH 3/8] pkgs/sage-setup (pyproject.toml): Convert from setup.cfg using ini2toml-0.13 --- pkgs/sage-setup/pyproject.toml | 48 ++++++++++++++++++++++++++++++++++ pkgs/sage-setup/setup.cfg | 39 --------------------------- 2 files changed, 48 insertions(+), 39 deletions(-) create mode 100644 pkgs/sage-setup/pyproject.toml delete mode 100644 pkgs/sage-setup/setup.cfg diff --git a/pkgs/sage-setup/pyproject.toml b/pkgs/sage-setup/pyproject.toml new file mode 100644 index 00000000000..8042e92a244 --- /dev/null +++ b/pkgs/sage-setup/pyproject.toml @@ -0,0 +1,48 @@ +[build-system] +requires = ["setuptools>=61.2"] +build-backend = "setuptools.build_meta" + +[project] +name = "sage-setup" +description = "Sage: Open Source Mathematics Software: Build system of the Sage library" +license = {text = "GNU General Public License (GPL) v2 or later"} +authors = [{name = "The Sage Developers", email = "sage-support@googlegroups.com"}] +classifiers = [ + "Development Status :: 6 - Mature", + "Intended Audience :: Education", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", + "Operating System :: POSIX", + "Operating System :: MacOS :: MacOS X", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: Implementation :: CPython", + "Topic :: Scientific/Engineering :: Mathematics", +] +urls = {Homepage = "https://www.sagemath.org"} +requires-python = ">=3.9, <3.12" +dependencies = [ + "pkgconfig", + "jinja2", +] +dynamic = ["version"] + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[tool.setuptools] +packages = [ + "sage_setup", + "sage_setup.autogen", + "sage_setup.autogen.interpreters", + "sage_setup.autogen.interpreters.specs", + "sage_setup.command", +] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} diff --git a/pkgs/sage-setup/setup.cfg b/pkgs/sage-setup/setup.cfg deleted file mode 100644 index 2355ef6b301..00000000000 --- a/pkgs/sage-setup/setup.cfg +++ /dev/null @@ -1,39 +0,0 @@ -[metadata] -name = sage-setup -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Build system of the Sage library -long_description = file: README.rst -long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics - -[options] -packages = - sage_setup - sage_setup.autogen - sage_setup.autogen.interpreters - sage_setup.autogen.interpreters.specs - sage_setup.command - -python_requires = >=3.9, <3.12 - -install_requires = - pkgconfig - jinja2 From 2b94d8d8f676ea39e3e8adb588af735b198a0a0d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 28 Oct 2023 11:05:31 -0700 Subject: [PATCH 4/8] pkgs/sage-setup/pyproject.toml: Remove Python 3.8 --- pkgs/sage-setup/pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/sage-setup/pyproject.toml b/pkgs/sage-setup/pyproject.toml index 8042e92a244..d8a870d2c92 100644 --- a/pkgs/sage-setup/pyproject.toml +++ b/pkgs/sage-setup/pyproject.toml @@ -15,7 +15,6 @@ classifiers = [ "Operating System :: POSIX", "Operating System :: MacOS :: MacOS X", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", From 02799e4c29a068e386259ea8908a87ca4289b9a5 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 29 Oct 2023 18:06:30 -0700 Subject: [PATCH 5/8] pkgs/sage-setup/pyproject.toml: Remove pkgconfig, make jinja2 an optional dep --- pkgs/sage-setup/pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/sage-setup/pyproject.toml b/pkgs/sage-setup/pyproject.toml index d8a870d2c92..1499fe4c9ba 100644 --- a/pkgs/sage-setup/pyproject.toml +++ b/pkgs/sage-setup/pyproject.toml @@ -23,16 +23,16 @@ classifiers = [ ] urls = {Homepage = "https://www.sagemath.org"} requires-python = ">=3.9, <3.12" -dependencies = [ - "pkgconfig", - "jinja2", -] +dependencies = [] dynamic = ["version"] [project.readme] file = "README.rst" content-type = "text/x-rst" +[project.optional-dependencies] +autogen = ["jinja2"] + [tool.setuptools] packages = [ "sage_setup", From 0eef9811bcef33209b3e8140f1275978c26578cd Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 29 Oct 2023 18:08:01 -0700 Subject: [PATCH 6/8] src/pyproject.toml.m4: Use sage_setup[autogen] --- src/pyproject.toml.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pyproject.toml.m4 b/src/pyproject.toml.m4 index f707b6f890e..2b61ea041ea 100644 --- a/src/pyproject.toml.m4 +++ b/src/pyproject.toml.m4 @@ -1,6 +1,7 @@ [build-system] # Minimum requirements for the build system to execute. requires = [ + "sage_setup[autogen]", # Some version of sage-conf is required. # Note that PEP517/518 have no notion of optional sage_spkg dependencies: # https://github.com/pypa/pip/issues/6144 From 7da883413705c480d3ad37232b01bbc9e627fa17 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 29 Oct 2023 21:23:28 -0700 Subject: [PATCH 7/8] pkgs/sagemath-{bliss,coxeter3,...}/pyproject.toml.m4: Add pkgconfig to build-system requires --- pkgs/sagemath-bliss/pyproject.toml.m4 | 1 + pkgs/sagemath-coxeter3/pyproject.toml.m4 | 1 + pkgs/sagemath-mcqd/pyproject.toml.m4 | 1 + pkgs/sagemath-meataxe/pyproject.toml.m4 | 1 + pkgs/sagemath-sirocco/pyproject.toml.m4 | 1 + pkgs/sagemath-tdlib/pyproject.toml.m4 | 1 + 6 files changed, 6 insertions(+) diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 index 1cbcdf7e162..7783c12c118 100644 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -8,5 +8,6 @@ requires = [ SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4 index a7d65382b21..69613011371 100644 --- a/pkgs/sagemath-coxeter3/pyproject.toml.m4 +++ b/pkgs/sagemath-coxeter3/pyproject.toml.m4 @@ -7,5 +7,6 @@ requires = [ SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4 index 7e651119193..bb34e4c5eb9 100644 --- a/pkgs/sagemath-mcqd/pyproject.toml.m4 +++ b/pkgs/sagemath-mcqd/pyproject.toml.m4 @@ -8,5 +8,6 @@ requires = [ SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_memory_allocator SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4 index a7d65382b21..69613011371 100644 --- a/pkgs/sagemath-meataxe/pyproject.toml.m4 +++ b/pkgs/sagemath-meataxe/pyproject.toml.m4 @@ -7,5 +7,6 @@ requires = [ SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4 index 99894dd5e5e..684ed189d9f 100644 --- a/pkgs/sagemath-sirocco/pyproject.toml.m4 +++ b/pkgs/sagemath-sirocco/pyproject.toml.m4 @@ -8,5 +8,6 @@ requires = [ SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_cypari SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4 index a7d65382b21..69613011371 100644 --- a/pkgs/sagemath-tdlib/pyproject.toml.m4 +++ b/pkgs/sagemath-tdlib/pyproject.toml.m4 @@ -7,5 +7,6 @@ requires = [ SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" From 815ce133a4ad4e937b6cc22e78528e3c44e945fc Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 29 Oct 2023 21:42:04 -0700 Subject: [PATCH 8/8] pkgs/sagemath-{objects,categories}/pyproject.toml.m4: Add pkgconfig to build-system requires --- pkgs/sagemath-categories/pyproject.toml.m4 | 1 + pkgs/sagemath-objects/pyproject.toml.m4 | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/sagemath-categories/pyproject.toml.m4 b/pkgs/sagemath-categories/pyproject.toml.m4 index cf4c97f1fd1..4049f5868a4 100644 --- a/pkgs/sagemath-categories/pyproject.toml.m4 +++ b/pkgs/sagemath-categories/pyproject.toml.m4 @@ -10,5 +10,6 @@ requires = [ SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_gmpy2 SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-objects/pyproject.toml.m4 b/pkgs/sagemath-objects/pyproject.toml.m4 index d8fda57a8f8..ec98813d439 100644 --- a/pkgs/sagemath-objects/pyproject.toml.m4 +++ b/pkgs/sagemath-objects/pyproject.toml.m4 @@ -9,5 +9,6 @@ requires = [ SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_gmpy2 SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta"