Skip to content

Commit 86f4332

Browse files
lucasmcdonald3lucasmcdonald3
committed
mplv2
1 parent 70d1364 commit 86f4332

21 files changed

+2
-73
lines changed

‎examples/src/aws_kms_discovery_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
from aws_encryption_sdk import CommitmentPolicy
5050
from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
5151

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)
5652

5753
EXAMPLE_DATA: bytes = b"Hello World"
5854

‎examples/src/aws_kms_discovery_multi_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
import aws_encryption_sdk
4646
from aws_encryption_sdk import CommitmentPolicy
4747

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)
5248

5349
EXAMPLE_DATA: bytes = b"Hello World"
5450

‎examples/src/aws_kms_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
import aws_encryption_sdk
3030
from aws_encryption_sdk import CommitmentPolicy
3131

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)
3632

3733
EXAMPLE_DATA: bytes = b"Hello World"
3834

‎examples/src/aws_kms_mrk_discovery_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@
5050
import aws_encryption_sdk
5151
from aws_encryption_sdk import CommitmentPolicy
5252

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)
5753

5854
EXAMPLE_DATA: bytes = b"Hello World"
5955

‎examples/src/aws_kms_mrk_discovery_multi_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@
5252
import aws_encryption_sdk
5353
from aws_encryption_sdk import CommitmentPolicy
5454

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)
5955

6056
EXAMPLE_DATA: bytes = b"Hello World"
6157

‎examples/src/aws_kms_mrk_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
import aws_encryption_sdk
3434
from aws_encryption_sdk import CommitmentPolicy
3535

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)
4036

4137
EXAMPLE_DATA: bytes = b"Hello World"
4238

‎examples/src/aws_kms_mrk_multi_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
import aws_encryption_sdk
4040
from aws_encryption_sdk import CommitmentPolicy
4141

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)
4642

4743
EXAMPLE_DATA: bytes = b"Hello World"
4844

‎examples/src/aws_kms_multi_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
import aws_encryption_sdk
4949
from aws_encryption_sdk import CommitmentPolicy
5050

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)
5551

5652
EXAMPLE_DATA: bytes = b"Hello World"
5753

‎examples/src/aws_kms_rsa_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
from aws_encryption_sdk import CommitmentPolicy
2828
from aws_encryption_sdk.identifiers import AlgorithmSuite
2929

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)
3430

3531
EXAMPLE_DATA: bytes = b"Hello World"
3632

‎examples/src/file_streaming_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
import aws_encryption_sdk
3737
from aws_encryption_sdk import CommitmentPolicy
3838

39-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
40-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
41-
42-
sys.path.append(MODULE_ROOT_DIR)
4339

4440

4541
def encrypt_and_decrypt_with_keyring(

‎examples/src/hierarchical_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@
5555

5656
from .branch_key_id_supplier_example import ExampleBranchKeyIdSupplier
5757

58-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
59-
module_root_dir = '/'.join(__file__.split("/")[:-1])
60-
61-
sys.path.append(module_root_dir)
6258

6359
EXAMPLE_DATA: bytes = b"Hello World"
6460

‎examples/src/legacy/module_.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/src/migration_set_commitment_policy_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
import aws_encryption_sdk
3333
from aws_encryption_sdk import CommitmentPolicy
3434

35-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
36-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
37-
38-
sys.path.append(MODULE_ROOT_DIR)
3935

4036
EXAMPLE_DATA: bytes = b"Hello World"
4137

‎examples/src/module_.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/src/multi_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@
5454
import aws_encryption_sdk
5555
from aws_encryption_sdk import CommitmentPolicy
5656

57-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
58-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
59-
60-
sys.path.append(MODULE_ROOT_DIR)
6157

6258
EXAMPLE_DATA: bytes = b"Hello World"
6359

‎examples/src/raw_aes_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
import aws_encryption_sdk
3535
from aws_encryption_sdk import CommitmentPolicy
3636

37-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
38-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
39-
40-
sys.path.append(MODULE_ROOT_DIR)
4137

4238
EXAMPLE_DATA: bytes = b"Hello World"
4339

‎examples/src/raw_rsa_keyring_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
from aws_encryption_sdk import CommitmentPolicy
4949
from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
5050

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)
5551

5652
EXAMPLE_DATA: bytes = b"Hello World"
5753

‎examples/src/required_encryption_context_cmm.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525
from aws_encryption_sdk import CommitmentPolicy
2626
from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
2727

28-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks
29-
module_root_dir = '/'.join(__file__.split("/")[:-1])
30-
31-
sys.path.append(module_root_dir)
32-
3328
EXAMPLE_DATA: bytes = b"Hello World"
3429

3530

‎examples/src/set_encryption_algorithm_suite_example.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@
5151
from aws_encryption_sdk import CommitmentPolicy
5252
from aws_encryption_sdk.identifiers import AlgorithmSuite
5353

54-
# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
55-
MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
56-
57-
sys.path.append(MODULE_ROOT_DIR)
5854

5955
EXAMPLE_DATA: bytes = b"Hello World"
6056

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def get_requirements():
4545
extras_require={
4646
"MPL": ["aws-cryptographic-material-providers @" \
4747
"git+https://github.com/aws/aws-cryptographic-material-providers-library.git@" \
48-
"lucmcdon/python-mpl#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"],
48+
"lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"],
4949
},
5050
classifiers=[
5151
"Development Status :: 5 - Production/Stable",

‎test_vector_handlers/test/aws-crypto-tools-test-vector-framework

0 commit comments

Comments
 (0)