Merge branch 'release/v4.6.0'

.github/workflows/accessibility.yml

@@ -16,14 +16,14 @@ jobs:
         # pa11y runs faster and produces smaller artifacts
         # lighthouse includes performance tests and other checks for non-a11y best practices
         # for now, just use pa11y as we focus on improving a11y specifically
-        package: ["pa11y"] 
+        package: ["pa11y"]
       fail-fast: false # don't cancel lighthouse job if pa11y fails, and vice versa
     env:
       AMY_DATABASE_HOST: localhost
       AMY_DATABASE_PORT: 5432
       AMY_DATABASE_NAME: test_amy
       AMY_DATABASE_USER: postgres
-      AMY_DATABASE_PASSWORD: postgres  
+      AMY_DATABASE_PASSWORD: postgres
       AMY_INSTRUCTOR_RECRUITMENT_ENABLED: True
 
     services:
@@ -40,7 +40,7 @@ jobs:
           --health-retries 5
         ports:
           - 5432:5432
-      
+
     steps:
 
       # Database setup
@@ -94,7 +94,7 @@ jobs:
 
       - name: run Lighthouse CI
         run: |
-          npm install -g @lhci/cli@0.12.x 
+          npm install -g @lhci/cli@0.12.x
           npm install -g puppeteer
           lhci autorun
         env:
@@ -109,7 +109,7 @@ jobs:
         if: matrix.package == 'lighthouse'
 
       # Pa11y
-      
+
       - name: Start server in background
         run: |
           pipenv run make serve &
@@ -123,7 +123,7 @@ jobs:
         continue-on-error: true
 
       - name: Upload pa11y test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pa11y-ci-report
           path: pa11y-ci-report/

.github/workflows/cicd_develop.yml

@@ -30,15 +30,15 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ vars.AWS_ECR_ROLE_TO_ASSUME }}
         aws-region: ${{ vars.AWS_REGION }}
         mask-aws-account-id: false
 
     - name: Login to Amazon ECR
       id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
+      uses: aws-actions/amazon-ecr-login@v2
 
     - name: Build, tag, and push image to Amazon ECR
       id: build-image
@@ -62,7 +62,7 @@ jobs:
 
     steps:
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ vars.AWS_ECS_ROLE_TO_ASSUME }}
         aws-region: ${{ vars.AWS_REGION }}
@@ -83,7 +83,7 @@ jobs:
         image: ${{ needs.build.outputs.image }}
 
     - name: Deploy Amazon ECS task definition
-      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+      uses: aws-actions/amazon-ecs-deploy-task-definition@v2
       with:
         task-definition: ${{ steps.task-def.outputs.task-definition }}
         service: ${{ vars.AMY_ECS_SERVICE_NAME }}

CHANGELOG.md

@@ -12,6 +12,27 @@ $ python docs/generate_changelog.py v4.1
 Then paste output from that script here.
 
 -----------------------------------------------------------------
+
+## v4.6 - 2025-01-20
+
+### Bugfixes
+* Emails: Improve managing instructor task in recruitments, new email action Instructor Task Created for Workshop - [#2739](https://github.com/carpentries/amy/pull/2739) by @pbanaszkiewicz
+
+### Features
+* chore(deps): Bump django from 4.2.17 to 4.2.18 - [#2740](https://github.com/carpentries/amy/pull/2740) by @dependabot[bot]
+* chore(deps-dev): Bump virtualenv from 20.26.2 to 20.26.6 - [#2738](https://github.com/carpentries/amy/pull/2738) by @dependabot[bot]
+* chore(deps): Bump jinja2 from 3.1.4 to 3.1.5 - [#2736](https://github.com/carpentries/amy/pull/2736) by @dependabot[bot]
+* Update CICD workflow - [#2735](https://github.com/carpentries/amy/pull/2735) by @pbanaszkiewicz
+* Allow admins to see upcoming teaching opportunities - [#2734](https://github.com/carpentries/amy/pull/2734) by @pbanaszkiewicz
+* Display tasks per role summary in instructor dashboard - [#2733](https://github.com/carpentries/amy/pull/2733) by @pbanaszkiewicz
+* Leverage full-text search in Postgres to improve searching for people and training requests - [#2732](https://github.com/carpentries/amy/pull/2732) by @pbanaszkiewicz
+* Multiple changes - [#2731](https://github.com/carpentries/amy/pull/2731) by @pbanaszkiewicz
+* Updates admin user documentation about automated emails - [#2730](https://github.com/carpentries/amy/pull/2730) by @maneesha
+* [Emails] Complex strategy for instructor declined for workshop - [#2729](https://github.com/carpentries/amy/pull/2729) by @pbanaszkiewicz
+* Bump django from 4.2.16 to 4.2.17 - [#2727](https://github.com/carpentries/amy/pull/2727) by @dependabot[bot]
+* Update upload-artifact version to v4 - [#2716](https://github.com/carpentries/amy/pull/2716) by @froggleston
+
+
 ## v4.5 - 2024-11-30
 
 ### Features

Pipfile

@@ -42,7 +42,7 @@ typing-extensions = "*"
 django-flags = "~=5.0.13"
 pydantic = "~=2.5.2"
 django-rest-knox = "~=4.2.0"
-jinja2 = "~=3.1.0"
+jinja2 = "~=3.1.5"
 
 [dev-packages]
 django-webtest = "~=1.9.8"