diff --git a/.github/codecov.yml b/.github/codecov.yml deleted file mode 100644 index 21c27b2c..00000000 --- a/.github/codecov.yml +++ /dev/null @@ -1,8 +0,0 @@ -github_checks: - annotations: false - -coverage: - patch: - default: - enabled: false - if_not_found: success diff --git a/.github/workflows/pr-actions.yml b/.github/workflows/pr-actions.yml index 058a849a..9713256d 100644 --- a/.github/workflows/pr-actions.yml +++ b/.github/workflows/pr-actions.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ '3.7', '3.8', '3.9' ] + python-version: [ '3.7', '3.8', '3.9', '3.10' ] # Can't use ubuntu-latest until Python 3.4 has Ubuntu 20.X install options in setup-python@v2 os: ['ubuntu-18.04'] name: PyTests OS ${{ matrix.os }} - Python ${{ matrix.python-version }} diff --git a/brewtils/resolvers/manager.py b/brewtils/resolvers/manager.py index df114d2a..e2ddbc96 100644 --- a/brewtils/resolvers/manager.py +++ b/brewtils/resolvers/manager.py @@ -1,9 +1,13 @@ # -*- coding: utf-8 -*- -import collections import logging from typing import Any, Dict, List, Mapping +try: + from collections import Mapping as CollectionsMapping +except ImportError: + from collections.abc import Mapping as CollectionsMapping + from brewtils.models import Parameter, Resolvable from brewtils.resolvers.bytes import BytesResolver from brewtils.resolvers.chunks import ChunksResolver @@ -61,7 +65,7 @@ def resolve(self, values, definitions=None, upload=True): break # Check to see if this is a nested parameter - if isinstance(value, collections.Mapping) and definition.parameters: + if isinstance(value, CollectionsMapping) and definition.parameters: resolved = self.resolve( value, definitions=definition.parameters, upload=upload ) diff --git a/codecov.yml b/codecov.yml index 84e420ae..65dcede3 100644 --- a/codecov.yml +++ b/codecov.yml @@ -2,3 +2,9 @@ ignore: - "test/*.py" - "brewtils/test/*.py" +github_checks: + annotations: false + +coverage: + status: + patch: false