Merge pull request #103 from podaac/release/0.15.0

Release 0.15.0

Author: jamesfwood

.github/workflows/.release-created.yml

@@ -16,17 +16,17 @@ jobs:
       ${{ startsWith(github.ref, 'refs/heads/release/') }}
     steps:
       # Checks-out the develop branch
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: 'refs/heads/develop'
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.12'
 
       - name: Install Poetry
-        uses: abatilo/actions-poetry@v3
+        uses: abatilo/actions-poetry@v4
         with:
-          poetry-version: 1.8.5
+          poetry-version: 2.1.3
 
       - name: Bump minor version
         run: |

.github/workflows/build.yml

@@ -15,8 +15,8 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  PYTHON_VERSION: '3.10'
-  POETRY_VERSION: '1.8.5'
+  PYTHON_VERSION: '3.12'
+  POETRY_VERSION: '2.3.2'
   TERRAFORM_VERSION: '1.5.3'
 
 jobs:
@@ -29,19 +29,26 @@ jobs:
       packages: write
       id-token: write
 
+    outputs:
+      new_version: ${{ steps.build-outputs.outputs.new_version }}
+      pyproject_name: ${{ steps.build-outputs.outputs.pyproject_name }}
+      target_env_uppercase: ${{ steps.build-outputs.outputs.target_env_uppercase }}
+      target_env_lowercase: ${{ steps.build-outputs.outputs.target_env_lowercase }}
+      source: ${{ steps.build-outputs.outputs.source }}
+
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0  # Needed for proper versioning
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip'
 
       - name: Setup Poetry
-        uses: abatilo/actions-poetry@v3
+        uses: abatilo/actions-poetry@v4
         with:
           poetry-version: ${{ env.POETRY_VERSION }}
 
@@ -55,17 +62,6 @@ jobs:
           path: .venv
           key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v3
-        with:
-          terraform_version: 1.5.3
-
       - name: Version Management
         id: versioning
         run: |
@@ -204,23 +200,12 @@ jobs:
         if: |
           github.ref == 'refs/heads/develop' ||
           github.ref == 'refs/heads/main' ||
-          startsWith(github.ref, 'refs/heads/release/')
+          startsWith(github.ref, 'refs/heads/release/') ||
+          github.event.head_commit.message == '/deploy sit' ||
+          github.event.head_commit.message == '/deploy uat'
         run: |
           pip install tenacity logging 
           python3 ${GITHUB_WORKSPACE}/.github/workflows/wait-for-pypi.py ${{env.pyproject_name}}[harmony]==${{ env.new_version }}
-           
-      - name: Log in to the Container registry
-        if: |
-          github.ref == 'refs/heads/develop' ||
-          github.ref == 'refs/heads/main'    ||
-          startsWith(github.ref, 'refs/heads/release') ||
-          github.event.head_commit.message == '/deploy sit' ||
-          github.event.head_commit.message == '/deploy uat'
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Deploy Env Override
         if: |
@@ -240,43 +225,81 @@ jobs:
           lowercase_value=$(echo "${original_env_value}" | tr '[:upper:]' '[:lower:]')
           echo "TARGET_ENV_LOWERCASE=${lowercase_value}" >> $GITHUB_ENV
 
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Set Build Source
+        id: set-source
+        run: |
+          # Use test PyPI package format (Dockerfile will find it via extra-index-url)
+          echo "SOURCE=${{ env.pyproject_name }}==${{ env.new_version }}" >> $GITHUB_ENV
+
+      - name: Set build outputs
+        id: build-outputs
+        run: |
+          echo "new_version=${{ env.new_version }}" >> $GITHUB_OUTPUT
+          echo "pyproject_name=${{ env.pyproject_name }}" >> $GITHUB_OUTPUT
+          echo "target_env_uppercase=${{ env.TARGET_ENV_UPPERCASE }}" >> $GITHUB_OUTPUT
+          echo "target_env_lowercase=${{ env.TARGET_ENV_LOWERCASE }}" >> $GITHUB_OUTPUT
+          echo "source=${{ env.SOURCE }}" >> $GITHUB_OUTPUT
+
+      - name: Upload terraform zip artifact
         if: |
           github.ref == 'refs/heads/develop' ||
           github.ref == 'refs/heads/main'    ||
           startsWith(github.ref, 'refs/heads/release') ||
           github.event.head_commit.message == '/deploy sit' ||
