Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

update python dependencies #1086

Merged
merged 4 commits into from
Jul 21, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
20 changes: 10 additions & 10 deletions src/api-service/__app__/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
azure-common~=1.1.25
azure-core==1.14.0
azure-core==1.16.0
azure-cosmosdb-nspkg==2.0.2
azure-cosmosdb-table==1.0.6
azure-devops==6.0.0b4
azure-functions==1.5.0
azure-functions==1.7.2
azure-graphrbac~=0.61.1
azure-identity==1.6.0
azure-keyvault-secrets~=4.3.0
azure-mgmt-compute==19.0.0
azure-mgmt-core==1.2.2
azure-mgmt-loganalytics~=8.0.0
azure-mgmt-network==18.0.0
azure-mgmt-compute==22.0
azure-mgmt-core==1.3.0
azure-mgmt-loganalytics~=11.0.0
azure-mgmt-network==19.0.0
azure-mgmt-storage~=18.0.0
azure-mgmt-resource~=18.0.0
azure-mgmt-resource~=18.1.0
azure-mgmt-subscription~=1.0.0
azure-nspkg==3.0.2
azure-storage-blob==12.8.1
Expand All @@ -25,9 +25,9 @@ pydantic==1.8.2 --no-binary=pydantic
PyJWT>=2.1.0
requests~=2.25.1
memoization~=0.3.1
github3.py~=1.3.0
typing-extensions~=3.7.4.3
jsonpatch==1.28
github3.py~=2.0.0
typing-extensions~=3.10.0.0
jsonpatch==1.32
semver==2.13.0
base58==2.1.0
# onefuzz types version is set during build
Expand Down
13 changes: 6 additions & 7 deletions src/cli/onefuzz/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
import requests
from azure.storage.blob import ContainerClient
from pydantic import BaseModel, Field
from tenacity import Future as tenacity_future
from tenacity import Retrying, retry
from tenacity import RetryCallState, retry
from tenacity.retry import retry_if_exception_type
from tenacity.stop import stop_after_attempt
from tenacity.wait import wait_random
Expand Down Expand Up @@ -283,12 +282,12 @@ def request(
return response.json()


def before_sleep(
retry_object: Retrying, sleep: float, last_result: tenacity_future
) -> None:
name = retry_object.fn.__name__ if retry_object.fn else "blob function"
def before_sleep(retry_state: RetryCallState) -> None:
name = retry_state.fn.__name__ if retry_state.fn else "blob function"

why = getattr(last_result, "_exception")
why: Optional[BaseException] = None
if retry_state.outcome is not None:
why = retry_state.outcome.exception()
if why:
LOGGER.warning("%s failed with %s, retrying ...", name, repr(why))
else:
Expand Down
2 changes: 1 addition & 1 deletion src/cli/onefuzz/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def parse_function(self, func: Callable, parser: argparse.ArgumentParser) -> Non
sig = inspect.signature(func)

arg_docs = {}
docs = parse_docstring(func.__doc__)
docs = parse_docstring(func.__doc__ or "")
for opt in docs.params:
if opt.description:
arg_docs[opt.arg_name] = opt.description
Expand Down
12 changes: 7 additions & 5 deletions src/cli/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
msal~=1.10.0
msal~=1.12.0
requests~=2.25.1
jmespath~=0.10.0
semver~=2.13.0
signalrcore==0.9.2
asciimatics~=1.12.0
asciimatics~=1.13.0
pydantic~=1.8.1 --no-binary=pydantic
memoization~=0.3.1
msrestazure==0.6.4
azure-storage-blob~=12.8
azure-applicationinsights==0.1.0
tenacity==6.3.1
docstring_parser==0.7.3
azure-cli-core==2.26.0
tenacity==8.0.1
docstring_parser==0.8.1
azure-cli-core==2.26.1
# packaging is required but not specified by azure-cli-core
ranweiler marked this conversation as resolved.
Show resolved Hide resolved
packaging==20.9
# urllib3[secure] needs to be specifically stated for azure-cli-core
urllib3[secure]>=1.26.5
# iDNA needs to be specifically stated for azure-cli-core
Expand Down