Skip to content

ci: Update CI #183

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.

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
Nov 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci_static-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- black-check
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
- uses: actions/setup-python@v2
with:
python-version: 3.8
- run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
# - examples
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
architecture: ${{ matrix.platform.architecture }}
Expand Down
4 changes: 2 additions & 2 deletions codebuild/python3.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ phases:
# Testing every minor version
# is too extreme at this time.
# The choice of versions should be reviewed.
- pyenv install 3.5.9
- pyenv local 3.5.9
- pyenv install 3.5.10
- pyenv local 3.5.10
- pip install tox tox-pyenv
- tox
4 changes: 3 additions & 1 deletion codebuild/python3.6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ phases:
python: latest
build:
commands:
- pip install tox
- pyenv install 3.6.15
- pyenv local 3.6.15
- pip install tox tox-pyenv
- tox
4 changes: 2 additions & 2 deletions codebuild/python3.7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ phases:
# Testing every minor version
# is too extreme at this time.
# The choice of versions should be reviewed.
- pyenv install 3.7.9
- pyenv local 3.7.9
- pyenv install 3.7.12
- pyenv local 3.7.12
- pip install tox tox-pyenv
- tox
4 changes: 2 additions & 2 deletions codebuild/python3.8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ phases:
python: latest
build:
commands:
- pyenv install 3.8.6
- pyenv local 3.8.6
- pyenv install 3.8.12
- pyenv local 3.8.12
- pip install tox tox-pyenv
- tox
4 changes: 2 additions & 2 deletions codebuild/python3.9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ phases:
python: latest
build:
commands:
- pyenv install 3.9.0
- pyenv local 3.9.0
- pyenv install 3.9.7
- pyenv local 3.9.7
- pip install tox tox-pyenv
- tox
19 changes: 18 additions & 1 deletion examples/test/examples_test_utils.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
"""Helper utilities for use while testing examples."""
# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
"""Helper utilities for use while testing examples.

isort:skip_file
"""
import os
import sys

os.environ["AWS_ENCRYPTION_SDK_EXAMPLES_TESTING"] = "yes"
sys.path.extend([os.sep.join([os.path.dirname(__file__), "..", "..", "test", "integration"])])

# fmt: off
from integration_test_utils import cmk_arn, cmk_mrk_arn, ddb_table_name, second_cmk_mrk_arn # noqa pylint: disable=unused-import
# fmt: on
7 changes: 6 additions & 1 deletion examples/test/test_aws_kms_encrypted_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
aws_kms_multi_region_key,
)

from .examples_test_utils import cmk_arn, cmk_mrk_arn, ddb_table_name, second_cmk_mrk_arn # noqa pylint: disable=unused-import
from .examples_test_utils import ( # noqa pylint: disable=unused-import
cmk_arn,
cmk_mrk_arn,
ddb_table_name,
second_cmk_mrk_arn,
)

pytestmark = [pytest.mark.examples]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@
pass


__all__ = (
"CachingMostRecentProvider",
)
__all__ = ("CachingMostRecentProvider",)
_LOGGER = logging.getLogger(LOGGER_NAME)
#: Grace period during which we will return the latest local materials. This allows multiple
#: threads to be using this same provider without risking lock contention or many threads
Expand Down