Skip to content

Commit ada618c

Browse files
authored
Install scons from pioarduino github
1 parent 9eb6e51 commit ada618c

File tree

25 files changed

+77
-575
lines changed

25 files changed

+77
-575
lines changed

.github/workflows/examples.yml

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

.github/workflows/projects.yml

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,12 @@ jobs:
88
fail-fast: false
99
matrix:
1010
project:
11-
- marlin:
12-
repository: "MarlinFirmware/Marlin"
13-
folder: "Marlin"
14-
config_dir: "Marlin"
15-
env_name: "mega2560"
16-
- esphome:
17-
repository: "esphome/esphome"
18-
folder: "esphome"
19-
config_dir: "esphome"
20-
env_name: "esp32-arduino"
21-
- smartknob:
22-
repository: "scottbez1/smartknob"
23-
folder: "smartknob"
24-
config_dir: "smartknob"
25-
env_name: "view"
26-
- espurna:
27-
repository: "xoseperez/espurna"
28-
folder: "espurna"
29-
config_dir: "espurna/code"
30-
env_name: "nodemcu-lolin"
3111
- OpenMQTTGateway:
32-
repository: "1technophile/OpenMQTTGateway"
33-
folder: "OpenMQTTGateway"
34-
config_dir: "OpenMQTTGateway"
35-
env_name: "esp32-m5atom-lite"
12+
repository: "Jason2866/platform-test"
13+
folder: "src"
14+
config_dir: "src"
15+
env_name: "esp32-s3"
3616
os: [ubuntu-latest, windows-latest, macos-latest]
37-
exclude:
38-
- os: windows-latest
39-
project: {"esphome": "", "repository": "esphome/esphome", "folder": "esphome", "config_dir": "esphome", "env_name": "esp32-arduino"}
4017

4118
runs-on: ${{ matrix.os }}
4219
steps:
@@ -45,7 +22,7 @@ jobs:
4522
submodules: "recursive"
4623

4724
- name: Set up Python ${{ matrix.python-version }}
48-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
4926
with:
5027
python-version: 3.11
5128

@@ -59,11 +36,6 @@ jobs:
5936
repository: ${{ matrix.project.repository }}
6037
path: ${{ matrix.project.folder }}
6138

62-
- name: Install ESPHome dependencies
63-
# Requires esptool package as it's used in a custom prescript
64-
if: ${{ contains(matrix.project.repository, 'esphome') }}
65-
run: pip install esptool==3.*
66-
67-
- name: Compile ${{ matrix.project.repository }}
68-
run: pio run -d ${{ matrix.project.config_dir }} -e ${{ matrix.project.env_name }}
69-
39+
- name: Compile example ${{ matrix.project.repository }}
40+
run: |
41+
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

HISTORY.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ test-driven methodologies, and modern toolchains for unrivaled success.
2121
6.1.16 (2024-??-??)
2222
~~~~~~~~~~~~~~~~~~~
2323

24+
* Upgraded the `Doctest <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/doctest.html>`__ testing framework to version 2.4.11, the `GoogleTest <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/doctest.html>`__ to version 1.15.2, and the `Unity <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/unity.html>`__ to version 2.6.0, incorporating the latest features and improvements for enhanced testing capabilities
25+
* Corrected an issue where the incorrect public class was imported for the ``DoctestTestRunner`` (`issue #4949 <https://github.com/platformio/platformio-core/issues/4949>`_)
26+
2427
6.1.15 (2024-04-25)
2528
~~~~~~~~~~~~~~~~~~~
2629

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
-------

docs

platformio/__init__.py

Lines changed: 1 addition & 1 deletion
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, "16a1")
15+
VERSION = (6, 1, "16+test")
1616
__version__ = ".".join([str(s) for s in VERSION])
1717

1818
__title__ = "platformio"

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()

0 commit comments

Comments
 (0)