-          github.event.head_commit.message == '/deploy uat' 
+          github.event.head_commit.message == '/deploy uat'
+        uses: actions/upload-artifact@v4
+        with:
+          name: terraform-zip
+          path: tig-terraform-${{ env.new_version }}.zip
+          retention-days: 1
+
+  deploy:
+    name: Deploy Docker and Terraform
+    runs-on: ubuntu-24.04-arm
+    needs: build
+    if: |
+      github.ref == 'refs/heads/develop' ||
+      github.ref == 'refs/heads/main'    ||
+      startsWith(github.ref, 'refs/heads/release') ||
+      github.event.head_commit.message == '/deploy sit' ||
+      github.event.head_commit.message == '/deploy uat'
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set deployment variables from build outputs
+        run: |
+          echo "NEW_VERSION=${{ needs.build.outputs.new_version }}" >> $GITHUB_ENV
+          echo "PYPROJECT_NAME=${{ needs.build.outputs.pyproject_name }}" >> $GITHUB_ENV
+          echo "TARGET_ENV_UPPERCASE=${{ needs.build.outputs.target_env_uppercase }}" >> $GITHUB_ENV
+          echo "TARGET_ENV_LOWERCASE=${{ needs.build.outputs.target_env_lowercase }}" >> $GITHUB_ENV
+          echo "SOURCE=${{ needs.build.outputs.source }}" >> $GITHUB_ENV
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
             latest=${{ github.ref == 'refs/heads/main' }}
           tags: |
-            type=pep440,pattern={{version}},value=${{ env.new_version }}
+            type=pep440,pattern={{version}},value=${{ env.NEW_VERSION }}
             type=raw,value=${{ env.TARGET_ENV_LOWERCASE }}
 
-      - name: Set Build Source
-        id: set-source
-        run: |
-          # Default build source for standard branches
-          echo "SOURCE=${{ env.pyproject_name }}==${{ env.new_version }}" >> $GITHUB_ENV
-
-          if [[ "${{ contains(github.event.head_commit.message, '/deploy sit') || 
-                     contains(github.event.head_commit.message, '/deploy uat') }}" == "true" ]]; then
-            local_tig=$(find dist -type f -name "*.whl")
-            echo "SOURCE=${local_tig}" >> $GITHUB_ENV
-            echo "DIST_PATH=dist/" >> $GITHUB_ENV
-          fi
-
       - name: Build and Push Docker Image
-        if: |
-          github.ref == 'refs/heads/develop' ||
-          github.ref == 'refs/heads/main'    ||
-          startsWith(github.ref, 'refs/heads/release') ||
-          github.event.head_commit.message == '/deploy sit' ||
-          github.event.head_commit.message == '/deploy uat' 
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -288,38 +311,33 @@ jobs:
           platforms: linux/arm64
           build-args: |
             SOURCE=${{ env.SOURCE }}
-            DIST_PATH=${{ env.DIST_PATH || '' }}
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository }}/cache:tig-cache
-          cache-to: type=registry,ref=ghcr.io/${{ github.repository }}/cache:tig-cache,mode=max
+
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: 1.5.3
+
+      - name: Get Docker image tag
+        id: docker-tag
+        run: |
+          # Extract the first tag (version tag) from metadata output
+          DOCKER_IMAGE_TAG=$(echo "${{ steps.meta.outputs.tags }}" | head -n1)
+          echo "DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG}" >> $GITHUB_ENV
+          echo "DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG}" >> $GITHUB_OUTPUT
 
       - name: Deploy Terraform
-        if: |
-          github.ref == 'refs/heads/develop' ||
-          github.ref == 'refs/heads/main'    ||
-          startsWith(github.ref, 'refs/heads/release') ||
-          github.event.head_commit.message == '/deploy sit' ||
-          github.event.head_commit.message == '/deploy uat'
         working-directory: terraform_deploy/
         env:
           AWS_ACCESS_KEY_ID:       ${{ secrets[format('AWS_ACCESS_KEY_ID_SERVICES_{0}', env.TARGET_ENV_UPPERCASE)] }}
           AWS_SECRET_ACCESS_KEY:   ${{ secrets[format('AWS_SECRET_ACCESS_KEY_SERVICES_{0}', env.TARGET_ENV_UPPERCASE)] }}
           AWS_ACCOUNT_ID:          ${{ secrets[format('AWS_ACCOUNT_ID_SERVICES_{0}', env.TARGET_ENV_UPPERCASE)] }}
           AWS_DEFAULT_REGION:      us-west-2
 
