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/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 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) 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 diff --git a/pkgs/sage-conf/pyproject.toml b/pkgs/sage-conf/pyproject.toml deleted file mode 100644 index 9787c3bdf00..00000000000 --- a/pkgs/sage-conf/pyproject.toml +++ /dev/null @@ -1,3 +0,0 @@ -[build-system] -requires = ["setuptools", "wheel"] -build-backend = "setuptools.build_meta" diff --git a/pkgs/sage-conf/pyproject.toml.m4 b/pkgs/sage-conf/pyproject.toml.m4 new file mode 100644 index 00000000000..fdb69238bde --- /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 +] +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"]} diff --git a/pkgs/sage-conf/setup.cfg b/pkgs/sage-conf/setup.cfg deleted file mode 100644 index dac401c303d..00000000000 --- a/pkgs/sage-conf/setup.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[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 -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 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