Skip to content

Commit

Permalink
Merge pull request #66 from podaac/release/0.12.0
Browse files Browse the repository at this point in the history
Release/0.12.0
  • Loading branch information
jamesfwood authored Jun 11, 2024
2 parents a9abac7 + 5c98713 commit c5b80cf
Show file tree
Hide file tree
Showing 8 changed files with 362 additions and 336 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

#########################################################################
# Versioning (featuring weird gradle output work-arounds)
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
github.event.head_commit.message == '/deploy sit' ||
github.event.head_commit.message == '/deploy uat' ||
github.event.head_commit.message == '/deploy sandbox'
uses: ncipollo/release-action@v1.12.0
uses: ncipollo/release-action@v1
with:
tag: ${{ env.the_version }}
artifacts: "*.zip"
Expand Down Expand Up @@ -461,7 +461,7 @@ jobs:
github.ref == 'refs/heads/develop' ||
github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/heads/release')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./docker/lambdaDockerfileArm
Expand Down Expand Up @@ -490,7 +490,7 @@ jobs:
github.event.head_commit.message == '/deploy sit' ||
github.event.head_commit.message == '/deploy uat' ||
github.event.head_commit.message == '/deploy sandbox'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./docker/lambdaDockerfileArm
Expand Down Expand Up @@ -522,7 +522,7 @@ jobs:
#########################################################################
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: 0.13.6
terraform_version: 1.5.3

- name: Deploy Terraform
if: |
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security


## [0.12.0]

### Added
### Changed
- ** TIG Upgrade Cumulus 18 **
- Update tig to use cumulus 18 templates, terraform 1.5.3 is necesary for this update.
### Deprecated
### Removed
### Fixed
### Security


## [0.11.0]

### Added
Expand Down
6 changes: 3 additions & 3 deletions podaac/tig/tig.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import logging
import json
import matplotlib.colors as col
import matplotlib.cm as cm
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import numpy.ma as ma
Expand Down Expand Up @@ -842,12 +842,12 @@ def load_json_palette(palette_dir, palette_name, alpha):

cmap = col.ListedColormap(colors, palette_name)
try:
cm.register_cmap(cmap=cmap)
matplotlib.colormaps.register(cmap=cmap)
except ValueError:
# palette register via other images
pass

return cm.get_cmap(palette_name)
return matplotlib.colormaps[palette_name]


def vals_to_rgba(vals, min_val, max_val, colormap, transparency=True, no_data=None):
Expand Down
660 changes: 337 additions & 323 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "podaac-tig"
version = "0.11.0"
version = "0.12.0-rc.3"
description = "Tool for Image Generation (TIG)"
authors = ["podaac-tva <[email protected]>"]
license = "Apache-2.0"
Expand Down Expand Up @@ -30,7 +30,7 @@ scipy = "^1.12.0"
[tool.poetry.dev-dependencies]
pytest = "^8.0.1"
flake8 = "^7.0.0"
pytest-cov = "^4.1.0"
pytest-cov = "^5"
pylint = "^3.0.3"
Sphinx = "^7.2.6"
moto = "^4.2.14"
Expand Down
2 changes: 1 addition & 1 deletion terraform/tig_ecs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module "tig_service" {

count = var.tig_ecs ? 1 : 0

source = "https://github.com/nasa/cumulus/releases/download/v16.1.2/terraform-aws-cumulus-ecs-service.zip"
source = "https://github.com/nasa/cumulus/releases/download/v18.2.0/terraform-aws-cumulus-ecs-service.zip"
prefix = var.prefix
name = "${local.ecs_resources_name}-ecs-task"
tags = merge(var.tags, { Project = var.prefix })
Expand Down
2 changes: 1 addition & 1 deletion terraform_deploy/override.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

if __name__ == '__main__':

data = {'module': [{'tig': {'source': sys.argv[1], 'lambda_container_image_uri': sys.argv[2]}}]}
data = {'module': {'tig': {'source': sys.argv[1], 'lambda_container_image_uri': sys.argv[2]}}}
with open('override.tf.json', 'w') as f:
json.dump(data, f)
2 changes: 1 addition & 1 deletion terraform_deploy/tig.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "tig" {
source = "source will be override by override.py"
source = "https://github.com/podaac/tig/releases/download/0.11.0/tig-terraform-0.11.0.zip"
// Lambda variables
prefix = var.prefix
lambda_container_image_uri = "image will be override by override.py"
Expand Down

0 comments on commit c5b80cf

Please sign in to comment.