Merge branch 'sagemath-categories-check' into ci_build_explicit_docke…

…r_exec
vbraun · Apr 16, 2024 · 412e3d1 · 412e3d1
2 parents b3f1cd7 + 2a8a958
commit 412e3d1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/pkgs/sagemath-categories/tox.ini b/pkgs/sagemath-categories/tox.ini
@@ -14,7 +14,8 @@ requires =
     # Auto-provision a modern tox.
     # [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
     # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1
-    tox>=4.2, tox<4.14.1
+    tox>=4.2
+    tox<4.14.1
 
 [pkgenv]
 # Environment in which to build the sdist.

diff --git a/pkgs/sagemath-environment/tox.ini b/pkgs/sagemath-environment/tox.ini
@@ -14,7 +14,8 @@ requires =
     # Auto-provision a modern tox.
     # [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
     # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1
-    tox>=4.2, tox<4.14.1
+    tox>=4.2
+    tox<4.14.1
 
 [pkgenv]
 # Environment in which to build the sdist.

diff --git a/pkgs/sagemath-objects/tox.ini b/pkgs/sagemath-objects/tox.ini
@@ -14,7 +14,8 @@ requires =
     # Auto-provision a modern tox.
     # [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
     # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1
-    tox>=4.2, tox<4.14.1
+    tox>=4.2
+    tox<4.14.1
 
 [pkgenv]
 # Environment in which to build the sdist.

diff --git a/pkgs/sagemath-repl/tox.ini b/pkgs/sagemath-repl/tox.ini
@@ -14,7 +14,8 @@ requires =
     # Auto-provision a modern tox.
     # [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
     # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1
-    tox>=4.2, tox<4.14.1
+    tox>=4.2
+    tox<4.14.1
 
 [pkgenv]
 # Environment in which to build the sdist.

diff --git a/pkgs/sagemath-standard/tox.ini b/pkgs/sagemath-standard/tox.ini
@@ -63,7 +63,8 @@ requires =
     # Auto-provision a modern tox.
     # [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
     # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1
-    tox>=4.2, tox<4.14.1
+    tox>=4.2
+    tox<4.14.1
 
 [pkgenv]
 # Environment in which to build the sdist.

diff --git a/src/sage/doctest/reporting.py b/src/sage/doctest/reporting.py
@@ -145,7 +145,8 @@ def were_doctests_with_optional_tag_run(self, tag):
         When latex is available, doctests marked with optional tag
         ``latex`` are run by default since :issue:`32174`::
 
-            sage: filename = os.path.join(SAGE_SRC,'sage','misc','latex.py')
+            sage: # needs SAGE_SRC
+            sage: filename = os.path.join(SAGE_SRC, 'sage', 'misc', 'latex.py')
             sage: DC = DocTestController(DocTestDefaults(), [filename])
             sage: DTR = DocTestReporter(DC)
             sage: DTR.were_doctests_with_optional_tag_run('latex')   # optional - latex

diff --git a/src/tox.ini b/src/tox.ini
@@ -28,7 +28,8 @@ skipsdist = true
 requires =
     # For the renamed "allowlist_externals" keyword, need >= 3.18
     # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1
-    tox>=3.18, tox<4.14.1
+    tox>=3.18
+    tox<4.14.1
 
 [sagedirect]
 # Base for tox environments that bypass the virtual environment set up by tox,