Skip to content

Commit 91d06ae

Browse files
chore: Merge from master (#670)
1 parent 44d9192 commit 91d06ae

File tree

4 files changed

+5
-118
lines changed

4 files changed

+5
-118
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
os:
2020
- ubuntu-latest
2121
- windows-latest
22-
- macos-latest
22+
- macos-12
2323
python:
2424
- 3.8
2525
- 3.x
@@ -34,7 +34,7 @@ jobs:
3434
# x86 builds are only meaningful for Windows
3535
- os: ubuntu-latest
3636
architecture: x86
37-
- os: macos-latest
37+
- os: macos-12
3838
architecture: x86
3939
steps:
4040
- uses: aws-actions/configure-aws-credentials@v4

.github/workflows/ci_tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
# (i.e. doo files, per-package module names)
3131
# Disable for now
3232
# - windows-latest
33-
- macos-latest
33+
- macos-12
3434
python:
3535
- 3.7
3636
- 3.8
@@ -59,7 +59,7 @@ jobs:
5959
# x86 builds are only meaningful for Windows
6060
- os: ubuntu-latest
6161
architecture: x86
62-
- os: macos-latest
62+
- os: macos-12
6363
architecture: x86
6464
# MPL is not supported on <3.11
6565
- python: 3.7

appveyor.yml

-113
This file was deleted.

src/aws_encryption_sdk/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def decrypt(self, **kwargs):
164164
... 'arn:aws:kms:us-east-1:2222222222222:key/22222222-2222-2222-2222-222222222222',
165165
... 'arn:aws:kms:us-east-1:3333333333333:key/33333333-3333-3333-3333-333333333333'
166166
... ])
167-
>>> my_ciphertext, encryptor_header = client.decrypt(
167+
>>> my_plaintext, decryptor_header = client.decrypt(
168168
... source=my_ciphertext,
169169
... key_provider=kms_key_provider
170170
... )

0 commit comments

Comments
 (0)