Merge pull request #105 from craigerl/collections-fix

Collections fix

.github/workflows/master-build.yml

@@ -52,7 +52,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         context: "{{defaultContext}}:docker"
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        platforms: linux/amd64,linux/arm64
         file: ./Dockerfile-dev
         build-args: |
             BRANCH=${{ steps.branch-name.outputs.current_branch }}

.github/workflows/release_build.yml

@@ -7,6 +7,7 @@ on:
         required: true
         options:
           - 2.5.9
+          - 2.6.0
       logLevel:
         description: 'Log level'
         required: true

ChangeLog

@@ -4,6 +4,7 @@ CHANGES
 v2.6.0
 ------
 
+* Prep for 2.6.0 release
 * Update requirements
 * Removed Makefile comment
 * Update Makefile for dev vs. run environments

aprsd/utils/__init__.py

@@ -1,9 +1,9 @@
 """Utilities and helper functions."""
 
-import collections
 import errno
 import os
 import re
+import sys
 
 import update_checker
 
@@ -15,6 +15,12 @@ from .fuzzyclock import fuzzy  # noqa: F401
 from .ring_buffer import RingBuffer  # noqa: F401
 
 
+if sys.version_info.major == 3 and sys.version_info.minor >= 10:
+    from collections.abc import MutableMapping
+else:
+    from collections import MutableMapping
+
+
 def env(*vars, **kwargs):
     """This returns the first environment variable set.
     if none are non-empty, defaults to '' or keyword arg default
@@ -105,7 +111,7 @@ def flatten_dict(d, parent_key="", sep="."):
     items = []
     for k, v in d.items():
         new_key = parent_key + sep + k if parent_key else k
-        if isinstance(v, collections.MutableMapping):
+        if isinstance(v, MutableMapping):
             items.extend(flatten_dict(v, new_key, sep=sep).items())
         else:
             items.append((new_key, v))