Skip to content

Commit bbcd92b

Browse files
committed
Merge branch 'release/v6.1.8'
2 parents fc12dda + 3b3fbec commit bbcd92b

File tree

103 files changed

+959
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+959
-689
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ What kind of issue is this?
66
use [Community Forums](https://community.platformio.org) or [Premium Support](https://platformio.org/support)
77

88
- [ ] **PlatformIO IDE**.
9-
All issues related to PlatformIO IDE should be reported to appropriate repository:
10-
[PlatformIO IDE for Atom](https://github.com/platformio/platformio-atom-ide/issues) or
11-
[PlatformIO IDE for VSCode](https://github.com/platformio/platformio-vscode-ide/issues)
9+
All issues related to PlatformIO IDE should be reported to the
10+
[PlatformIO IDE for VSCode](https://github.com/platformio/platformio-vscode-ide/issues) repository
1211

1312
- [ ] **Development Platform or Board**.
1413
All issues (building, uploading, adding new boards, etc.) related to PlatformIO development platforms

.github/workflows/deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
tox -e testcore
3636
3737
- name: Build Python source tarball
38-
run: python setup.py sdist
38+
run: python setup.py sdist bdist_wheel
3939

4040
- name: Publish package to PyPI
4141
if: ${{ github.ref == 'refs/heads/master' }}

.github/workflows/projects.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
folder: "Marlin"
1414
config_dir: "Marlin"
1515
env_name: "mega2560"
16-
# - esphome:
17-
# repository: "esphome/esphome"
18-
# folder: "esphome"
19-
# config_dir: "esphome"
20-
# env_name: "esp32-arduino"
16+
- esphome:
17+
repository: "esphome/esphome"
18+
folder: "esphome"
19+
config_dir: "esphome"
20+
env_name: "esp32-arduino"
2121
- smartknob:
2222
repository: "scottbez1/smartknob"
2323
folder: "smartknob"

CONTRIBUTING.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ To get started, <a href="https://cla-assistant.io/platformio/platformio-core">si
66
1. Fork the repository on GitHub
77
2. Clone repository `git clone --recursive https://github.com/YourGithubUsername/platformio-core.git`
88
3. Run `pip install tox`
9-
4. Go to the root of project where is located `tox.ini` and run `tox -e py37`
9+
4. Go to the root of the PlatformIO Core project where `tox.ini` is located (``cd platformio-core``) and run `tox -e py39`.
10+
You can replace `py39` with your own Python version. For example, `py311` means Python 3.11.
1011
5. Activate current development environment:
1112

12-
* Windows: `.tox\py37\Scripts\activate`
13-
* Bash/ZSH: `source .tox/py37/bin/activate`
14-
* Fish: `source .tox/py37/bin/activate.fish`
13+
* Windows: `.tox\py39\Scripts\activate`
14+
* Bash/ZSH: `source .tox/py39/bin/activate`
15+
* Fish: `source .tox/py39/bin/activate.fish`
1516

1617
6. Make changes to code, documentation, etc.
1718
7. Lint source code `make before-commit`

HISTORY.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,19 @@ PlatformIO Core 6
1515

1616
**A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
1717

18+
6.1.8 (2023-07-05)
19+
~~~~~~~~~~~~~~~~~~
20+
21+
* Added a new ``--lint`` option to the `pio project config <https://docs.platformio.org/en/latest/core/userguide/project/cmd_config.html>`__ command, enabling users to efficiently perform linting on the |PIOCONF|
22+
* Enhanced the parsing of the |PIOCONF| to provide comprehensive diagnostic information
23+
* Expanded the functionality of the |LIBRARYJSON| manifest by allowing the use of the underscore symbol in the `keywords <https://docs.platformio.org/en/latest/manifests/library-json/fields/keywords.html>`__ field
24+
* Optimized project integration templates to address the issue of long paths on Windows (`issue #4652 <https://github.com/platformio/platformio-core/issues/4652>`_)
25+
* Refactored |UNITTESTING| engine to resolve compiler warnings with "-Wpedantic" option (`pull #4671 <https://github.com/platformio/platformio-core/pull/4671>`_)
26+
* Eliminated erroneous warning regarding the use of obsolete PlatformIO Core when downgrading to the stable version (`issue #4664 <https://github.com/platformio/platformio-core/issues/4664>`_)
27+
* Updated the `pio project metadata <https://docs.platformio.org/en/latest/core/userguide/project/cmd_metadata.html>`__ command to return C/C++ flags as parsed Unix shell arguments when dumping project build metadata
28+
* Resolved a critical issue related to the usage of the ``-include`` flag within the `build_flags <https://docs.platformio.org/en/latest/projectconf/sections/env/options/build/build_flags.html>`__ option, specifically when employing dynamic variables (`issue #4682 <https://github.com/platformio/platformio-core/issues/4682>`_)
29+
* Removed PlatformIO IDE for Atom from the documentation as `Atom has been deprecated <https://github.blog/2022-06-08-sunsetting-atom/>`__
30+
1831
6.1.7 (2023-05-08)
1932
~~~~~~~~~~~~~~~~~~
2033

docs

Submodule docs updated 109 files

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, 7)
15+
VERSION = (6, 1, 8)
1616
__version__ = ".".join([str(s) for s in VERSION])
1717

1818
__title__ = "platformio"

platformio/__main__.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import os
1616
import sys
17-
from traceback import format_exc
17+
import traceback
1818

1919
import click
2020

@@ -53,13 +53,13 @@ def cli(ctx, force, caller, no_ansi): # pylint: disable=unused-argument
5353
except: # pylint: disable=bare-except
5454
pass
5555

56-
maintenance.on_platformio_start(ctx, caller)
56+
maintenance.on_cmd_start(ctx, caller)
5757

5858

5959
@cli.result_callback()
6060
@click.pass_context
61-
def process_result(ctx, result, *_, **__):
62-
maintenance.on_platformio_end(ctx, result)
61+
def process_result(*_, **__):
62+
maintenance.on_cmd_end()
6363

6464

6565
def configure():
@@ -96,6 +96,7 @@ def main(argv=None):
9696
if argv:
9797
assert isinstance(argv, list)
9898
sys.argv = argv
99+
99100
try:
100101
ensure_python3(raise_exception=True)
101102
configure()
@@ -106,18 +107,18 @@ def main(argv=None):
106107
except Exception as exc: # pylint: disable=broad-except
107108
if not isinstance(exc, exception.ReturnErrorCode):
108109
maintenance.on_platformio_exception(exc)
109-
error_str = "Error: "
110+
error_str = f"{exc.__class__.__name__}: "
110111
if isinstance(exc, exception.PlatformioException):
111112
error_str += str(exc)
112113
else:
113-
error_str += format_exc()
114+
error_str += traceback.format_exc()
114115
error_str += """
115116
============================================================
116117
117118
An unexpected error occurred. Further steps:
118119
119120
* Verify that you have the latest version of PlatformIO using
120-
`pip install -U platformio` command
121+
`python -m pip install -U platformio` command
121122
122123
* Try to find answer in FAQ Troubleshooting section
123124
https://docs.platformio.org/page/faq/index.html
@@ -129,6 +130,8 @@ def main(argv=None):
129130
"""
130131
click.secho(error_str, fg="red", err=True)
131132
exit_code = int(str(exc)) if str(exc).isdigit() else 1
133+
134+
maintenance.on_platformio_exit()
132135
sys.argv = prev_sys_argv
133136
return exit_code
134137

platformio/account/client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
import time
1717

1818
from platformio import __accounts_api__, app
19-
from platformio.exception import PlatformioException
19+
from platformio.exception import PlatformioException, UserSideException
2020
from platformio.http import HTTPClient, HTTPClientError
2121

2222

2323
class AccountError(PlatformioException):
2424
MESSAGE = "{0}"
2525

2626

27-
class AccountNotAuthorized(AccountError):
27+
class AccountNotAuthorized(AccountError, UserSideException):
2828
MESSAGE = "You are not authorized! Please log in to PlatformIO Account."
2929

3030

31-
class AccountAlreadyAuthorized(AccountError):
31+
class AccountAlreadyAuthorized(AccountError, UserSideException):
3232
MESSAGE = "You are already authorized with {0} account."
3333

3434

0 commit comments

Comments
 (0)