diff --git a/.github/workflows/ci_test-vector-handler.yaml b/.github/workflows/ci_test-vector-handler.yaml index 2fcd22fc9..8a142096d 100644 --- a/.github/workflows/ci_test-vector-handler.yaml +++ b/.github/workflows/ci_test-vector-handler.yaml @@ -19,7 +19,7 @@ jobs: os: - ubuntu-latest - windows-latest - - macos-latest + - macos-12 python: - 3.8 - 3.x @@ -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 diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 3187b8db0..b03c47163 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -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 @@ -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 diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index cfb4bdcdb..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,113 +0,0 @@ -# https://packaging.python.org/guides/supporting-windows-using-appveyor/ - -environment: - - matrix: - # The only test we perform on Windows are our actual code tests. All linting, static - # analysis, etc are only run on Linux (via Travis CI). - - # Python 2.7 - - PYTHON: "C:\\Python27" - TOXENV: "py27-local" - - PYTHON: "C:\\Python27" - TOXENV: "py27-integ" - - PYTHON: "C:\\Python27" - TOXENV: "py27-accept" - - PYTHON: "C:\\Python27" - TOXENV: "py27-examples" - - PYTHON: "C:\\Python27-x64" - TOXENV: "py27-local" - - PYTHON: "C:\\Python27-x64" - TOXENV: "py27-integ" - - PYTHON: "C:\\Python27-x64" - TOXENV: "py27-accept" - - PYTHON: "C:\\Python27-x64" - TOXENV: "py27-examples" - - # Python 3.4 - - PYTHON: "C:\\Python34" - TOXENV: "py34-local" - - PYTHON: "C:\\Python34" - TOXENV: "py34-integ" - - PYTHON: "C:\\Python34" - TOXENV: "py34-accept" - - PYTHON: "C:\\Python34" - TOXENV: "py34-examples" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" - TOXENV: "py34-local" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" - TOXENV: "py34-integ" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" - TOXENV: "py34-accept" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" - TOXENV: "py34-examples" - - # Python 3.5 - - PYTHON: "C:\\Python35" - TOXENV: "py35-local" - - PYTHON: "C:\\Python35" - TOXENV: "py35-integ" - - PYTHON: "C:\\Python35" - TOXENV: "py35-accept" - - PYTHON: "C:\\Python35" - TOXENV: "py35-examples" - - PYTHON: "C:\\Python35-x64" - TOXENV: "py35-local" - - PYTHON: "C:\\Python35-x64" - TOXENV: "py35-integ" - - PYTHON: "C:\\Python35-x64" - TOXENV: "py35-accept" - - PYTHON: "C:\\Python35-x64" - TOXENV: "py35-examples" - - # Python 3.6 - - PYTHON: "C:\\Python36" - TOXENV: "py36-local" - - PYTHON: "C:\\Python36" - TOXENV: "py36-integ" - - PYTHON: "C:\\Python36" - TOXENV: "py36-accept" - - PYTHON: "C:\\Python36" - TOXENV: "py36-examples" - - PYTHON: "C:\\Python36-x64" - TOXENV: "py36-local" - - PYTHON: "C:\\Python36-x64" - TOXENV: "py36-integ" - - PYTHON: "C:\\Python36-x64" - TOXENV: "py36-accept" - - PYTHON: "C:\\Python36-x64" - TOXENV: "py36-examples" - - # Python 3.7 - - PYTHON: "C:\\Python37" - TOXENV: "py37-local" - - PYTHON: "C:\\Python37" - TOXENV: "py37-integ" - - PYTHON: "C:\\Python37" - TOXENV: "py37-accept" - - PYTHON: "C:\\Python37" - TOXENV: "py37-examples" - - PYTHON: "C:\\Python37-x64" - TOXENV: "py37-local" - - PYTHON: "C:\\Python37-x64" - TOXENV: "py37-integ" - - PYTHON: "C:\\Python37-x64" - TOXENV: "py37-accept" - - PYTHON: "C:\\Python37-x64" - TOXENV: "py37-examples" - -install: - # Prepend newly installed Python to the PATH of this build - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - # Check the Python version to verify the correct version was installed - - "python --version" - - "python -m pip install wheel tox" - -build: off - -test_script: - - "tox" diff --git a/src/aws_encryption_sdk/__init__.py b/src/aws_encryption_sdk/__init__.py index 74732bfc5..66b779fa5 100644 --- a/src/aws_encryption_sdk/__init__.py +++ b/src/aws_encryption_sdk/__init__.py @@ -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 ... )