From 3c9c4c9812d86ccdbff782cd980a4daa10379236 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Thu, 2 Nov 2023 10:56:47 +0000 Subject: [PATCH 1/3] Allow to specify output directory for generated interpreters --- src/sage_setup/autogen/__init__.py | 4 +++- src/sage_setup/autogen/interpreters/__main__.py | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/sage_setup/autogen/__init__.py b/src/sage_setup/autogen/__init__.py index 6a0a6fdc5da..380983c06c7 100644 --- a/src/sage_setup/autogen/__init__.py +++ b/src/sage_setup/autogen/__init__.py @@ -1,6 +1,7 @@ import os + from . import interpreters -from sage.env import SAGE_SRC + def autogen_all(): """ @@ -9,6 +10,7 @@ def autogen_all(): Return a list of sub-packages that should be appended to the list of packages built/installed by setup.py. """ + from sage.env import SAGE_SRC interpreters.rebuild(os.path.join(SAGE_SRC, "sage", "ext", "interpreters")) return ['sage.ext.interpreters'] diff --git a/src/sage_setup/autogen/interpreters/__main__.py b/src/sage_setup/autogen/interpreters/__main__.py index fa78a6ab9b8..de07210db06 100644 --- a/src/sage_setup/autogen/interpreters/__main__.py +++ b/src/sage_setup/autogen/interpreters/__main__.py @@ -1,9 +1,18 @@ -from __future__ import print_function, absolute_import +from __future__ import absolute_import, print_function +import argparse import os -from sage.env import SAGE_SRC from . import rebuild +parser = argparse.ArgumentParser() +parser.add_argument("output_dir") +args = parser.parse_args() -rebuild(os.path.join(SAGE_SRC, "sage", "ext", "interpreters")) +output_dir = args.output_dir +if not output_dir: + from sage.env import SAGE_SRC + output_dir = os.path.join(SAGE_SRC, "sage", "ext", "interpreters") + + +rebuild(output_dir) From 45091b45502aeb520e83830e0e3b32589c920c96 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 15 Nov 2023 13:56:36 +0800 Subject: [PATCH 2/3] Remove outdated future import --- src/sage_setup/autogen/interpreters/__main__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/sage_setup/autogen/interpreters/__main__.py b/src/sage_setup/autogen/interpreters/__main__.py index de07210db06..96b25d61551 100644 --- a/src/sage_setup/autogen/interpreters/__main__.py +++ b/src/sage_setup/autogen/interpreters/__main__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import argparse import os From a19186171ae1c7571b7f35e7254037905868da91 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Tue, 21 Nov 2023 05:26:02 +0000 Subject: [PATCH 3/3] Remove fallback for output directory --- src/sage_setup/autogen/interpreters/__main__.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/sage_setup/autogen/interpreters/__main__.py b/src/sage_setup/autogen/interpreters/__main__.py index 96b25d61551..398a7b30039 100644 --- a/src/sage_setup/autogen/interpreters/__main__.py +++ b/src/sage_setup/autogen/interpreters/__main__.py @@ -1,16 +1,11 @@ +# Usage: python -m sage_setup.autogen.interpreters + import argparse -import os from . import rebuild parser = argparse.ArgumentParser() -parser.add_argument("output_dir") +parser.add_argument("output_dir", help="Output directory") args = parser.parse_args() -output_dir = args.output_dir -if not output_dir: - from sage.env import SAGE_SRC - output_dir = os.path.join(SAGE_SRC, "sage", "ext", "interpreters") - - -rebuild(output_dir) +rebuild(args.output_dir)