Merge branch 'master' into provider-conformance-realization

Author: Liam-DeVoe

hypothesis-python/docs/changelog.rst

@@ -18,6 +18,14 @@ Hypothesis 6.x
 
     .. include:: ../RELEASE.rst
 
+.. _v6.140.2:
+
+--------------------
+6.140.2 - 2025-09-23
+--------------------
+
+The automatic switch to the CI :class:`settings profile <hypothesis.settings>` now works under :pypi:`tox` (for ``tox >= 4.30.0``).
+
 .. _v6.140.1:
 
 --------------------

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

hypothesis-python/src/hypothesis/version.py

@@ -8,5 +8,5 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-__version_info__ = (6, 140, 1)
+__version_info__ = (6, 140, 2)
 __version__ = ".".join(map(str, __version_info__))