Merge pull request #4553 from Liam-DeVoe/tox-ci

Liam-DeVoe · web-flow · commit 3b95a47cf9b9 · 2025-09-22T19:48:23.000-04:00
Respect `__TOX_ENVIRONMENT_VARIABLE_ORIGINAL_CI` under tox
diff --git a/hypothesis-python/RELEASE.rst b/hypothesis-python/RELEASE.rst
@@ -0,0 +1,3 @@
+RELEASE_TYPE: patch
+
+The automatic switch to the CI :class:`settings profile <hypothesis.settings>` now works under :pypi:`tox` (for ``tox >= 4.30.0``).
diff --git a/hypothesis-python/src/hypothesis/_settings.py b/hypothesis-python/src/hypothesis/_settings.py
@@ -294,7 +294,9 @@ def __repr__(self) -> str:
 # see https://adamj.eu/tech/2020/03/09/detect-if-your-tests-are-running-on-ci
 # initially from https://github.com/tox-dev/tox/blob/e911788a/src/tox/util/ci.py
 _CI_VARS = {
-    "CI": None,  # GitHub Actions, Travis CI, and AppVeyor
+    "CI": None,  # various, including GitHub Actions, Travis CI, and AppVeyor
+    # see https://github.com/tox-dev/tox/issues/3442
+    "__TOX_ENVIRONMENT_VARIABLE_ORIGINAL_CI": None,
     "TF_BUILD": "true",  # Azure Pipelines
     "bamboo.buildKey": None,  # Bamboo
     "BUILDKITE": "true",  # Buildkite

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+RELEASE_TYPE: patch`
	`2`	`+`
	`3`	+The automatic switch to the CI :class:`settings profile <hypothesis.settings>` now works under :pypi:`tox` (for ``tox >= 4.30.0``).