upgrade aiohttp to 3.12.14 (#286)

* upgrade aiohttp to 3.12.14

* typing-extensions

* remove py3.8

* bump lintlizard

* fix lint

Author: nsaje

.circleci/config.yml

@@ -7,9 +7,6 @@ workflows:
       - static-code-analysis:
           context:
             - docker-hub-creds-ro
-      - test-3.8:
-          context:
-            - docker-hub-creds-ro
       - test-3.9:
           context:
             - docker-hub-creds-ro
@@ -38,7 +35,7 @@ jobs:
   static-code-analysis:
     <<: *defaults
     docker:
-      - image: cimg/python:3.8
+      - image: cimg/python:3.12
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
@@ -56,17 +53,6 @@ jobs:
           command: |
             lintlizard
 
-  test-3.8:
-    <<: *defaults
-    docker:
-      - image: cimg/python:3.8
-        auth:
-          username: $DOCKER_USER
-          password: $DOCKER_PASS
-      - image: redis:3.2.12-alpine
-        auth:
-          username: $DOCKER_USER
-          password: $DOCKER_PASS
   test-3.9:
     <<: *defaults
     docker:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 skip-string-normalization = true
-target-version = ['py37']
+target-version = ['py310']
 line-length = 79
 exclude = '''
 /(

requirements.txt

@@ -1,7 +1,7 @@
-aiohappyeyeballs==2.4.3
-aiohttp==3.10.11
+aiohappyeyeballs==2.5.0
+aiohttp==3.12.14
 aioredis==1.3.1
-aiosignal==1.2.0
+aiosignal==1.4.0
 async-timeout==4.0.2
 attrs==24.2.0
 click==8.0.4
@@ -13,4 +13,4 @@ propcache==0.2.0
 six==1.17.0
 structlog==20.1.0
 websockets==12.0
-yarl==1.14.0
+yarl==1.17.0

requirements_lint.txt

@@ -1,2 +1,2 @@
-lintlizard==0.18.0
+lintlizard==0.26.0
 click<8.1  # 8.1+ breaks black

requirements_tests.txt

@@ -7,3 +7,4 @@ pluggy==1.5.0
 pytest==8.0.2
 pytest-asyncio==0.21.1
 tomli==2.0.2
+typing-extensions~=4.15.0

setup.py

@@ -40,8 +40,10 @@
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
     packages=[
         'socketshark',

socketshark/events.py

@@ -127,10 +127,9 @@ def __init__(self, session, data):
         super().__init__(session, data)
         subscription_name = data.get('subscription') or None
         self.subscription_name = subscription_name
-        if subscription_name in self.session.subscriptions:
-            self.subscription = self.session.subscriptions[subscription_name]
-        else:
-            self.subscription = Subscription(self.config, session, data)
+        self.subscription = self.session.subscriptions.get(
+            subscription_name, Subscription(self.config, session, data)
+        )
         self.extra_data = self.subscription.extra_data
 
     async def send_error(self, error, data=None):

socketshark/utils.py

@@ -61,7 +61,7 @@ def _scrub_url(url):
         # so can't easily use _replace to get rid of password
         # and then call urlunsplit to reconstruct url.
         _, _, hostinfo = url_parts.netloc.rpartition('@')
-        scrubbed_netloc = f'*****:*****@{hostinfo}'
+        scrubbed_netloc = f'*****:*****@{hostinfo}'  # noqa: E231
         scrubbed_url_parts = url_parts._replace(netloc=scrubbed_netloc)
         return urlunsplit(scrubbed_url_parts)