Skip to content

chore: Merge from master #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 30, 2024
Merged

chore: Merge from master #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c34aad
chore: Updated description of decrypt() usage in src/aws_encryption_s…
RitvikKapila Apr 19, 2024
7545de4
fix(CI): updated ci_test-vector-handler.yaml and ci_tests.yaml (#665)
RitvikKapila Apr 26, 2024
e28d146
fix(CI): removed appveyor.yml (#668)
RitvikKapila Apr 30, 2024
67785f9
Merge from master
lucasmcdonald3 Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci_test-vector-handler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
os:
- ubuntu-latest
- windows-latest
- macos-latest
- macos-12
python:
- 3.8
- 3.x
Expand All @@ -34,7 +34,7 @@ jobs:
# x86 builds are only meaningful for Windows
- os: ubuntu-latest
architecture: x86
- os: macos-latest
- os: macos-12
architecture: x86
steps:
- uses: aws-actions/configure-aws-credentials@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
# (i.e. doo files, per-package module names)
# Disable for now
# - windows-latest
- macos-latest
- macos-12
python:
- 3.7
- 3.8
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
# x86 builds are only meaningful for Windows
- os: ubuntu-latest
architecture: x86
- os: macos-latest
- os: macos-12
architecture: x86
# MPL is not supported on <3.11
- python: 3.7
Expand Down
113 changes: 0 additions & 113 deletions appveyor.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/aws_encryption_sdk/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def decrypt(self, **kwargs):
... 'arn:aws:kms:us-east-1:2222222222222:key/22222222-2222-2222-2222-222222222222',
... 'arn:aws:kms:us-east-1:3333333333333:key/33333333-3333-3333-3333-333333333333'
... ])
>>> my_ciphertext, encryptor_header = client.decrypt(
>>> my_plaintext, decryptor_header = client.decrypt(
... source=my_ciphertext,
... key_provider=kms_key_provider
... )
Expand Down