Skip to content

Commit ab9fc73

Browse files
authored
pioarduino changes
* remove telemetry * no full git clone * add intelhex as required * no core packages * add `rich_click` as pip dependencies * remove advertisings * add intelhex as required * install scons and Pio home from github
1 parent 7914296 commit ab9fc73

File tree

21 files changed

+103
-679
lines changed

21 files changed

+103
-679
lines changed

.github/workflows/core.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ jobs:
3737
run: |
3838
tox -e py
3939
40+
- name: Python Lint
41+
run: |
42+
tox -e lint
43+
4044
- name: Integration Tests
4145
if: ${{ matrix.python-version == '3.11' }}
4246
run: |

.github/workflows/docs.yml

Lines changed: 0 additions & 109 deletions
This file was deleted.

.github/workflows/examples.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/projects.yml

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,20 @@
11
name: Projects
22

3-
on: [push, pull_request]
3+
on:
4+
workflow_dispatch: # Manually start a workflow
5+
push:
46

57
jobs:
68
build:
79
strategy:
810
fail-fast: false
911
matrix:
1012
project:
11-
- marlin:
12-
repository: "MarlinFirmware/Marlin"
13-
folder: "Marlin"
14-
config_dir: "Marlin"
15-
env_name: "mega2560"
16-
- smartknob:
17-
repository: "scottbez1/smartknob"
18-
folder: "smartknob"
19-
config_dir: "smartknob"
20-
env_name: "view"
21-
- espurna:
22-
repository: "xoseperez/espurna"
23-
folder: "espurna"
24-
config_dir: "espurna/code"
25-
env_name: "nodemcu-lolin"
26-
- OpenMQTTGateway:
27-
repository: "1technophile/OpenMQTTGateway"
28-
folder: "OpenMQTTGateway"
29-
config_dir: "OpenMQTTGateway"
30-
env_name: "esp32-m5atom-lite"
13+
- PlatformTest:
14+
repository: "Jason2866/platform-test"
15+
folder: "src"
16+
config_dir: "src"
17+
env_name: "esp32-s3"
3118
os: [ubuntu-latest, windows-latest, macos-latest]
3219

3320
runs-on: ${{ matrix.os }}
@@ -37,7 +24,7 @@ jobs:
3724
submodules: "recursive"
3825

3926
- name: Set up Python ${{ matrix.python-version }}
40-
uses: actions/setup-python@v4
27+
uses: actions/setup-python@v5
4128
with:
4229
python-version: 3.11
4330

@@ -51,6 +38,6 @@ jobs:
5138
repository: ${{ matrix.project.repository }}
5239
path: ${{ matrix.project.folder }}
5340

