Skip to content
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
- id: ruff
name: ruff
description: "Run 'ruff' for extremely fast Python linting"
entry: poetry run ruff
entry: poetry run ruff check
language: system
"types": [python]
args: [--fix]
Expand Down
56 changes: 28 additions & 28 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ deprecated = "^1.2.14"

[tool.poetry.group.dev.dependencies]
pytest = "^7.2.0"
ruff = "^0.1.6"
ruff = ">=0.1.6,<0.4.0"
pip-audit = "^2.5.6"
pytest-mock = "^3.11.1"
mypy = "^1.5.1"
Expand All @@ -26,8 +26,8 @@ sphinx = "^6.1.3"
myst-parser = "^1.0.0"
sphinx-copybutton = "^0.5.1"
sphinx-rtd-theme = "^1.2.0"
sphinx-autodoc2 = "^0.4.2"
poethepoet = "^0.19.0"
sphinx-autodoc2 = ">=0.4.2,<0.6.0"
poethepoet = ">=0.19,<0.26"
beaker-pyteal = "^1.1.1"
types-deprecated = "^1.2.9.2"
pytest-httpx = "^0.21.3"
Expand All @@ -43,7 +43,7 @@ build-backend = "poetry.core.masonry.api"

[tool.ruff]
line-length = 120
select = [
lint.select = [
# all possible codes as of this ruff version are listed here,
# ones we don't want/need are commented out to make it clear
# which have been omitted on purpose vs which ones get added
Expand Down Expand Up @@ -93,7 +93,7 @@ select = [
# "NPY", # NumPy-specific rules
"RUF", # Ruff-specific rules
]
ignore = [
lint.ignore = [
"ANN101", # no type for self
"ANN102", # no type for cls
"RET505", # allow else after return
Expand All @@ -119,7 +119,7 @@ extend-exclude = [
# Assume Python 3.10.
target-version = "py310"

[tool.ruff.flake8-annotations]
[tool.ruff.lint.flake8-annotations]
allow-star-arg-any = true
suppress-none-returning = true

Expand Down
62 changes: 21 additions & 41 deletions src/algokit_utils/application_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ def __init__(
sender: str | None = None,
suggested_params: transaction.SuggestedParams | None = None,
template_values: au_deploy.TemplateValueMapping | None = None,
):
...
): ...

@overload
def __init__(
Expand All @@ -113,8 +112,7 @@ def __init__(
suggested_params: transaction.SuggestedParams | None = None,
template_values: au_deploy.TemplateValueMapping | None = None,
app_name: str | None = None,
):
...
): ...

def __init__( # noqa: PLR0913
self,
Expand Down Expand Up @@ -403,26 +401,23 @@ def create(
self,
call_abi_method: Literal[False],
transaction_parameters: CreateCallParameters | CreateCallParametersDict | None = ...,
) -> TransactionResponse:
...
) -> TransactionResponse: ...

@overload
def create(
self,
call_abi_method: ABIMethod | Literal[True],
transaction_parameters: CreateCallParameters | CreateCallParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> ABITransactionResponse:
...
) -> ABITransactionResponse: ...

@overload
def create(
self,
call_abi_method: ABIMethod | bool | None = ...,
transaction_parameters: CreateCallParameters | CreateCallParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> TransactionResponse | ABITransactionResponse:
...
) -> TransactionResponse | ABITransactionResponse: ...

def create(
self,
Expand Down Expand Up @@ -471,25 +466,22 @@ def update(
call_abi_method: ABIMethod | Literal[True],
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> ABITransactionResponse:
...
) -> ABITransactionResponse: ...

@overload
def update(
self,
call_abi_method: Literal[False],
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
) -> TransactionResponse:
...
) -> TransactionResponse: ...

@overload
def update(
self,
call_abi_method: ABIMethod | bool | None = ...,
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> TransactionResponse | ABITransactionResponse:
...
) -> TransactionResponse | ABITransactionResponse: ...

def update(
self,
Expand Down Expand Up @@ -532,25 +524,22 @@ def delete(
call_abi_method: ABIMethod | Literal[True],
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> ABITransactionResponse:
...
) -> ABITransactionResponse: ...

@overload
def delete(
self,
call_abi_method: Literal[False],
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
) -> TransactionResponse:
...
) -> TransactionResponse: ...

@overload
def delete(
self,
call_abi_method: ABIMethod | bool | None = ...,
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> TransactionResponse | ABITransactionResponse:
...
) -> TransactionResponse | ABITransactionResponse: ...

def delete(
self,
Expand Down Expand Up @@ -593,25 +582,22 @@ def call(
call_abi_method: ABIMethod | Literal[True],
transaction_parameters: OnCompleteCallParameters | OnCompleteCallParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> ABITransactionResponse:
...
) -> ABITransactionResponse: ...

@overload
def call(
self,
call_abi_method: Literal[False],
transaction_parameters: OnCompleteCallParameters | OnCompleteCallParametersDict | None = ...,
) -> TransactionResponse:
...
) -> TransactionResponse: ...

@overload
def call(
self,
call_abi_method: ABIMethod | bool | None = ...,
transaction_parameters: OnCompleteCallParameters | OnCompleteCallParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> TransactionResponse | ABITransactionResponse:
...
) -> TransactionResponse | ABITransactionResponse: ...

def call(
self,
Expand Down Expand Up @@ -667,25 +653,22 @@ def opt_in(
call_abi_method: ABIMethod | Literal[True] = ...,
transaction_parameters: TransactionParameters | TransactionParametersDict | None = None,
**abi_kwargs: ABIArgType,
) -> ABITransactionResponse:
...
) -> ABITransactionResponse: ...

@overload
def opt_in(
self,
call_abi_method: Literal[False] = ...,
transaction_parameters: TransactionParameters | TransactionParametersDict | None = None,
) -> TransactionResponse:
...
) -> TransactionResponse: ...

@overload
def opt_in(
self,
call_abi_method: ABIMethod | bool | None = ...,
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> TransactionResponse | ABITransactionResponse:
...
) -> TransactionResponse | ABITransactionResponse: ...

def opt_in(
self,
Expand Down Expand Up @@ -726,25 +709,22 @@ def close_out(
call_abi_method: ABIMethod | Literal[True],
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> ABITransactionResponse:
...
) -> ABITransactionResponse: ...

@overload
def close_out(
self,
call_abi_method: Literal[False],
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
) -> TransactionResponse:
...
) -> TransactionResponse: ...

@overload
def close_out(
self,
call_abi_method: ABIMethod | bool | None = ...,
transaction_parameters: TransactionParameters | TransactionParametersDict | None = ...,
**abi_kwargs: ABIArgType,
) -> TransactionResponse | ABITransactionResponse:
...
) -> TransactionResponse | ABITransactionResponse: ...

def close_out(
self,
Expand Down Expand Up @@ -1390,7 +1370,7 @@ def _parse_result(
)
continue

logs = tx_info["logs"] if "logs" in tx_info else []
logs = tx_info.get("logs", [])

# Look for the last returned value in the log
if not logs:
Expand Down
3 changes: 1 addition & 2 deletions src/algokit_utils/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ class ABITransactionResponse(TransactionResponse, Generic[ReturnType]):


class ABIReturnSubroutine(Protocol):
def method_spec(self) -> Method:
...
def method_spec(self) -> Method: ...


ABIMethod: TypeAlias = ABIReturnSubroutine | Method | str
Expand Down