Skip to content

Commit 864d29b

Browse files
chore: Change MPL branch, remove PYTHONPATH workarounds (#683)
1 parent abede74 commit 864d29b

28 files changed

+24
-126
lines changed

.github/workflows/ci_tests.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ jobs:
2525
matrix:
2626
os:
2727
- ubuntu-latest
28-
# Windows fails due to "No module named 'Wrappers'"
29-
# This SHOULD be fixed once Dafny generates fully-qualified import statements
30-
# (i.e. doo files, per-package module names)
31-
# Disable for now
32-
# - windows-latest
28+
- windows-latest
3329
- macos-12
3430
python:
3531
- 3.8

examples/src/aws_kms_discovery_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
For more information on how to use KMS Discovery keyrings, see
3333
https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/use-kms-keyring.html#kms-keyring-discovery
3434
"""
35-
import sys
3635

3736
import boto3
3837
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -49,11 +48,6 @@
4948
from aws_encryption_sdk import CommitmentPolicy
5049
from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
5150

52-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
53-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
54-
55-
sys.path.append(MODULE_ROOT_DIR)
56-
5751
EXAMPLE_DATA: bytes = b"Hello World"
5852

5953

examples/src/aws_kms_discovery_multi_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
For more information on how to use KMS Discovery keyrings, see
3030
https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/use-kms-keyring.html#kms-keyring-discovery
3131
"""
32-
import sys
3332

3433
import boto3
3534
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -45,11 +44,6 @@
4544
import aws_encryption_sdk
4645
from aws_encryption_sdk import CommitmentPolicy
4746

48-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
49-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
50-
51-
sys.path.append(MODULE_ROOT_DIR)
52-
5347
EXAMPLE_DATA: bytes = b"Hello World"
5448

5549

examples/src/aws_kms_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
For more information on how to use KMS keyrings, see
1818
https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/use-kms-keyring.html
1919
"""
20-
import sys
2120

2221
import boto3
2322
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -29,11 +28,6 @@
2928
import aws_encryption_sdk
3029
from aws_encryption_sdk import CommitmentPolicy
3130

32-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
33-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
34-
35-
sys.path.append(MODULE_ROOT_DIR)
36-
3731
EXAMPLE_DATA: bytes = b"Hello World"
3832

3933

examples/src/aws_kms_mrk_discovery_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
For more information on how to use KMS Discovery keyrings, see
3535
https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/use-kms-keyring.html#kms-keyring-discovery
3636
"""
37-
import sys
3837

3938
import boto3
4039
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -50,11 +49,6 @@
5049
import aws_encryption_sdk
5150
from aws_encryption_sdk import CommitmentPolicy
5251

53-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
54-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
55-
56-
sys.path.append(MODULE_ROOT_DIR)
57-
5852
EXAMPLE_DATA: bytes = b"Hello World"
5953

6054

examples/src/aws_kms_mrk_discovery_multi_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
For more information on how to use KMS Discovery keyrings, see
3737
https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/use-kms-keyring.html#kms-keyring-discovery
3838
"""
39-
import sys
4039

4140
import boto3
4241
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -52,11 +51,6 @@
5251
import aws_encryption_sdk
5352
from aws_encryption_sdk import CommitmentPolicy
5453

55-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
56-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
57-
58-
sys.path.append(MODULE_ROOT_DIR)
59-
6054
EXAMPLE_DATA: bytes = b"Hello World"
6155

6256

examples/src/aws_kms_mrk_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
For more info on KMS MRK (multi-region keys), see the KMS documentation:
2222
https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html
2323
"""
24-
import sys
2524

2625
import boto3
2726
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -33,11 +32,6 @@
3332
import aws_encryption_sdk
3433
from aws_encryption_sdk import CommitmentPolicy
3534

36-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
37-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
38-
39-
sys.path.append(MODULE_ROOT_DIR)
40-
4135
EXAMPLE_DATA: bytes = b"Hello World"
4236

4337

examples/src/aws_kms_mrk_multi_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
For more info on KMS MRK (multi-region keys), see the KMS documentation:
2828
https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html
2929
"""
30-
import sys
3130

3231
import boto3
3332
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -39,11 +38,6 @@
3938
import aws_encryption_sdk
4039
from aws_encryption_sdk import CommitmentPolicy
4140

42-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
43-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
44-
45-
sys.path.append(MODULE_ROOT_DIR)
46-
4741
EXAMPLE_DATA: bytes = b"Hello World"
4842

4943

examples/src/aws_kms_multi_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
For more information on how to use Multi keyrings, see
3737
https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/use-multi-keyring.html
3838
"""
39-
import sys
4039

4140
import boto3
4241
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -48,11 +47,6 @@
4847
import aws_encryption_sdk
4948
from aws_encryption_sdk import CommitmentPolicy
5049

51-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
52-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
53-
54-
sys.path.append(MODULE_ROOT_DIR)
55-
5650
EXAMPLE_DATA: bytes = b"Hello World"
5751

5852

examples/src/aws_kms_rsa_keyring_example.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# For more information on how to use KMS keyrings, see
1515
# https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/use-kms-keyring.html
1616
"""
17-
import sys
1817

1918
import boto3
2019
from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
@@ -27,11 +26,6 @@
2726
from aws_encryption_sdk import CommitmentPolicy
2827
from aws_encryption_sdk.identifiers import AlgorithmSuite
2928

30-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
31-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
32-
33-
sys.path.append(MODULE_ROOT_DIR)
34-
3529
EXAMPLE_DATA: bytes = b"Hello World"
3630

3731

0 commit comments

Comments
 (0)