Cherry pick python upgrade patches into master

.github/workflows/glogger.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: 3.10
 
     - name: Checkout Code
       uses: actions/checkout@v2

.github/workflows/granulate-utils.yml

@@ -7,9 +7,10 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
-          - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
 
     runs-on: ubuntu-latest
 
@@ -35,9 +36,10 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
-          - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
 
     runs-on: ubuntu-latest
 

README.md

@@ -1,6 +1,6 @@
 # Granulate's shared Python utilities
 
-Supports Python 3.8+.
+Supports Python 3.10+
 
 ## Testing
 

dev-requirements.txt

@@ -1,12 +1,11 @@
-flake8==6.0.0
-black==24.8.0
-mypy==1.5.1
-isort==5.12.0
-types-requests==2.27.1
-types-setuptools==57.4.3
-types-psutil==5.8.0
-grpcio-tools==1.43.0
-types-dataclasses==0.6.6
-pytest~=7.0.1
-pytest-asyncio~=0.21.0
-types-python-dateutil~=2.8.2
+flake8==7.2.0
+black==25.1.0
+mypy==1.15.0
+isort==6.0.1
+types-requests~=2.32.0
+types-setuptools~=78.1.0
+types-psutil~=7.0.0
+grpcio-tools~= 1.71.0
+pytest==8.3.5
+pytest-asyncio~=0.26.0
+types-python-dateutil~=2.9.0

glogger/extra_adapter.py

@@ -37,7 +37,9 @@ def get_extra(self, **kwargs) -> Mapping[str, Any]:
         non-standard kwargs available under an "extra" key. Default implementation merges existing attributes with
         default ones provided at initialization.
         """
-        return {**self.extra, **kwargs.get("extra", {})}
+        if self.extra is not None:
+            return {**self.extra, **kwargs.get("extra", {})}
+        return kwargs.get("extra", {})
 
     def process(self, msg: Any, kwargs: MutableMapping[str, Any]) -> Tuple[Any, MutableMapping[str, Any]]:
         # Partition the kwargs into logging kwargs and extra kwargs: