Merge branch 'develop' into feature/PODAAC-6185

# Conflicts: # .github/workflows/build-pipeline.yml # CHANGELOG.md # poetry.lock
podaac · Jul 26, 2024 · ddfadc2 · ddfadc2
2 parents 71eec66 + d7a45a9
commit ddfadc2
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 117 deletions.
diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml
@@ -84,7 +84,7 @@ jobs:
           poetry run flake8 --ignore=E501,W503,W504 cumulus_file_rename
 
       - name: Run Snyk on Python
-        uses: snyk/actions/python-3.9@master
+        uses: snyk/actions/python-3.10@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,15 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [Unreleased] 
 
 ### Added
 ### Changed
+- **PODAAC-6185**
+  - python 3.9 -> 3.10
 ### Deprecated
 ### Removed
 ### Fixed
-- **PODAAC-6185**
-  - upgrade to python 3.10
 ### Security
 
 ## [v2.2.0]