Skip to content
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

⬆️ Upgrade dependencies #161

Merged
merged 18 commits into from
Apr 4, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r requirements.dev.txt
pip install -r requirements.txt -r requirements.dev.txt --upgrade
- name: Run tests with pytest
run: pytest

Expand All @@ -37,7 +37,7 @@ jobs:
python -m pip install --upgrade pip
pip install \
isort~=5.13.2 \
black~=23.12.1
black~=24.3.0
- name: Check import style with isort
run: |
isort . --check --profile black --diff
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r requirements.dev.txt
pip install -r requirements.txt -r requirements.dev.txt --upgrade
- name: Run tests with pytest
run: pytest

Expand All @@ -39,7 +39,7 @@ jobs:
python -m pip install --upgrade pip
pip install \
isort~=5.13.2 \
black~=23.12.1
black~=24.3.0
- name: Check import style with isort
run: |
isort . --check --profile black --diff
Expand Down Expand Up @@ -75,4 +75,4 @@ jobs:
TWINE_PASSWORD: ${{ secrets.TEST_PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload --repository testpypi dist/*
twine upload --repository testpypi dist/* --skip-existing
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ build
.venv
.pytest_cache/*
__pycache__/
.vscode/
.coverage
env
generated
generated
48 changes: 48 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"cSpell.words": [
"acapy",
"Accum",
"aiohttp",
"askar",
"Basicmessage",
"cafile",
"Camenisch",
"canonicalized",
"cloudcontroller",
"credentialsattach",
"Creds",
"crid",
"dateutil",
"didexchange",
"DIDX",
"docattach",
"errormsg",
"filtersattach",
"htilde",
"invi",
"JSESSIONID",
"Jsonld",
"Keylist",
"keypair",
"klass",
"levelname",
"Lysyanskaya",
"Mand",
"Multitenancy",
"offersattach",
"oneof",
"presentationsattach",
"proposalsattach",
"pydantic",
"pyversion",
"rctxt",
"Regs",
"requestsattach",
"Revoc",
"rrid",
"SDJWS",
"subwallet",
"Trustping",
"Verkey"
]
}
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/action_menu_fetch_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,11 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"result": Menu.from_dict(obj.get("result"))
if obj.get("result") is not None
else None
"result": (
Menu.from_dict(obj.get("result"))
if obj.get("result") is not None
else None
)
}
)
return _obj
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/attach_decorator.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,11 @@ def from_dict(cls, obj: Dict) -> Self:
{
"@id": obj.get("@id"),
"byte_count": obj.get("byte_count"),
"data": AttachDecoratorData.from_dict(obj.get("data"))
if obj.get("data") is not None
else None,
"data": (
AttachDecoratorData.from_dict(obj.get("data"))
if obj.get("data") is not None
else None
),
"description": obj.get("description"),
"filename": obj.get("filename"),
"lastmod_time": obj.get("lastmod_time"),
Expand Down
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/attach_decorator_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,11 @@ def from_dict(cls, obj: Dict) -> Self:
{
"base64": obj.get("base64"),
"json": obj.get("json"),
"jws": AttachDecoratorDataJWS.from_dict(obj.get("jws"))
if obj.get("jws") is not None
else None,
"jws": (
AttachDecoratorDataJWS.from_dict(obj.get("jws"))
if obj.get("jws") is not None
else None
),
"links": obj.get("links"),
"sha256": obj.get("sha256"),
}
Expand Down
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/attach_decorator_data1_jws.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,11 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"header": AttachDecoratorDataJWSHeader.from_dict(obj.get("header"))
if obj.get("header") is not None
else None,
"header": (
AttachDecoratorDataJWSHeader.from_dict(obj.get("header"))
if obj.get("header") is not None
else None
),
"protected": obj.get("protected"),
"signature": obj.get("signature"),
}
Expand Down
22 changes: 13 additions & 9 deletions aries_cloudcontroller/models/attach_decorator_data_jws.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,21 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"header": AttachDecoratorDataJWSHeader.from_dict(obj.get("header"))
if obj.get("header") is not None
else None,
"header": (
AttachDecoratorDataJWSHeader.from_dict(obj.get("header"))
if obj.get("header") is not None
else None
),
"protected": obj.get("protected"),
"signature": obj.get("signature"),
"signatures": [
AttachDecoratorData1JWS.from_dict(_item)
for _item in obj.get("signatures")
]
if obj.get("signatures") is not None
else None,
"signatures": (
[
AttachDecoratorData1JWS.from_dict(_item)
for _item in obj.get("signatures")
]
if obj.get("signatures") is not None
else None
),
}
)
return _obj
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/connection_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,11 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"results": [ConnRecord.from_dict(_item) for _item in obj.get("results")]
if obj.get("results") is not None
else None
"results": (
[ConnRecord.from_dict(_item) for _item in obj.get("results")]
if obj.get("results") is not None
else None
)
}
)
return _obj
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/connection_static_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,11 @@ def from_dict(cls, obj: Dict) -> Self:
"my_did": obj.get("my_did"),
"my_endpoint": obj.get("my_endpoint"),
"my_verkey": obj.get("my_verkey"),
"record": ConnRecord.from_dict(obj.get("record"))
if obj.get("record") is not None
else None,
"record": (
ConnRecord.from_dict(obj.get("record"))
if obj.get("record") is not None
else None
),
"their_did": obj.get("their_did"),
"their_verkey": obj.get("their_verkey"),
}
Expand Down
18 changes: 10 additions & 8 deletions aries_cloudcontroller/models/constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,16 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"fields": [DIFField.from_dict(_item) for _item in obj.get("fields")]
if obj.get("fields") is not None
else None,
"is_holder": [
DIFHolder.from_dict(_item) for _item in obj.get("is_holder")
]
if obj.get("is_holder") is not None
else None,
"fields": (
[DIFField.from_dict(_item) for _item in obj.get("fields")]
if obj.get("fields") is not None
else None
),
"is_holder": (
[DIFHolder.from_dict(_item) for _item in obj.get("is_holder")]
if obj.get("is_holder") is not None
else None
),
"limit_disclosure": obj.get("limit_disclosure"),
"status_active": obj.get("status_active"),
"status_revoked": obj.get("status_revoked"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class CreateWalletTokenRequest(BaseModel):

wallet_key: Optional[StrictStr] = Field(
default=None,
description="Master key used for key derivation. Only required for unamanged wallets.",
description="Master key used for key derivation. Only required for unmanaged wallets.",
)
__properties: ClassVar[List[str]] = ["wallet_key"]

Expand Down
16 changes: 10 additions & 6 deletions aries_cloudcontroller/models/cred_def_value.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,16 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"primary": CredDefValuePrimary.from_dict(obj.get("primary"))
if obj.get("primary") is not None
else None,
"revocation": CredDefValueRevocation.from_dict(obj.get("revocation"))
if obj.get("revocation") is not None
else None,
"primary": (
CredDefValuePrimary.from_dict(obj.get("primary"))
if obj.get("primary") is not None
else None
),
"revocation": (
CredDefValueRevocation.from_dict(obj.get("revocation"))
if obj.get("revocation") is not None
else None
),
}
)
return _obj
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/cred_def_value_primary.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,11 @@ def from_dict(cls, obj: Dict) -> Self:
_obj = cls.model_validate(
{
"n": obj.get("n"),
"r": Generated.from_dict(obj.get("r"))
if obj.get("r") is not None
else None,
"r": (
Generated.from_dict(obj.get("r"))
if obj.get("r") is not None
else None
),
"rctxt": obj.get("rctxt"),
"s": obj.get("s"),
"z": obj.get("z"),
Expand Down
10 changes: 5 additions & 5 deletions aries_cloudcontroller/models/cred_info_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"results": [
IndyCredInfo.from_dict(_item) for _item in obj.get("results")
]
if obj.get("results") is not None
else None
"results": (
[IndyCredInfo.from_dict(_item) for _item in obj.get("results")]
if obj.get("results") is not None
else None
)
}
)
return _obj
13 changes: 8 additions & 5 deletions aries_cloudcontroller/models/cred_rev_record_details_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,14 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"results": [
IssuerCredRevRecord.from_dict(_item) for _item in obj.get("results")
]
if obj.get("results") is not None
else None
"results": (
[
IssuerCredRevRecord.from_dict(_item)
for _item in obj.get("results")
]
if obj.get("results") is not None
else None
)
}
)
return _obj
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/cred_rev_record_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,11 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"result": IssuerCredRevRecord.from_dict(obj.get("result"))
if obj.get("result") is not None
else None
"result": (
IssuerCredRevRecord.from_dict(obj.get("result"))
if obj.get("result") is not None
else None
)
}
)
return _obj
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/credential.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,11 @@ def from_dict(cls, obj: Dict) -> Self:
"id": obj.get("id"),
"issuanceDate": obj.get("issuanceDate"),
"issuer": obj.get("issuer"),
"proof": LinkedDataProof.from_dict(obj.get("proof"))
if obj.get("proof") is not None
else None,
"proof": (
LinkedDataProof.from_dict(obj.get("proof"))
if obj.get("proof") is not None
else None
),
"type": obj.get("type"),
}
)
Expand Down
8 changes: 5 additions & 3 deletions aries_cloudcontroller/models/credential_definition.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,11 @@ def from_dict(cls, obj: Dict) -> Self:
"schemaId": obj.get("schemaId"),
"tag": obj.get("tag"),
"type": obj.get("type"),
"value": CredDefValue.from_dict(obj.get("value"))
if obj.get("value") is not None
else None,
"value": (
CredDefValue.from_dict(obj.get("value"))
if obj.get("value") is not None
else None
),
"ver": obj.get("ver"),
}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ def from_dict(cls, obj: Dict) -> Self:

_obj = cls.model_validate(
{
"credential_definition": CredentialDefinition.from_dict(
obj.get("credential_definition")
"credential_definition": (
CredentialDefinition.from_dict(obj.get("credential_definition"))
if obj.get("credential_definition") is not None
else None
)
if obj.get("credential_definition") is not None
else None
}
)
return _obj
Loading