54-
- name: Compile ${{ matrix.project.repository }}
55-
run: pio run -d ${{ matrix.project.config_dir }} -e ${{ matrix.project.env_name }}
56-
41+
- name: Compile example ${{ matrix.project.repository }}
42+
run: |
43+
pio run -d ${{ matrix.project.config_dir }} -e ${{ matrix.project.env_name }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ coverage.xml
1010
.coverage
1111
htmlcov
1212
.pytest_cache
13+
.vscode/settings.json

README.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,11 @@ Contributing
8282

8383
See `contributing guidelines <https://github.com/platformio/platformio/blob/develop/CONTRIBUTING.md>`_.
8484

85-
Telemetry / Privacy Policy
86-
--------------------------
85+
Telemetry
86+
---------
8787

88-
Share minimal diagnostics and usage information to help us make PlatformIO better.
89-
It is enabled by default. For more information see:
88+
Removed
9089

91-
* `Telemetry Setting <https://docs.platformio.org/en/latest/userguide/cmd_settings.html?utm_source=github&utm_medium=core#enable-telemetry>`_
9290

9391
License
9492
-------

platformio/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
VERSION = (6, 1, "19a1")
15+
VERSION = (6, 1, 18)
1616
__version__ = ".".join([str(s) for s in VERSION])
1717

1818
__title__ = "platformio"
@@ -40,6 +40,5 @@
4040

4141
__check_internet_hosts__ = [
4242
"185.199.110.153", # Github.com
43-
"88.198.170.159", # platformio.org
4443
"github.com",
4544
] + __registry_mirror_hosts__

platformio/__main__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ def main(argv=None):
106106
exit_code = int(exc.code)
107107
except Exception as exc: # pylint: disable=broad-except
108108
if not isinstance(exc, exception.ReturnErrorCode):
109-
maintenance.on_platformio_exception(exc)
110109
error_str = f"{exc.__class__.__name__}: "
111110
if isinstance(exc, exception.PlatformioException):
112111
error_str += str(exc)
@@ -131,7 +130,6 @@ def main(argv=None):
131130
click.secho(error_str, fg="red", err=True)
132131
exit_code = int(str(exc)) if str(exc).isdigit() else 1
133132

134-
maintenance.on_platformio_exit()
135133
sys.argv = prev_sys_argv
136134
return exit_code
137135

platformio/app.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ def projects_dir_validate(projects_dir):
4646
"description": "Enable caching for HTTP API requests",
4747
"value": True,
4848
},
49-
"enable_telemetry": {
50-
"description": ("Telemetry service <https://bit.ly/pio-telemetry> (Yes/No)"),
51-
"value": True,
52-
},
5349
"force_verbose": {
5450
"description": "Force verbose output when processing environments",
5551
"value": False,
@@ -69,7 +65,6 @@ def projects_dir_validate(projects_dir):
6965
"command_ctx": None,
7066
"caller_id": None,
7167
"custom_project_conf": None,
72-
"pause_telemetry": False,
7368
}
7469

7570

@@ -274,8 +269,6 @@ def get_user_agent():
274269
data.append("IDE/%s" % os.getenv("PLATFORMIO_IDE"))
275270
data.append("Python/%s" % platform.python_version())
276271
data.append("Platform/%s" % platform.platform())
277-
if not get_setting("enable_telemetry"):
278-
data.append("Telemetry/0")
279272
return " ".join(data)
280273

281274

platformio/debug/process/gdb.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
import signal
1717
import time
1818

19-
from platformio import telemetry
2019
from platformio.compat import aio_get_running_loop, is_bytes
2120
from platformio.debug import helpers
22-
from platformio.debug.exception import DebugInitError
2321
from platformio.debug.process.client import DebugClientProcess
2422

2523

@@ -130,7 +128,6 @@ def stdout_data_received(self, data):
130128
self._handle_error(data)
131129
# go to init break automatically
132130
if self.INIT_COMPLETED_BANNER.encode() in data:
133-
telemetry.log_debug_started(self.debug_config)
134131
self._auto_exec_continue()
135132

136133
def console_log(self, msg):
@@ -175,7 +172,4 @@ def _handle_error(self, data):
175172
and b"Error in sourced" in self._errors_buffer
176173
):
177174
return
178-
telemetry.log_debug_exception(
179-
DebugInitError(self._errors_buffer.decode()), self.debug_config
180-
)
181175
self.transport.close()

platformio/dependencies.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717

1818
def get_core_dependencies():
1919
return {
20-
"contrib-piohome": "~3.4.2",
21-
"contrib-pioremote": "~1.0.0",
22-
"tool-scons": "~4.40801.0",
23-
"tool-cppcheck": "~1.21100.0",
24-
"tool-clangtidy": "~1.150005.0",
25-
"tool-pvs-studio": "~7.18.0",
20+
"tool-scons",
21+
"contrib-piohome",
2622
}
2723

2824

@@ -37,6 +33,8 @@ def get_pip_dependencies():
3733
"requests%s == 2.*" % ("[socks]" if is_proxy_set(socks=True) else ""),
3834
"semantic_version == 2.10.*",
3935
"tabulate == 0.*",
36+
"intelhex", # actual esptool.py requirement
37+
"rich_click", # latest esptool.py requirement
4038
]
4139

4240
home = [

0 commit comments

Comments
 (0)