Skip to content

Commit ff6aa15

Browse files
authored
ci: Update CI (#183)
1 parent 9424433 commit ff6aa15

File tree

10 files changed

+38
-16
lines changed

10 files changed

+38
-16
lines changed

.github/workflows/ci_static-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- black-check
3333
steps:
3434
- uses: actions/checkout@v2
35-
- uses: actions/setup-python@v1
35+
- uses: actions/setup-python@v2
3636
with:
3737
python-version: 3.8
3838
- run: |

.github/workflows/ci_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# - examples
4040
steps:
4141
- uses: actions/checkout@v2
42-
- uses: actions/setup-python@v1
42+
- uses: actions/setup-python@v2
4343
with:
4444
python-version: ${{ matrix.python }}
4545
architecture: ${{ matrix.platform.architecture }}

codebuild/python3.5.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ phases:
2626
# Testing every minor version
2727
# is too extreme at this time.
2828
# The choice of versions should be reviewed.
29-
- pyenv install 3.5.9
30-
- pyenv local 3.5.9
29+
- pyenv install 3.5.10
30+
- pyenv local 3.5.10
3131
- pip install tox tox-pyenv
3232
- tox

codebuild/python3.6.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@ phases:
1414
python: latest
1515
build:
1616
commands:
17-
- pip install tox
17+
- pyenv install 3.6.15
18+
- pyenv local 3.6.15
19+
- pip install tox tox-pyenv
1820
- tox

codebuild/python3.7.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ phases:
2626
# Testing every minor version
2727
# is too extreme at this time.
2828
# The choice of versions should be reviewed.
29-
- pyenv install 3.7.9
30-
- pyenv local 3.7.9
29+
- pyenv install 3.7.12
30+
- pyenv local 3.7.12
3131
- pip install tox tox-pyenv
3232
- tox

codebuild/python3.8.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ phases:
1414
python: latest
1515
build:
1616
commands:
17-
- pyenv install 3.8.6
18-
- pyenv local 3.8.6
17+
- pyenv install 3.8.12
18+
- pyenv local 3.8.12
1919
- pip install tox tox-pyenv
2020
- tox

codebuild/python3.9.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ phases:
1414
python: latest
1515
build:
1616
commands:
17-
- pyenv install 3.9.0
18-
- pyenv local 3.9.0
17+
- pyenv install 3.9.7
18+
- pyenv local 3.9.7
1919
- pip install tox tox-pyenv
2020
- tox

examples/test/examples_test_utils.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
1-
"""Helper utilities for use while testing examples."""
1+
# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License"). You
4+
# may not use this file except in compliance with the License. A copy of
5+
# the License is located at
6+
#
7+
# http://aws.amazon.com/apache2.0/
8+
#
9+
# or in the "license" file accompanying this file. This file is
10+
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
11+
# ANY KIND, either express or implied. See the License for the specific
12+
# language governing permissions and limitations under the License.
13+
"""Helper utilities for use while testing examples.
14+
15+
isort:skip_file
16+
"""
217
import os
318
import sys
419

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

23+
# fmt: off
824
from integration_test_utils import cmk_arn, cmk_mrk_arn, ddb_table_name, second_cmk_mrk_arn # noqa pylint: disable=unused-import
25+
# fmt: on

examples/test/test_aws_kms_encrypted_examples.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020
aws_kms_multi_region_key,
2121
)
2222

23-
from .examples_test_utils import cmk_arn, cmk_mrk_arn, ddb_table_name, second_cmk_mrk_arn # noqa pylint: disable=unused-import
23+
from .examples_test_utils import ( # noqa pylint: disable=unused-import
24+
cmk_arn,
25+
cmk_mrk_arn,
26+
ddb_table_name,
27+
second_cmk_mrk_arn,
28+
)
2429

2530
pytestmark = [pytest.mark.examples]
2631

src/dynamodb_encryption_sdk/material_providers/most_recent.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
pass
3636

3737

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

0 commit comments

Comments
 (0)