From 4ae68cc3cf82ab8d3ce5676044fae0fbfe3f8f38 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 9 Jun 2022 14:38:55 -0700 Subject: [PATCH 1/3] foo From d242f96d3302bb9124dd5dc345e80b76e2f3caa3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 9 Jun 2022 15:08:33 -0700 Subject: [PATCH 2/3] src/sage/doctest/control.py: Show also 'git describe --always --dirty' --- src/sage/doctest/control.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py index a9d11d0863e..f8e20be3016 100644 --- a/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py @@ -1337,6 +1337,16 @@ def run(self): self.log("Git branch: " + branch, end="") except subprocess.CalledProcessError: pass + try: + ref = subprocess.check_output(["git", + "--git-dir=" + SAGE_ROOT_GIT, + "describe", + "--always", + "--dirty"]) + ref = ref.decode('utf-8') + self.log("Git ref: " + ref, end="") + except subprocess.CalledProcessError: + pass self.log("Using --optional=" + self._optional_tags_string()) available_software._allow_external = self.options.optional is True or 'external' in self.options.optional From f2468abaa1275cf58dd1ad5cafd111478d0df5ba Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 9 Jun 2022 15:08:56 -0700 Subject: [PATCH 3/3] src/sage/doctest/control.py: Show SAGE_LOCAL, SAGE_VENV --- src/sage/doctest/control.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py index f8e20be3016..85866a52e76 100644 --- a/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py @@ -1322,7 +1322,7 @@ def run(self): return self.run_val_gdb() else: self.create_run_id() - from sage.env import SAGE_ROOT_GIT + from sage.env import SAGE_ROOT_GIT, SAGE_LOCAL, SAGE_VENV # SAGE_ROOT_GIT can be None on distributions which typically # only have the SAGE_LOCAL install tree but not SAGE_ROOT if (SAGE_ROOT_GIT is not None) and os.path.isdir(SAGE_ROOT_GIT): @@ -1348,6 +1348,8 @@ def run(self): except subprocess.CalledProcessError: pass + self.log(f"Running with {SAGE_LOCAL=} and {SAGE_VENV=}") + self.log("Using --optional=" + self._optional_tags_string()) available_software._allow_external = self.options.optional is True or 'external' in self.options.optional self.log("Features to be detected: " + ','.join(available_software.detectable()))