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

Merge dev to master in preparation for release. #299

Merged
merged 5 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/dev_viirs_deployment.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: uah dev viirs deployment

on:
push:
branches: [dev]
workflow_dispatch:

env:
Expand All @@ -28,7 +26,7 @@ jobs:
dev-viirs-deployment:
strategy:
matrix:
python: [3.8]
python: [3.9]
runs-on: ubuntu-20.04
needs: [unit-tests]
environment:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/mcp_dev_viirs_deployment.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: mcp dev viirs deployment

on:
push:
branches: [dev]
workflow_dispatch:

env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ To run unit test for all included Lambda functions

```plain
tox -r
```
```
3 changes: 2 additions & 1 deletion stack/hlsconstructs/batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ def __init__(
)

compute_resources = aws_batch.CfnComputeEnvironment.ComputeResourcesProperty(
allocation_strategy="BEST_FIT_PROGRESSIVE",
# allocation_strategy="BEST_FIT_PROGRESSIVE",
allocation_strategy="SPOT_CAPACITY_OPTIMIZED",
desiredv_cpus=0,
image_id=image_id,
instance_role=ecs_instance_profile.ref,
Expand Down
2 changes: 1 addition & 1 deletion stack/stack.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def getenv(key, default):

# Cron settings
LAADS_CRON = getenv("HLS_LAADS_CRON", "cron(0 0/12 * * ? *)")
LANDSAT_INCOMPLETE_CRON = getenv("HLS_LANDSAT_INCOMPLETE_CRON", "cron(0 12 * * ? *)")
LANDSAT_INCOMPLETE_CRON = getenv("HLS_LANDSAT_INCOMPLETE_CRON", "cron(0 0/6 * * ? *)")
LANDSAT_HISTORIC_INCOMPLETE_CRON = getenv(
"HLS_LANDSAT_HISTORIC_INCOMPLETE_CRON", "cron(0 0/6 * * ? *)"
)
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ passenv =
HLS_*
AWS_*
commands =
nodeenv --node=19.9.0 -p
npm install -g aws-cdk@v2.143.0
nodeenv --node=20.17.0 --python-virtualenv
npm install -g aws-cdk@v2.155.0
cdk --version

[testenv:dev]
Expand Down
Loading