From 3268b516a9f3d4c6c533813e1bfb44b1b0f5f0d4 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 27 Jul 2023 15:03:57 +0300 Subject: [PATCH 1/2] Respect user privacy based on UA data --- platformio/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platformio/app.py b/platformio/app.py index f629ff13..7d2f1ea9 100644 --- a/platformio/app.py +++ b/platformio/app.py @@ -274,6 +274,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) From a983075dacdce1994402091222391000c8128ae0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 27 Jul 2023 15:04:09 +0300 Subject: [PATCH 2/2] Update deps --- setup.py | 4 ++-- tests/commands/test_check.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 5b3aa114..6d450519 100644 --- a/setup.py +++ b/setup.py @@ -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, diff --git a/tests/commands/test_check.py b/tests/commands/test_check.py index 91679d03..5403ee0f 100644 --- a/tests/commands/test_check.py +++ b/tests/commands/test_check.py @@ -511,6 +511,7 @@ TEST-TEST-TEST-TEST assert verbose_result.exit_code != 0 assert "license information is incorrect" in verbose_result.output.lower() + @pytest.mark.parametrize("framework", ["arduino", "stm32cube", "zephyr"]) @pytest.mark.parametrize("check_tool", ["cppcheck", "clangtidy", "pvs-studio"]) def test_check_embedded_platform_all_tools( @@ -539,7 +540,6 @@ int main() { """ ) - tmpdir.join("platformio.ini").write(config) result = clirunner.invoke(cmd_check, ["--project-dir", str(tmpdir)]) validate_cliresult(result)