build/pkgs/sage_conf: Install with flit instead of setuptools

sagemath · Jun 13, 2020 · e537d48 · e537d48
1 parent 5e7155e
commit e537d48
Show file tree

Hide file tree

Showing 11 changed files with 644 additions and 26 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ sageruntime: base-toolchain
 
 # CONFIG_FILES lists all files that appear in AC_CONFIG_FILES in configure.ac;
 # except for build/make/Makefile-auto, which is unused by the build system
-CONFIG_FILES = build/make/Makefile src/Makefile src/bin/sage-env-config build/bin/sage-build-env-config build/pkgs/sage_conf/src/sage_conf.py build/pkgs/sage_conf/src/setup.cfg
+CONFIG_FILES = build/make/Makefile src/Makefile src/bin/sage-env-config build/bin/sage-build-env-config src/sage_conf.py
 
 # SPKG_COLLECT_FILES contains all files that influence the SAGE_SPKG_COLLECT macro
 SPKG_COLLECT_FILES = build/pkgs/*/type build/pkgs/*/package-version.txt build/pkgs/*/dependencies build/pkgs/*/requirements.txt build/pkgs/*/checksums.ini build/pkgs/*/spkg-install

diff --git a/build/pkgs/sage_conf/dependencies b/build/pkgs/sage_conf/dependencies
@@ -1 +1 @@
-$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg | $(PYTHON_TOOLCHAIN)
+$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py | $(PYTHON_TOOLCHAIN) flit
diff --git a/build/pkgs/sage_conf/src/.gitignore b/build/pkgs/sage_conf/src/.gitignore
diff --git a/build/pkgs/sage_conf/src/LICENSE b/build/pkgs/sage_conf/src/LICENSE
diff --git a/build/pkgs/sage_conf/README.rst → build/pkgs/sage_conf/src/README.rst b/build/pkgs/sage_conf/README.rst → build/pkgs/sage_conf/src/README.rst
diff --git a/build/pkgs/sage_conf/src/pyproject.toml b/build/pkgs/sage_conf/src/pyproject.toml
@@ -0,0 +1,15 @@
+[build-system]
+requires = ["flit_core >=2,<4"]
+build-backend = "flit_core.buildapi"
+
+[tool.flit.metadata]
+module = "sage_conf"
+author = "The Sage Developers"
+author-email = "[email protected]"
+home-page = "https://www.sagemath.org"
+classifiers = ["License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"]
+description-file = "README.rst"
+
+[tool.flit.scripts]
+#sage-env-config = "bin/sage-env-config"
+sage-config = "sage_conf:_main"
diff --git a/build/pkgs/sage_conf/src/sage_conf.py b/build/pkgs/sage_conf/src/sage_conf.py
@@ -0,0 +1 @@
+../../../../src/sage_conf.py
diff --git a/build/pkgs/sage_conf/src/setup.cfg.in b/build/pkgs/sage_conf/src/setup.cfg.in
diff --git a/build/pkgs/sage_conf/src/setup.py b/build/pkgs/sage_conf/src/setup.py
diff --git a/configure.ac b/configure.ac
@@ -463,7 +463,7 @@ dnl AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([build/make/Makefile-auto build/make/Makefile src/Makefile])
 AC_CONFIG_FILES([src/bin/sage-env-config build/bin/sage-build-env-config])
 
-AC_CONFIG_FILES([build/pkgs/sage_conf/src/sage_conf.py build/pkgs/sage_conf/src/setup.cfg])
+AC_CONFIG_FILES([src/sage_conf.py])
 
 dnl Create basic directories needed for Sage
 AC_CONFIG_COMMANDS(mkdirs,

diff --git a/build/pkgs/sage_conf/src/sage_conf.py.in → src/sage_conf.py.in b/build/pkgs/sage_conf/src/sage_conf.py.in → src/sage_conf.py.in
@@ -1,5 +1,11 @@
 # @configure_input@
 
+r"""
+Configuration information for sagelib
+"""
+
+__version__ = "@PACKAGE_VERSION@"
+
 VERSION = "@PACKAGE_VERSION@"
 
 MAXIMA = "@prefix@/bin/maxima"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg \| $(PYTHON_TOOLCHAIN)
		$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py \| $(PYTHON_TOOLCHAIN) flit