Merge branch 'main' into feat/analytics-url-213

Author: adamvialpando

.github/workflows/pytest.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
 
     steps:
       - name: Cloning repo

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 26.5.0
+    rev: 26.5.1
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "5.5.0"
+    ".": "6.0.0"
 }

CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [6.0.0](https://github.com/Flagsmith/flagsmith-python-client/compare/v5.5.0...v6.0.0) (2026-06-26)
+
+### ⚠ BREAKING CHANGES
+
+- drop Python 3.9 support to allow urllib3 >=2.7.0
+  ([#227](https://github.com/Flagsmith/flagsmith-python-client/issues/227))
+
+### Features
+
+- only track exposure when experiment feature is enabled
+  ([#226](https://github.com/Flagsmith/flagsmith-python-client/issues/226))
+  ([30112aa](https://github.com/Flagsmith/flagsmith-python-client/commit/30112aa187af66c00171000b199e158c88142b7c))
+
+### Bug Fixes
+
+- Background threads leaking across tests ([#229](https://github.com/Flagsmith/flagsmith-python-client/issues/229))
+  ([0615a9d](https://github.com/Flagsmith/flagsmith-python-client/commit/0615a9d760b047ae8a02dec8ac412f171e9e7f5e))
+
+### CI
+
+- pre-commit autoupdate ([#219](https://github.com/Flagsmith/flagsmith-python-client/issues/219))
+  ([134e6b6](https://github.com/Flagsmith/flagsmith-python-client/commit/134e6b65ebe11e89a37ae2d1c98b487871d5a216))
+
+### Dependency Updates
+
+- drop Python 3.9 support to allow urllib3 >=2.7.0
+  ([#227](https://github.com/Flagsmith/flagsmith-python-client/issues/227))
+  ([814e67e](https://github.com/Flagsmith/flagsmith-python-client/commit/814e67ef1e1e5905dfcfdfd3e629cdf3fc7855e6))
+
+### Other
+
+- **deps-dev:** bump pytest from 7.4.4 to 9.0.3
+  ([#228](https://github.com/Flagsmith/flagsmith-python-client/issues/228))
+  ([f00eff9](https://github.com/Flagsmith/flagsmith-python-client/commit/f00eff954527e5d031789be7a33466c05f9d1adb))
+- **deps:** bump idna from 3.10 to 3.15 ([#218](https://github.com/Flagsmith/flagsmith-python-client/issues/218))
+  ([4d71722](https://github.com/Flagsmith/flagsmith-python-client/commit/4d71722421d3692af07d68bbf71216b4de1b2eed))
+
 ## [5.5.0](https://github.com/Flagsmith/flagsmith-python-client/compare/v5.4.0...v5.5.0) (2026-06-09)
 
 ### Features

flagsmith/flagsmith.py

@@ -370,12 +370,13 @@ def get_experiment_flag(
 
         Skips the exposure event when the resolved flag is a `DefaultFlag`
         (i.e. the feature was not present and was served via the
-        `default_flag_handler`), to keep experimentation data clean.
+        `default_flag_handler`) or when the feature is disabled, to keep
+        experimentation data clean.
         """
         if not self._event_processor:
             raise ValueError("Events must be enabled to use experiment flags.")
         flag = self.get_identity_flags(identifier, traits).get_flag(feature_name)
-        if isinstance(flag, Flag):
+        if isinstance(flag, Flag) and flag.enabled:
             self.track_exposure_event(
                 feature_name=feature_name,
                 identifier=identifier,

flagsmith/polling_manager.py

@@ -2,7 +2,6 @@
 
 import logging
 import threading
-import time
 import typing
 
 if typing.TYPE_CHECKING:
@@ -26,8 +25,11 @@ def __init__(
 
     def run(self) -> None:
         while not self._stop_event.is_set():
-            self.main.update_environment()
-            time.sleep(self.refresh_interval_seconds)
+            try:
+                self.main.update_environment()
+            except Exception:
+                logger.exception("Error updating environment")
+            self._stop_event.wait(self.refresh_interval_seconds)
 
     def stop(self) -> None:
         self._stop_event.set()

flagsmith/streaming_manager.py

@@ -40,8 +40,9 @@ def run(self) -> None:
                     for event in sse_client.events():
                         self.on_event(map_sse_event_to_stream_event(event))
 
-            except (requests.RequestException, ValueError, TypeError):
+            except Exception:
                 logger.exception("Error opening or reading from the event stream")
+                self._stop_event.wait(1)
 
     def stop(self) -> None:
         self._stop_event.set()

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flagsmith"
-version = "5.5.0"
+version = "6.0.0"
 description = "Flagsmith Python SDK"
 authors = ["Flagsmith <support@flagsmith.com>"]
 license = "BSD3"
@@ -12,7 +12,7 @@ packages = [{ include = "flagsmith" }]
 [tool.poetry.dependencies]
 flagsmith-flag-engine = "^10.2.0"
 iso8601 = { version = "^2.1.0", python = "<3.11" }
-python = ">=3.9,<4"
+python = ">=3.10,<4"
 requests = "^2.32.3"
 requests-futures = "^1.0.1"
 sseclient-py = "^1.8.0"
@@ -22,11 +22,11 @@ typing-extensions = "^4.15.0"
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-mypy = { version = "^1.16.1", python = ">=3.9,<4" }
-pytest = "^7.4.0"
+mypy = "^1.16.1"
+pytest = ">=7.4,<10.0"
 pytest-cov = "^4.1.0"
 pytest-mock = "^3.6.1"
-pre-commit = { version = "^4.2.0", python = ">=3.9,<4" }
+pre-commit = "^4.2.0"
 responses = "^0.24.1"
 types-requests = "^2.32"
 pyfakefs = "^5.9.2"
@@ -35,7 +35,7 @@ pyfakefs = "^5.9.2"
 exclude = ["example/*"]
 
 [tool.black]
-target-version = ["py39"]
+target-version = ["py310"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pyproject.toml

@@ -41,10 +41,14 @@ def tracking_init(self: Flagsmith, *args: typing.Any, **kwargs: typing.Any) -> N
     monkeypatch.setattr(Flagsmith, "__init__", tracking_init)
     yield
     for flagsmith in instances:
-        if getattr(flagsmith, "environment_data_polling_manager_thread", None):
-            flagsmith.environment_data_polling_manager_thread.stop()
-        if getattr(flagsmith, "event_stream_thread", None):
-            flagsmith.event_stream_thread.stop()
+        if polling := getattr(
+            flagsmith, "environment_data_polling_manager_thread", None
+        ):
+            polling.stop()
+            polling.join(timeout=5)
+        if stream := getattr(flagsmith, "event_stream_thread", None):
+            stream.stop()
+            stream.join(timeout=5)
         if flagsmith._event_processor:
             flagsmith._event_processor.stop()