Merge pull request #2647 from sopel-irc/urllib3-cap

build: pin urllib3<2.3 to accommodate our old fork of vcrpy

dev-requirements.txt

@@ -20,6 +20,9 @@ sphinx-rfcsection~=0.1.1
 # use fork of vcrpy 5.x until kevin1024/vcrpy#777 is (hopefully) accepted
 # (or until py3.9 EOL... in 10/2025, I HOPE NOT)
 vcrpy @ git+https://github.com/sopel-irc/vcrpy@uncap-urllib3
+# also have to use a version of urllib3 that doesn't use the `version_string`
+# attr of the response object, because vcrpy won't support it until 7.x
+urllib3<2.3
 # type check
 # often breaks CI on master, so pin and update deliberately, on our own terms
 mypy==1.11.2

sopel/tools/time.py

@@ -94,7 +94,7 @@ def validate_timezone(zone: Optional[str]) -> str:
     except pytz.exceptions.UnknownTimeZoneError:
         raise ValueError('Invalid time zone.')
 
-    return cast(str, tz.zone)
+    return cast('str', tz.zone)
 
 
 def validate_format(tformat: str) -> str:

sopel/trigger.py

@@ -229,7 +229,7 @@ def __init__(
 
         # The regex will always match any string, even an empty one
         components_match = cast(
-            Match, PreTrigger.component_regex.match(self.hostmask or ''))
+            'Match', PreTrigger.component_regex.match(self.hostmask or ''))
         nick, self.user, self.host = components_match.groups()
         self.nick: Identifier = self.make_identifier(nick)