Release v2.0.2 - attempt #2

.github/workflows/changelog.yml

@@ -14,4 +14,4 @@
 jobs:
   call-changelog-check-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.13.2
+    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.14.0

.github/workflows/create-jira-issue.yml

@@ -6,10 +6,10 @@
 
 jobs:
   call-create-jira-issue-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.13.2
+    uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.14.0
     secrets:
       JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
       JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
       JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
       JIRA_PROJECT: ${{ secrets.JIRA_PROJECT }}
       JIRA_FIELDS: ${{ secrets.JIRA_FIELDS }}

.github/workflows/labeled-pr.yml

@@ -13,4 +13,4 @@
 jobs:
   call-labeled-pr-check-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.13.2
+    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.14.0

.github/workflows/release-checklist-comment.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   call-release-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.13.2
+    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.14.0
     permissions:
       pull-requests: write
     secrets:

.github/workflows/release.yml

@@ -7,10 +7,10 @@
 
 jobs:
   call-release-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.13.2
+    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.14.0
     with:
       release_prefix: GRFN Ingest
       release_branch: prod
       develop_branch: test
     secrets:
       USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}

.github/workflows/static_analysis.yml

@@ -5,9 +5,12 @@
 jobs:
 
   call-ruff-workflow:
-    uses: ASFHyP3/actions/.github/workflows/[email protected]
+    uses: ASFHyP3/actions/.github/workflows/[email protected]
+
+  call-mypy-workflow:
+    uses: ASFHyP3/actions/.github/workflows/[email protected]
 
   cfn-lint:
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/tag-version.yml

@@ -8,9 +8,9 @@
 jobs:
   call-bump-version-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.13.2
+    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.14.0
     with:
       user: tools-bot
       email: [email protected]
     secrets:
       USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [2.0.2]
+### Added
+- Added `mypy` to static analysis workflow.
+
 ### Changed
 - Replaced `flake8` with `ruff`.
 

environment.yml

@@ -1,11 +1,9 @@
 name: grfn-ingest
 channels:
   - conda-forge
+  - nodefaults
 dependencies:
   - python=3.12
   - pip
   - pip:
-    - pytest
-    - boto3
-    - pytest-mock
     - -r requirements-all.txt

ingest/src/ingest.py

@@ -10,7 +10,7 @@
 log = getLogger()
 log.setLevel('INFO')
 s3 = boto3.resource('s3')
-config = json.loads(os.getenv('CONFIG'))
+config = json.loads(os.environ['CONFIG'])
 
 
 def copy_s3_object(copy_source, dest_bucket, dest_key, transfer_config):

invoke/src/invoke.py

@@ -1,13 +1,13 @@
 import json
+import os
 from logging import getLogger
-from os import getenv
 
 import boto3
 
 
 log = getLogger()
 log.setLevel('INFO')
-CONFIG = json.loads(getenv('CONFIG'))
+CONFIG = json.loads(os.environ['CONFIG'])
 
 sqs = boto3.resource('sqs')
 sfn = boto3.client('stepfunctions')

metadata-construction/src/metadata_construction.py

@@ -8,7 +8,7 @@
 
 log = getLogger()
 log.setLevel('INFO')
-CONFIG = json.loads(os.getenv('CONFIG'))
+CONFIG = json.loads(os.environ['CONFIG'])
 
 s3 = boto3.resource('s3')
 

metadata-to-cmr/src/daemon.py

@@ -1,6 +1,6 @@
 import json
+import os
 from logging import getLogger
-from os import getenv
 
 import boto3
 from botocore.client import Config
@@ -11,7 +11,7 @@
 
 log = getLogger()
 log.setLevel('INFO')
-CONFIG = json.loads(getenv('CONFIG'))
+CONFIG = json.loads(os.environ['CONFIG'])
 
 
 def get_sfn_client(connect_timeout):

notify/src/notify.py

@@ -1,14 +1,14 @@
 import json
+import os
 from datetime import datetime
 from logging import getLogger
-from os import getenv
 
 import boto3
 
 
 log = getLogger()
 log.setLevel('INFO')
-CONFIG = json.loads(getenv('CONFIG'))
+CONFIG = json.loads(os.environ['CONFIG'])
 
 
 def create_response(event, error_config):

pyproject.toml

@@ -28,3 +28,11 @@ convention = "google"
 [tool.ruff.lint.isort]
 case-sensitive = true
 lines-after-imports = 2
+
+[tool.mypy]
+python_version = "3.12"
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_unreachable = true
+strict_equality = true
+check_untyped_defs = true

requirements-all.txt

@@ -5,3 +5,8 @@
 -r requirements-invoke.txt
 -r requirements-notify.txt
 -r requirements-verify.txt
+boto3
+pytest
+pytest-mock
+ruff
+mypy

tests/test_metadata_construction.py

@@ -68,7 +68,7 @@ def test_create_granule_metadata_in_s3_g1(test_data_dir, mocker):
 
     assert metadata_construction.create_granule_metadata_in_s3(inputs, config) == metadata_s3_object
 
-    assert metadata_construction.upload_content_to_s3.mock_calls == [
+    assert metadata_construction.upload_content_to_s3.mock_calls == [  # type: ignore[attr-defined]
         unittest.mock.call(
             metadata_s3_object,
             json.dumps(json.loads((test_data_dir / 'granule1' / 'granule.umm.json').read_text()), sort_keys=True),
@@ -93,7 +93,7 @@ def test_create_granule_metadata_in_s3_g2(test_data_dir, mocker):
 
     assert metadata_construction.create_granule_metadata_in_s3(inputs, config) == metadata_s3_object
 
-    assert metadata_construction.upload_content_to_s3.mock_calls == [
+    assert metadata_construction.upload_content_to_s3.mock_calls == [  # type: ignore[attr-defined]
         unittest.mock.call(
             metadata_s3_object,
             json.dumps(json.loads((test_data_dir / 'granule2' / 'granule.umm.json').read_text()), sort_keys=True),