DESENG-617 Merge main

bcgov · Jun 28, 2024 · 7d5992c · 7d5992c
2 parents fa6e834 + ae08700
commit 7d5992c
Show file tree

Hide file tree

Showing 162 changed files with 5,156 additions and 2,784 deletions.
diff --git a/.github/workflows/analytics-api-ci.yml b/.github/workflows/analytics-api-ci.yml
@@ -49,6 +49,11 @@ jobs:
           make flake8
   testing:
     needs: setup-job
+
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     env:
       FLASK_ENV: "testing"
       DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/postgres"
@@ -69,7 +74,7 @@ jobs:
       USE_TEST_KEYCLOAK_DOCKER: "YES"
 
       SQLALCHEMY_DATABASE_URI: "postgresql://postgres:postgres@localhost:5432/postgres"
-      
+
     runs-on: ubuntu-20.04
 
     services:
@@ -103,14 +108,14 @@ jobs:
         run: |
           echo "CODECOV_BRANCH=PR_${{github.head_ref}}" >> $GITHUB_ENV
         if: github.event_name == 'pull_request'
-        
+
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
           flags: analyticsapi
           name: codecov-analytics-api
-          fail_ci_if_error: true   
-          verbose: true 
+          fail_ci_if_error: true
+          verbose: true
           override_branch: ${{env.CODECOV_BRANCH}}
           token: ${{ secrets.CODECOV_TOKEN }}
 

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
diff --git a/analytics-api/requirements.txt b/analytics-api/requirements.txt
@@ -11,7 +11,7 @@ Mako==1.3.3
 MarkupSafe==2.1.2
 SQLAlchemy-Utils==0.40.0
 SQLAlchemy==1.4.52
-Werkzeug==2.3.8
+Werkzeug==3.0.3
 alembic==1.13.1
 aniso8601==9.0.1
 attrs==23.2.0
@@ -22,7 +22,7 @@ certifi==2023.7.22
 charset-normalizer==3.1.0
 click==8.1.7
 ecdsa==0.18.0
-flask-jwt-oidc==0.3.0
+flask_jwt_oidc==0.3.0
 flask-marshmallow==1.0.0
 flask-restx==1.1.0
 gunicorn==20.1.0

diff --git a/analytics-api/requirements/prod.txt b/analytics-api/requirements/prod.txt
@@ -19,7 +19,7 @@ itsdangerous
 sentry-sdk[flask]
 bcrypt
 jaeger-client
-Werkzeug<3
+Werkzeug<4
 minio
 pyhumps
 sqlalchemy-utils