Skip to content

chore: Refer to renamed MPL libraries #698

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.

Sign up for GitHub

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 12 commits into from
Sep 6, 2024
Merged

chore: Refer to renamed MPL libraries #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e831419
chore: Refer to renamed MPL libraries
lucasmcdonald3 Sep 4, 2024
fbca0c8
use branch with dafny
lucasmcdonald3 Sep 4, 2024
3bbd641
Update requirements_mpl.txt
lucasmcdonald3 Sep 4, 2024
2bda632
Update requirements_mpl.txt
lucasmcdonald3 Sep 4, 2024
1730a0d
Update requirements_mpl.txt
lucasmcdonald3 Sep 4, 2024
fb457ac
Update requirements_mpl.txt
lucasmcdonald3 Sep 4, 2024
2386ea9
debug
lucasmcdonald3 Sep 5, 2024
3855a95
debug
lucasmcdonald3 Sep 5, 2024
af27344
debug
lucasmcdonald3 Sep 5, 2024
b8eeeea
debug
lucasmcdonald3 Sep 5, 2024
1bab03e
debug
lucasmcdonald3 Sep 5, 2024
cdad596
m
lucasmcdonald3 Sep 5, 2024
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 performance_tests/requirements_mpl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
aws-cryptographic-material-providers @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
2 changes: 1 addition & 1 deletion requirements_mpl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
aws-cryptographic-material-providers @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ def get_requirements():
# TODO-MPL: Point at PyPI once MPL is released.
# This blocks releasing ESDK-Python MPL integration.
extras_require={
"MPL": ["aws-cryptographic-material-providers @" \
"MPL": ["aws-cryptographic-materialproviders @" \
"git+https://github.com/aws/aws-cryptographic-material-providers-library.git@" \
"lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"],
"python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"],
},
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand Down
2 changes: 1 addition & 1 deletion test_vector_handlers/requirements_mpl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
amazon-cryptographic-material-providers-test-vectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python
aws-cryptography-internal-mpl-testvectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python
4 changes: 2 additions & 2 deletions test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""Singleton provider for the KeyVectors client."""
# # Ignore missing MPL TestVectors for pylint, but the MPL TestVectors is required for this file
# pylint: disable=import-error
from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\
from aws_cryptography_materialproviders_test_vectors.smithygenerated.\
aws_cryptography_materialproviderstestvectorkeys.client import (
KeyVectors,
)
from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\
from aws_cryptography_materialproviders_test_vectors.smithygenerated.\
aws_cryptography_materialproviderstestvectorkeys.config import (
KeyVectorsConfig
)
Expand Down
4 changes: 2 additions & 2 deletions test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

# Ignore missing MPL for pylint, but the MPL is required for this example
# noqa pylint: disable=import-error
from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\
from aws_cryptography_materialproviders_test_vectors.smithygenerated.\
aws_cryptography_materialproviderstestvectorkeys.models import (
GetKeyDescriptionInput,
GetKeyDescriptionOutput,
Expand All @@ -31,7 +31,7 @@
from aws_cryptographic_materialproviders.mpl.models import CreateMultiKeyringInput

import _dafny
from standard_library.internaldafny.generated import UTF8
from smithy_dafny_standard_library.internaldafny.generated import UTF8

# Ignore pylint not being able to read a module that requires the MPL
# pylint: disable=no-name-in-module
Expand Down
Loading