From 5cdafb55f71b9a8a6feabd112a193a0e86c984b5 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Fri, 20 Oct 2023 10:06:16 +0000 Subject: [PATCH 01/10] pkgs/sage-conf: Move version from setup.cfg to pyproject.toml --- pkgs/sage-conf/pyproject.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/sage-conf/pyproject.toml b/pkgs/sage-conf/pyproject.toml index 9787c3bdf00..9b39d5d8816 100644 --- a/pkgs/sage-conf/pyproject.toml +++ b/pkgs/sage-conf/pyproject.toml @@ -1,3 +1,10 @@ [build-system] requires = ["setuptools", "wheel"] build-backend = "setuptools.build_meta" + +[project] +name = "sage-conf" +dynamic = ["version"] + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} From aff255eb8a6cd6b006d11f103fc6ad01df822924 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 25 Oct 2023 13:24:42 +0000 Subject: [PATCH 02/10] remove version specifier from setup.cfg --- pkgs/sage-conf/setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/sage-conf/setup.cfg b/pkgs/sage-conf/setup.cfg index dac401c303d..06f36099bd5 100644 --- a/pkgs/sage-conf/setup.cfg +++ b/pkgs/sage-conf/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = sage-conf -version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Configuration module for the SageMath library long_description = file: README.rst license = GNU General Public License (GPL) v3 or later From a301eb8ce34b4f16f3e603a36b27f2b1f7171186 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 28 Oct 2023 10:41:22 -0700 Subject: [PATCH 03/10] pkgs/sage-conf: ini2toml setup.cfg > pyproject.toml --- pkgs/sage-conf/pyproject.toml | 16 +++++++++++++++- pkgs/sage-conf/setup.cfg | 22 ---------------------- 2 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 pkgs/sage-conf/setup.cfg diff --git a/pkgs/sage-conf/pyproject.toml b/pkgs/sage-conf/pyproject.toml index 9b39d5d8816..d882f390302 100644 --- a/pkgs/sage-conf/pyproject.toml +++ b/pkgs/sage-conf/pyproject.toml @@ -1,10 +1,24 @@ [build-system] -requires = ["setuptools", "wheel"] +requires = ["setuptools>=61.2"] build-backend = "setuptools.build_meta" [project] name = "sage-conf" +description = "Sage: Open Source Mathematics Software: Configuration module for the SageMath library" +readme = "README.rst" +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.scripts] +sage-config = "sage_conf:_main" + +[tool.setuptools] +packages = ["_sage_conf"] +py-modules = ["sage_conf"] +script-files = ["bin/sage-env-config"] +include-package-data = false + [tool.setuptools.dynamic] version = {file = ["VERSION.txt"]} diff --git a/pkgs/sage-conf/setup.cfg b/pkgs/sage-conf/setup.cfg deleted file mode 100644 index 06f36099bd5..00000000000 --- a/pkgs/sage-conf/setup.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[metadata] -name = sage-conf -description = Sage: Open Source Mathematics Software: Configuration module for the SageMath library -long_description = file: README.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 = - _sage_conf - -py_modules = - sage_conf - -scripts = - bin/sage-env-config - -[options.entry_points] -console_scripts = - sage-config = sage_conf:_main From b12d8dd1c76a54eec56b50ba788b9c9093d2e6b7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 28 Oct 2023 10:48:13 -0700 Subject: [PATCH 04/10] Remove symlinks to removed file pkgs/sage-conf/setup.cfg --- pkgs/sage-conf_conda/setup.cfg | 1 - pkgs/sage-conf_pypi/setup.cfg | 1 - 2 files changed, 2 deletions(-) delete mode 120000 pkgs/sage-conf_conda/setup.cfg delete mode 120000 pkgs/sage-conf_pypi/setup.cfg diff --git a/pkgs/sage-conf_conda/setup.cfg b/pkgs/sage-conf_conda/setup.cfg deleted file mode 120000 index 93df2c80a4b..00000000000 --- a/pkgs/sage-conf_conda/setup.cfg +++ /dev/null @@ -1 +0,0 @@ -../sage-conf/setup.cfg \ No newline at end of file diff --git a/pkgs/sage-conf_pypi/setup.cfg b/pkgs/sage-conf_pypi/setup.cfg deleted file mode 120000 index 93df2c80a4b..00000000000 --- a/pkgs/sage-conf_pypi/setup.cfg +++ /dev/null @@ -1 +0,0 @@ -../sage-conf/setup.cfg \ No newline at end of file From 5b281a09e2b6005aa0aefb219880290b7e299b35 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 29 Oct 2023 20:54:43 -0700 Subject: [PATCH 05/10] build/pkgs/sage_conf/dependencies: Update --- build/pkgs/sage_conf/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sage_conf/dependencies b/build/pkgs/sage_conf/dependencies index f2bd00aaf0d..a202ce81bba 100644 --- a/build/pkgs/sage_conf/dependencies +++ b/build/pkgs/sage_conf/dependencies @@ -1 +1 @@ - $(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/setup.cfg $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config | $(PYTHON_TOOLCHAIN) $(PYTHON) + $(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/pyproject.toml $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config | $(PYTHON_TOOLCHAIN) $(PYTHON) From e6ee358f060659324af462e217cbdb0b9b5570f4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 7 Nov 2023 17:06:07 -0800 Subject: [PATCH 06/10] build/pkgs/sage_conf/bootstrap: New --- build/pkgs/sage_conf/bootstrap | 1 + 1 file changed, 1 insertion(+) create mode 120000 build/pkgs/sage_conf/bootstrap diff --git a/build/pkgs/sage_conf/bootstrap b/build/pkgs/sage_conf/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sage_conf/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file From 63e93c3e00a65ac2a61933acd9f7a54519a0250e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 7 Nov 2023 17:08:38 -0800 Subject: [PATCH 07/10] pkgs/sage-conf/pyproject.toml.m4: Use m4 comment --- pkgs/sage-conf/pyproject.toml.m4 | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/sage-conf/pyproject.toml.m4 diff --git a/pkgs/sage-conf/pyproject.toml.m4 b/pkgs/sage-conf/pyproject.toml.m4 new file mode 100644 index 00000000000..faae302cdb7 --- /dev/null +++ b/pkgs/sage-conf/pyproject.toml.m4 @@ -0,0 +1,44 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- +[build-system] +requires = [ + SPKG_INSTALL_REQUIRES_setuptools_wheel +] +build-backend = "setuptools.build_meta" + +[project] +name = "sage-conf" +description = "Sage: Open Source Mathematics Software: Configuration module for the SageMath library" +readme = "README.rst" +dnl Not including the standard metadata from pyproject_toml_metadata.m4 +dnl because sage-conf is GPL v3+. +license = {text = "GNU General Public License (GPL) v3 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"} +requires-python = ">=3.9, <3.12" +dynamic = ["version"] + +[project.scripts] +sage-config = "sage_conf:_main" + +[tool.setuptools] +packages = ["_sage_conf"] +py-modules = ["sage_conf"] +script-files = ["bin/sage-env-config"] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} From 46657a0efe253dcb578905b0a7e4994f102ddd67 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 10 Nov 2023 09:29:59 -0800 Subject: [PATCH 08/10] .gitignore: Update --- .gitignore | 1 + pkgs/sage-conf/.gitignore | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 43f58abcafe..0f180bb1bcb 100644 --- a/.gitignore +++ b/.gitignore @@ -193,6 +193,7 @@ build/bin/sage-build-env-config /pkgs/*/*.egg-info /pkgs/*/.tox +/pkgs/sage-conf/pyproject.toml /pkgs/sage-conf_pypi/sage_root/config.log /pkgs/sage-conf_pypi/sage_root/config.status /pkgs/sage-conf_pypi/sage_root/local/ diff --git a/pkgs/sage-conf/.gitignore b/pkgs/sage-conf/.gitignore index 2fff1627b9f..a495951e529 100644 --- a/pkgs/sage-conf/.gitignore +++ b/pkgs/sage-conf/.gitignore @@ -1,4 +1,6 @@ /_sage_conf/_conf.py +/setup.cfg +/pyproject.toml /build /dist /*.egg-info From 22341fbda67a0c1a3e68670336e09f523f193cc7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 10 Nov 2023 09:33:36 -0800 Subject: [PATCH 09/10] pkgs/sage-conf/pyproject.toml: Remove (generated from ...m4) --- pkgs/sage-conf/pyproject.toml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 pkgs/sage-conf/pyproject.toml diff --git a/pkgs/sage-conf/pyproject.toml b/pkgs/sage-conf/pyproject.toml deleted file mode 100644 index d882f390302..00000000000 --- a/pkgs/sage-conf/pyproject.toml +++ /dev/null @@ -1,24 +0,0 @@ -[build-system] -requires = ["setuptools>=61.2"] -build-backend = "setuptools.build_meta" - -[project] -name = "sage-conf" -description = "Sage: Open Source Mathematics Software: Configuration module for the SageMath library" -readme = "README.rst" -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.scripts] -sage-config = "sage_conf:_main" - -[tool.setuptools] -packages = ["_sage_conf"] -py-modules = ["sage_conf"] -script-files = ["bin/sage-env-config"] -include-package-data = false - -[tool.setuptools.dynamic] -version = {file = ["VERSION.txt"]} From edbc95467fddefee2f4e6062b778281a85797daa Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 19 Dec 2023 16:08:46 -0800 Subject: [PATCH 10/10] pkgs/sage-conf/pyproject.toml.m4: Change setuptools_wheel to setuptools after #36885 --- pkgs/sage-conf/pyproject.toml.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/sage-conf/pyproject.toml.m4 b/pkgs/sage-conf/pyproject.toml.m4 index faae302cdb7..fdb69238bde 100644 --- a/pkgs/sage-conf/pyproject.toml.m4 +++ b/pkgs/sage-conf/pyproject.toml.m4 @@ -1,7 +1,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] requires = [ - SPKG_INSTALL_REQUIRES_setuptools_wheel + SPKG_INSTALL_REQUIRES_setuptools ] build-backend = "setuptools.build_meta"