chore(CI): fix CI (#785)

Author: rishav-karanjit

.github/workflows/ci_codebuild-tests.yml

@@ -1,7 +1,6 @@
 name: AWS CodeBuild CI
 
 on:
-  pull_request:
   push:
   # Run once a day
   schedule:
@@ -47,7 +46,7 @@ jobs:
           role-duration-seconds: 7200
       - name: Run python-${{ matrix.python.python_version }} ${{ matrix.codebuild_file_name }}
         uses: aws-actions/aws-codebuild-run-build@v1
-        timeout-minutes: 120
+        timeout-minutes: 150
         with:
           project-name: python-esdk
           buildspec-override: codebuild/py${{ matrix.python.python_version }}/${{ matrix.codebuild_file_name }}

.github/workflows/ci_test-vector-handler.yaml

@@ -24,7 +24,9 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
-          - macos-13
+          - macos-latest
+          # runs on macos-15-intel as macos-latest does not work in all python versions. 
+          - macos-15-intel
         python:
           - 3.8
           - 3.x
@@ -39,7 +41,7 @@ jobs:
           # x86 builds are only meaningful for Windows
           - os: ubuntu-latest
             architecture: x86
-          - os: macos-13
+          - os: macos-latest
             architecture: x86
     steps:
       - uses: aws-actions/configure-aws-credentials@v4

.github/workflows/ci_tests.yaml

@@ -25,7 +25,7 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
-          - macos-13
+          - macos-latest
         python:
           - 3.8
           - 3.9
@@ -50,11 +50,23 @@ jobs:
           - ""
           - -mpl
         exclude:
+          # Python <3.11 incompatible with macOS ARM64 runners
+          # https://github.com/actions/setup-python/issues/948
+          - python: 3.7
+            os: macos-latest
+          - python: 3.8
+            os: macos-latest
+          - python: 3.9
+            os: macos-latest
+          - python: 3.10
+            os: macos-latest
+
           # x86 builds are only meaningful for Windows
           - os: ubuntu-latest
             architecture: x86
-          - os: macos-13
+          - os: macos-latest
             architecture: x86
+
           # MPL is not supported on <3.11
           - python: 3.7
             optional_mpl_dependency: -mpl
@@ -74,6 +86,7 @@ jobs:
           git config --global core.longpaths true
 
       - uses: actions/checkout@v4
+
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}

.github/workflows/daily_ci.yml

@@ -4,9 +4,13 @@ name: Daily CI
 on:
   schedule:
     - cron: "00 15 * * 1-5"
+  pull_request:
+    paths:
+      .github/workflows/daily_ci.yml
 
 permissions:
   contents: read
+  id-token: write
 
 jobs:
   codebuild_batch:

.github/workflows/pull.yml

@@ -3,6 +3,12 @@ name: Pull Request Workflow
 on:
   pull_request:
 
+# Concurrency control helps avoid CodeBuild throttling.
+# When new commits are pushed, the previous workflow run is cancelled.
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+  
 permissions:
   id-token: write
   contents: read

decrypt_oracle/test/requirements.txt

@@ -1,5 +1,5 @@
 mock
-pytest>=3.3.1
+pytest>=8.4.2
 pytest-cov
-pytest-mock
+pytest-mock>=3.14.0
 requests

decrypt_oracle/tox.ini

@@ -233,7 +233,7 @@ commands = seed-isort-config
 [testenv:isort]
 basepython = python3
 deps = isort
-commands = isort -rc \
+commands = isort \
     src \
     test \
     #doc \

dev_requirements/test-requirements.txt

@@ -1,4 +1,4 @@
 mock==4.0.3
-pytest==7.2.1
+pytest==8.0.0
 pytest-cov==4.0.0
 pytest-mock==3.6.1

performance_tests/tox.ini

@@ -128,7 +128,7 @@ commands = seed-isort-config
 [testenv:isort]
 basepython = python3
 deps = -r../dev_requirements/linter-requirements.txt
-commands = isort -rc \
+commands = isort \
     src \
     test \
     setup.py \

test/unit/test_compatability.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 """Unit test suite for aws_encryption_sdk.compatability"""
 import sys
+import warnings
 
 import mock
 import pytest
@@ -16,7 +17,8 @@ def test_happy_version(self):
         with mock.patch.object(sys, "version_info") as v_info:
             v_info.major = 3
             v_info.minor = 6
-            with pytest.warns(None) as record:
+            with warnings.catch_warnings(record=True) as record:
+                warnings.simplefilter("always")
                 _warn_deprecated_python()
             assert len(record) == 0