Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	pyproject.toml
  • Loading branch information
James Wood authored and James Wood committed Jun 11, 2024
2 parents 251e7ef + 9094adb commit e56aa1a
Show file tree
Hide file tree
Showing 5 changed files with 288 additions and 254 deletions.
8 changes: 4 additions & 4 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
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
### Changed
### Deprecated
### Removed
### Fixed
### 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.
- Update tig to use cumulus 18 templates, terraform 1.5.3 is necesary for this update.
### Deprecated
### Removed
### Fixed
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
Loading

0 comments on commit e56aa1a

Please sign in to comment.