-          TF_VAR_tig_docker_image: "ghcr.io/podaac/tig:${{ env.DOCKER_METADATA_OUTPUT_VERSION }}"
+          TF_VAR_tig_docker_image: ${{ env.DOCKER_IMAGE_TAG }}
           TF_VAR_EARTH_DATA_LOGIN_CLIENT_ID: ${{ secrets[format('EARTH_DATA_LOGIN_CLIENT_ID_{0}', env.TARGET_ENV_UPPERCASE)] }}
           TF_VAR_EARTH_DATA_LOGIN_PASSWORD: ${{ secrets[format('EARTH_DATA_LOGIN_PASSWORD_{0}', env.TARGET_ENV_UPPERCASE)] }}
         run: |
-          ls -al
-          ls -al bin/
-          which python3
-          python3 --version
-          python3 override.py https://github.com/podaac/tig/releases/download/${{ env.new_version }}/tig-terraform-${{ env.new_version }}.zip "ghcr.io/podaac/tig:${{ env.DOCKER_METADATA_OUTPUT_VERSION }}"
-          ls -al
-          echo "Show override contents"
-          cat override.tf.json
-          echo "End show override contents"
-          terraform --version
+          python3 override.py https://github.com/podaac/tig/releases/download/${{ env.NEW_VERSION }}/tig-terraform-${{ env.NEW_VERSION }}.zip "${{ env.DOCKER_IMAGE_TAG }}"
           source bin/config.sh ${{ env.TARGET_ENV_LOWERCASE }}
-          terraform plan -var-file=tfvars/"${{ env.TARGET_ENV_LOWERCASE }}".tfvars -var="app_version=${{ env.new_version }}" -out="tfplan"
-          terraform apply -auto-approve tfplan > /dev/null
+          terraform plan -var-file=tfvars/"${{ env.TARGET_ENV_LOWERCASE }}".tfvars -var="app_version=${{ env.NEW_VERSION }}" -out="tfplan"
+          terraform apply -auto-approve tfplan > /dev/null

.github/workflows/wait-for-pypi.py

@@ -3,31 +3,27 @@
 import tempfile
 import logging
 import subprocess
-
 import tenacity
-
+import time
 '''
 Sometimes the package published to PyPi is not immediately available for download from the index. This script
 simply repeatedly tries to download a specific version of a package from PyPI (or test.pypi) until it succeeds or
 a limit is exceeded.
 '''
-
-
 @tenacity.retry(
     wait=tenacity.wait_exponential(multiplier=1, min=4, max=10),
     retry=tenacity.retry_if_exception_type(subprocess.CalledProcessError),
     stop=tenacity.stop_after_delay(120),
     before_sleep=tenacity.before_sleep_log(logging.getLogger(__name__), logging.DEBUG)
 )
 def download_package(package):
+    time.sleep(20)  # Wait 20 seconds before first try
     subprocess.check_call([sys.executable, '-m',
                            'pip', '--isolated', '--no-cache-dir',
                            'download', '--no-deps', '-d', tempfile.gettempdir(), '--index-url',
                            'https://pypi.org/simple/',
                            '--extra-index-url', 'https://test.pypi.org/simple/', package
                            ])
-
-
 if __name__ == '__main__':
     logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
     package_spec = sys.argv[1]

.pylintrc

@@ -36,9 +36,6 @@ persistent=yes
 # Specify a configuration file.
 #rcfile=
 
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages.
-suggestion-mode=yes
 
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.

CHANGELOG.md

@@ -14,6 +14,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 
 
+## [0.15.0]
+
+### Added
+### Changed
+- Update to python 3.12
+- Update github actions build to use arm ubuntu to build images
+- Update poetry version 2.3.2
+### Deprecated
+### Removed
+### Fixed
+- [issue/72] (https://github.com/podaac/hitide/issues/72): empty granules for VIIRS_NPP-NAVO-L2P-v3.0 moved up code where we test lon lat for nans. 
+- [issue/78] (https://github.com/podaac/hitide/issues/78): error message for empty granules
+- [issue/87] (https://github.com/podaac/hitide/issues/87): output message from cli call on input used to call tig.
+### Security
+
+
 ## [0.14.0]
 
 ### Added

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2026 California Institute of Technology
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.12-slim
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \

docker/lambdaDockerfile

@@ -1,6 +1,6 @@
 ARG FUNCTION_DIR="/function"
 
-FROM python:3.10-slim as build-image
+FROM python:3.12-slim as build-image
 
 # Include global arg in this stage of the build
 ARG FUNCTION_DIR