Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v7.12.0 #2461

Merged
merged 11 commits into from
Oct 16, 2024
2 changes: 1 addition & 1 deletion .github/workflows/deploy-daac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
url: https://${{ matrix.domain }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-enterprise-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
url: https://${{ matrix.domain }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
job_files: >-
job_spec/AUTORIFT_ITS_LIVE.yml
job_spec/S1_CORRECTION_ITS_LIVE.yml
instance_types: r6id.xlarge,r6idn.xlarge,r5dn.xlarge,r5d.xlarge
instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
default_max_vcpus: 2000 # Max: 10,406
expanded_max_vcpus: 2000 # Max: 10,406
required_surplus: 0
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
url: https://${{ matrix.domain }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-multi-burst-sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
url: https://${{ matrix.domain }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
flake8:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- uses: actions/setup-python@v5
with:
python-version: 3.9
Expand All @@ -23,7 +23,7 @@ jobs:
matrix:
security_environment: [ASF, EDC, JPL, JPL-public]
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- uses: actions/setup-python@v5
with:
python-version: 3.9
Expand All @@ -37,7 +37,7 @@ jobs:
openapi-spec-validator:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- uses: actions/setup-python@v5
with:
python-version: 3.9
Expand All @@ -50,7 +50,7 @@ jobs:
statelint:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
Expand All @@ -70,7 +70,7 @@ jobs:
snyk:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- uses: snyk/actions/[email protected]
- uses: actions/setup-python@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- uses: actions/setup-python@v5
with:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [7.12.0]

### Changed
- The `hyp3-its-live` deployment now uses a greater variety of `r6id[n]` instances.

## [7.11.0]

### Added
Expand Down
1 change: 0 additions & 1 deletion apps/api/src/hyp3_api/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ def get_multipolygon_from_geojson(input_file):
return MultiPolygon(polygons)


# TODO https://github.com/ASFHyP3/hyp3/issues/2442 remove this function after two burst types are merged
def convert_single_burst_jobs(jobs: list[dict]) -> list[dict]:
jobs = deepcopy(jobs)
for job in jobs:
Expand Down
1 change: 0 additions & 1 deletion apps/set-batch-overrides/src/set_batch_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ def get_insar_isce_burst_memory(job_parameters: dict) -> str:
def lambda_handler(event: dict, _) -> dict:
job_type, job_parameters = event['job_type'], event['job_parameters']

# TODO https://github.com/ASFHyP3/hyp3/issues/2442 rename to INSAR_ISCE_BURST after the two burst types are merged
if job_type == 'INSAR_ISCE_MULTI_BURST':
memory = get_insar_isce_burst_memory(job_parameters)
omp_num_threads = INSAR_ISCE_BURST_OMP_NUM_THREADS[memory]
Expand Down
4 changes: 2 additions & 2 deletions requirements-all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-r requirements-apps-start-execution-worker.txt
-r requirements-apps-disable-private-dns.txt
-r requirements-apps-update-db.txt
boto3==1.35.31
boto3==1.35.34
jinja2==3.1.4
moto[dynamodb]==5.0.16
pytest==8.3.3
Expand All @@ -17,4 +17,4 @@ flake8-blind-except==0.2.1
flake8-builtins==2.5.0
setuptools==75.1.0
openapi-spec-validator==0.7.1
cfn-lint==1.15.2
cfn-lint==1.16.0
2 changes: 1 addition & 1 deletion requirements-apps-disable-private-dns.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
boto3==1.35.31
boto3==1.35.34
2 changes: 1 addition & 1 deletion requirements-apps-start-execution-manager.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
boto3==1.35.31
boto3==1.35.34
./lib/dynamo/
./lib/lambda_logging/
2 changes: 1 addition & 1 deletion requirements-apps-start-execution-worker.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
boto3==1.35.31
boto3==1.35.34
./lib/lambda_logging/
8 changes: 0 additions & 8 deletions tests/test_api/test_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,17 +424,13 @@ def test_validate_jobs():
'job_parameters': {}
},
{
# TODO https://github.com/ASFHyP3/hyp3/issues/2442
# rename to INSAR_ISCE_BURST after the two burst types are merged
'job_type': 'INSAR_ISCE_MULTI_BURST',
'job_parameters': {
'reference': [valid_burst_pair[0]],
'secondary': [valid_burst_pair[1]]
}
},
{
# TODO https://github.com/ASFHyP3/hyp3/issues/2442
# remove this test case after the two burst types are merged
'job_type': 'INSAR_ISCE_BURST',
'job_parameters': {
'granules': [valid_burst_pair[0], valid_burst_pair[1]]
Expand Down Expand Up @@ -467,8 +463,6 @@ def test_validate_jobs():

jobs = [
{
# TODO https://github.com/ASFHyP3/hyp3/issues/2442
# rename to INSAR_ISCE_BURST after the two burst types are merged
'job_type': 'INSAR_ISCE_MULTI_BURST',
'job_parameters': {
'reference': [invalid_burst_pair[0]],
Expand All @@ -479,8 +473,6 @@ def test_validate_jobs():
with raises(validation.GranuleValidationError):
validation.validate_jobs(jobs)

# TODO https://github.com/ASFHyP3/hyp3/issues/2442
# remove this test case after the two burst types are merged
jobs = [
{
'job_type': 'INSAR_ISCE_BURST',
Expand Down
2 changes: 0 additions & 2 deletions tests/test_set_batch_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

def mock_insar_isce_burst_job(looks: str, bursts: int) -> dict:
return {
# TODO https://github.com/ASFHyP3/hyp3/issues/2442
# rename to INSAR_ISCE_BURST after the two burst types are merged
'job_type': 'INSAR_ISCE_MULTI_BURST',
'job_parameters': {
'looks': looks,
Expand Down
Loading