Bump Ruff and fix merge markers

hownowstephen · hownowstephen · commit c77bd64bd2ee · 2026-05-05T13:56:34.000-04:00
diff --git a/customerio/client_base.py b/customerio/client_base.py
@@ -108,11 +108,6 @@ def _build_session(self):
         return session
 
     def _close(self):
-<<<<<<< ci-fixes
         if not self.use_connection_pooling and self._current_session is not None:
-=======
-        # if we're not using pooling; clean up the resources.
-        if (not self.use_connection_pooling and self._current_session is not None):
->>>>>>> main
             self._current_session.close()
             self._current_session = None
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,7 +35,7 @@ classifiers = [
 [project.optional-dependencies]
 dev = [
     "build>=1.2.2",
-    "ruff>=0.14.0",
+    "ruff>=0.15.12",
     "twine>=6.1.0",
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ classifiers = [`
`35`	`35`	`[project.optional-dependencies]`
`36`	`36`	`dev = [`
`37`	`37`	`"build>=1.2.2",`
`38`		`- "ruff>=0.14.0",`
	`38`	`+ "ruff>=0.15.12",`
`39`	`39`	`"twine>=6.1.0",`
`40`	`40`	`]`
`41`	`41`