Merge branch 'develop' into feature/v7

This commit is contained in:
Ivan Kravets
2023-07-27 15:04:19 +03:00
2 changed files with 4 additions and 2 deletions

View File

@ -270,6 +270,8 @@ def get_user_agent():
data.append("IDE/%s" % os.getenv("PLATFORMIO_IDE"))
data.append("Python/%s" % platform.python_version())
data.append("Platform/%s" % platform.platform())
if not get_setting("enable_telemetry"):
data.append("Telemetry/0")
return " ".join(data)

View File

@ -35,7 +35,7 @@ minimal_requirements = [
"click==8.1.*; " + py_gte_37,
"colorama",
"marshmallow==3.14.1; " + py_below_37,
"marshmallow==3.19.*; " + py_gte_37,
"marshmallow==3.20.*; " + py_gte_37,
"pyelftools==0.29",
"pyserial==3.5.*", # keep in sync "device/monitor/terminal.py"
"requests==2.*",
@ -47,7 +47,7 @@ home_requirements = [
"ajsonrpc==1.2.*",
"starlette==0.19.1; " + py_below_37,
"starlette==0.29.0; " + py_37,
"starlette==0.30.*; " + py_gte_38,
"starlette==0.31.*; " + py_gte_38,
"uvicorn==0.16.0; " + py_below_37,
"uvicorn==0.22.0; " + py_37,
"uvicorn==0.23.*; " + py_gte_38,