From ed2b0897e200d601b4dd8eabf22e57935a06bffd Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 5 Apr 2024 23:32:52 -0700 Subject: [PATCH] **/tox.ini: Set upper bound tox < 4.14.1 because of https://github.com/tox-dev/tox/issues/3238 (fixup) --- pkgs/sagemath-categories/tox.ini | 2 +- pkgs/sagemath-environment/tox.ini | 2 +- pkgs/sagemath-objects/tox.ini | 2 +- pkgs/sagemath-repl/tox.ini | 2 +- pkgs/sagemath-standard/tox.ini | 2 +- src/tox.ini | 2 +- tox.ini | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/sagemath-categories/tox.ini b/pkgs/sagemath-categories/tox.ini index 6eaa17fc20e..2dff44b2f8d 100644 --- a/pkgs/sagemath-categories/tox.ini +++ b/pkgs/sagemath-categories/tox.ini @@ -14,7 +14,7 @@ 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,<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 index fec1966d9a9..502f6967798 100644 --- a/pkgs/sagemath-environment/tox.ini +++ b/pkgs/sagemath-environment/tox.ini @@ -14,7 +14,7 @@ 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,<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 index 3e539e2e3b0..24e7a2f107d 100644 --- a/pkgs/sagemath-objects/tox.ini +++ b/pkgs/sagemath-objects/tox.ini @@ -14,7 +14,7 @@ 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,<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 index d565aa7b2a4..f0874d4e22b 100644 --- a/pkgs/sagemath-repl/tox.ini +++ b/pkgs/sagemath-repl/tox.ini @@ -14,7 +14,7 @@ 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,<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 index c06afe8229d..6e38a8e0f23 100644 --- a/pkgs/sagemath-standard/tox.ini +++ b/pkgs/sagemath-standard/tox.ini @@ -63,7 +63,7 @@ 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,<4.14.1 + tox>=4.2, tox<4.14.1 [pkgenv] # Environment in which to build the sdist. diff --git a/src/tox.ini b/src/tox.ini index e0dc1509f1f..49172605b3e 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -28,7 +28,7 @@ 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,<4.14.1 + tox>=3.18, tox<4.14.1 [sagedirect] # Base for tox environments that bypass the virtual environment set up by tox, diff --git a/tox.ini b/tox.ini index c8d4a5a4ebc..49652fd9934 100644 --- a/tox.ini +++ b/tox.ini @@ -131,7 +131,7 @@ envlist = requires = # For repaired numerical factors in tox 4, need >= 4.2.7. # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1 - tox>=4.2.7,<4.14.1 + tox>=4.2.7, tox<4.14.1 skipsdist = true