Fix lint/format

Author: alukach

.github/workflows/ci.yaml

@@ -16,20 +16,23 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: set up python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.9
+          cache: 'pip'
 
       - name: install
         run: |
           make install-linting
           pip freeze
 
-      - name: lint
-        run: make lint
-
-      - name: mypy
-        run: make mypy
+      - name: run linters
+        uses: wearerequired/lint-action@v1
+        with:
+          black: true
+          flake8: true
+          mypy: true
+          mypy_args: pydantic_ssm_settings
 
   test-linux:
     name: test py${{ matrix.python-version }} on linux

Makefile

@@ -1,6 +1,6 @@
 .DEFAULT_GOAL := all
 isort = isort pydantic_ssm_settings tests
-black = black -S -l 120 --target-version py38 pydantic_ssm_settings tests
+black = black --target-version py38 pydantic_ssm_settings tests
 
 .PHONY: install-linting
 install-linting: install-pydantic_ssm_settings
@@ -46,17 +46,14 @@ lint:
 	flake8 pydantic_ssm_settings/ tests/
 	$(isort) --check-only --df
 	$(black) --check --diff
+	mypy
 
 # .PHONY: check-dist
 # check-dist:
 # 	python setup.py check -ms
 # 	SKIP_CYTHON=1 python setup.py sdist
 # 	twine check dist/*
 
-.PHONY: mypy
-mypy:
-	mypy pydantic_ssm_settings
-
 .PHONY: test
 test:
 	pytest --cov=pydantic_ssm_settings

pydantic_ssm_settings/__init__.py

@@ -1,3 +1,3 @@
 from .settings import AwsSsmSourceConfig
 
-__all__ = ('AwsSsmSourceConfig',)
+__all__ = ("AwsSsmSourceConfig",)

pydantic_ssm_settings/settings.py

@@ -1,7 +1,12 @@
 import logging
 from typing import Tuple
 
-from pydantic.env_settings import EnvSettingsSource, InitSettingsSource, SecretsSettingsSource, SettingsSourceCallable
+from pydantic.env_settings import (
+    EnvSettingsSource,
+    InitSettingsSource,
+    SecretsSettingsSource,
+    SettingsSourceCallable,
+)
 
 from .source import AwsSsmSettingsSource
 

pydantic_ssm_settings/source.py

@@ -1,29 +1,34 @@
 import logging
 from pathlib import Path
-from typing import Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 import boto3
-from pydantic import BaseSettings
+
+from pydantic import BaseSettings, typing
+
+if TYPE_CHECKING:
+    from mypy_boto3_ssm.client import SSMClient
+
 
 logger = logging.getLogger(__name__)
 
 
 class AwsSsmSettingsSource:
     __slots__ = ("ssm_prefix",)
 
-    def __init__(self, ssm_prefix: Union[Path, str, None]):
-        self.ssm_prefix: Union[Path, str, None] = ssm_prefix
+    def __init__(self, ssm_prefix: Union[typing.StrPath, None]):
+        self.ssm_prefix: Union[typing.StrPath, None] = ssm_prefix
 
     @property
-    def client(self):
+    def client(self) -> "SSMClient":
         return boto3.client("ssm")
 
     def __call__(self, settings: BaseSettings) -> Dict[str, Any]:
         """
         Returns lazy SSM values for all settings.
         """
         secrets: Dict[str, Optional[Any]] = {}
-        
+
         if self.ssm_prefix is None:
             return secrets
 
@@ -34,10 +39,13 @@ def __call__(self, settings: BaseSettings) -> Dict[str, Any]:
 
         logger.debug(f"Building SSM settings with prefix of {secrets_path=}")
 
-        params = self.client.get_parameters_by_path(Path=str(secrets_path), WithDecryption=True)['Parameters']
+        params = self.client.get_parameters_by_path(
+            Path=str(secrets_path), WithDecryption=True
+        )["Parameters"]
 
         return {
-            str(Path(param['Name']).relative_to(secrets_path)): param['Value'] for param in params 
+            str(Path(param["Name"]).relative_to(secrets_path)): param["Value"]
+            for param in params
         }
 
     def __repr__(self) -> str:

setup.cfg

@@ -10,7 +10,7 @@ filterwarnings =
     ignore:The distutils.sysconfig module is deprecated, use sysconfig instead:DeprecationWarning
 
 [flake8]
-max-line-length = 120
+max-line-length = 90
 max-complexity = 14
 inline-quotes = single
 multiline-quotes = double
@@ -41,14 +41,16 @@ source =
     D:\a\pydantic\pydantic\pydantic
 
 [isort]
-line_length=120
+line_length=90
 known_first_party=pydantic
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0
 combine_as_imports=True
 
 [mypy]
+files=pydantic_ssm_settings
+exclude=tests,setup.py
 python_version = 3.9
 show_error_codes = True
 follow_imports = silent

setup.py

@@ -17,7 +17,7 @@
         "License :: OSI Approved :: MIT License",
     ],
     keywords="Pydantic AWS SSM Parameter Store",
-    author=u"Anthony Lukach",
+    author="Anthony Lukach",
     author_email="[email protected]",
     url="https://github.com/stac-utils/stac-fastapi",
     license="MIT",

tests/requirements-linting.txt

@@ -1,4 +1,4 @@
-black==21.8b0
+black==22.3.0
 flake8==3.9.2
 isort==5.9.3
 mypy==0.910

tests/requirements-testing.txt

@@ -1,4 +1,4 @@
 coverage==5.5
 pytest==6.2.5
 pytest-cov==2.12.1
-moto[all]==2.2.6
+moto[all]==2.2.19

tests/test_main.py

@@ -35,12 +35,13 @@ def test_lookup_from_ssm(ssm):
     assert settings.foo == "xyz123"
 
 
-def test_prefer_provided():
+def test_prefer_provided(ssm):
     settings = SimpleSettings(_secrets_dir="/asdf", foo="manually set")
     assert settings.foo == "manually set"
 
 
 def test_casting(ssm):
+    ssm.put_parameter(Name="/asdf/foo", Value="xyz123")
     ssm.put_parameter(Name="/asdf/bar", Value="99")
     settings = IntSettings(_secrets_dir="/asdf")
     assert settings.bar == 99