Skip to content

Commit

Permalink
Merge pull request #514 from asfadmin/test
Browse files Browse the repository at this point in the history
Release v2.0.1
  • Loading branch information
asjohnston-asf authored Jun 27, 2024
2 parents 7e918f2 + fa37732 commit c73773a
Show file tree
Hide file tree
Showing 26 changed files with 59 additions and 40 deletions.
16 changes: 8 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
- package-ecosystem: pip
directory: /
schedule:
interval: "daily"
interval: weekly
labels:
- "bumpless"
- package-ecosystem: "github-actions"
directory: "/"
- bumpless
- package-ecosystem: github-actions
directory: /
schedule:
interval: "daily"
interval: weekly
labels:
- "bumpless"
- bumpless
4 changes: 1 addition & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@ on:
jobs:
call-changelog-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.11.0
secrets:
USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.11.1
15 changes: 15 additions & 0 deletions .github/workflows/create-jira-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Create Jira issue

on:
issues:
types: [labeled]

jobs:
call-create-jira-issue-workflow:
uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.11.1
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 }}
4 changes: 3 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
- prod
- test

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
deploy:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -44,7 +46,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.12

- name: install dependencies
if: github.ref == matrix.deploy_ref
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeled-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ on:
jobs:
call-labeled-pr-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.11.0
uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.11.1
2 changes: 1 addition & 1 deletion .github/workflows/release-checklist-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0
uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.11.1
permissions:
pull-requests: write
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
call-release-workflow:
uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.11.0
uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.11.1
with:
release_prefix: GRFN Ingest
release_branch: prod
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.12

- run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
call-bump-version-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.0
uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.1
with:
user: tools-bot
email: UAF-asf-apd@alaska.edu
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
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.1]
### Changed
- Upgraded all Lambda functions to Python 3.12

## [2.0.0]
This release supports publishing v3 GUNW products to production CMR. CMR metadata has been significantly revised to reflect the current state of these products, align with other recently developed ASF CMR collections, and better support ASF search tooling.

Expand Down
2 changes: 1 addition & 1 deletion cmr-token/cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ Resources:
Handler: cmr_token.lambda_handler
MemorySize: 128
Role: !GetAtt Role.Arn
Runtime: python3.8
Runtime: python3.12
Timeout: 60
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: grfn-ingest
channels:
- conda-forge
dependencies:
- python=3.8
- python=3.12
- pip
- pip:
- pytest
Expand Down
2 changes: 1 addition & 1 deletion ingest/cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ Resources:
Handler: ingest.lambda_handler
MemorySize: 128
Role: !GetAtt Role.Arn
Runtime: python3.8
Runtime: python3.12
Timeout: 180
2 changes: 1 addition & 1 deletion invoke/cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Resources:
Handler: invoke.lambda_handler
MemorySize: 128
Role: !GetAtt Role.Arn
Runtime: python3.8
Runtime: python3.12
Timeout: 120

Schedule:
Expand Down
2 changes: 1 addition & 1 deletion metadata-construction/cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,5 @@ Resources:
Handler: metadata_construction.lambda_handler
MemorySize: 128
Role: !GetAtt Role.Arn
Runtime: python3.8
Runtime: python3.12
Timeout: 60
2 changes: 1 addition & 1 deletion metadata-to-cmr/cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Resources:
Handler: daemon.lambda_handler
MemorySize: 128
Role: !GetAtt Role.Arn
Runtime: python3.8
Runtime: python3.12
Timeout: 900

Schedule:
Expand Down
2 changes: 1 addition & 1 deletion notify/cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ Resources:
Handler: notify.lambda_handler
MemorySize: 128
Role: !GetAtt Role.Arn
Runtime: python3.8
Runtime: python3.12
Timeout: 60
4 changes: 2 additions & 2 deletions requirements-cmr-token.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
boto3==1.34.70
requests-pkcs12==1.24
boto3==1.34.131
requests-pkcs12==1.25
2 changes: 1 addition & 1 deletion requirements-ingest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
boto3==1.34.70
boto3==1.34.131
2 changes: 1 addition & 1 deletion requirements-invoke.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
boto3==1.34.70
boto3==1.34.131
2 changes: 1 addition & 1 deletion requirements-metadata-construction.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
boto3==1.34.70
boto3==1.34.131
4 changes: 2 additions & 2 deletions requirements-metadata-to-cmr.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
boto3==1.34.70
requests==2.31.0
boto3==1.34.131
requests==2.32.3
2 changes: 1 addition & 1 deletion requirements-notify.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
boto3==1.34.70
boto3==1.34.131
4 changes: 2 additions & 2 deletions requirements-verify.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
boto3==1.34.70
jsonschema==4.21.1
boto3==1.34.131
jsonschema==4.22.0
10 changes: 5 additions & 5 deletions tests/example-message.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"ProductName": "S1-GUNW-A-R-014-tops-20230116_20220214-153036-00038E_00022N-PP-3708-v2_0_6",
"ProductName": "S1-GUNW-A-R-106-tops-20240517_20230429-002707-00093W_00001S-PP-67fa-v3_0_1",
"DeliveryTime": "2023-04-19T20:06:35.712653",
"ResponseTopic": {
"Region": "us-east-1",
"Arn": "arn:aws:sns:us-east-1:406893895021:hyp3-ingest-responses"
},
"Browse": {
"Bucket": "grfn-test-data",
"Key": "S1-GUNW-A-R-014-tops-20230116_20220214-153036-00038E_00022N-PP-3708-v2_0_6.png"
"Key": "S1-GUNW-A-R-106-tops-20240517_20230429-002707-00093W_00001S-PP-67fa-v3_0_1.png"
},
"Metadata": {
"Bucket": "grfn-test-data",
"Key": "S1-GUNW-A-R-014-tops-20230116_20220214-153036-00038E_00022N-PP-3708-v2_0_6.json"
"Key": "S1-GUNW-A-R-106-tops-20240517_20230429-002707-00093W_00001S-PP-67fa-v3_0_1.json"
},
"Product": {
"Bucket": "grfn-test-data",
"Key": "S1-GUNW-A-R-014-tops-20230116_20220214-153036-00038E_00022N-PP-3708-v2_0_6.nc"
"Key": "S1-GUNW-A-R-106-tops-20240517_20230429-002707-00093W_00001S-PP-67fa-v3_0_1.nc"
}
}
}
2 changes: 1 addition & 1 deletion verify/cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ Resources:
Handler: verify.lambda_handler
MemorySize: 128
Role: !GetAtt Role.Arn
Runtime: python3.8
Runtime: python3.12
Timeout: 90

0 comments on commit c73773a

Please sign in to comment.