From 9b85ed86a9b4c8440e08abc8eac733a21b2c1949 Mon Sep 17 00:00:00 2001 From: Maciej Augustyniak Date: Sat, 5 Feb 2022 12:13:43 +0100 Subject: [PATCH 1/7] fix: Added udev rule for FireBeetle-ESP32. (#4168) --- scripts/99-platformio-udev.rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/99-platformio-udev.rules b/scripts/99-platformio-udev.rules index 043ce11a..6fd87d00 100644 --- a/scripts/99-platformio-udev.rules +++ b/scripts/99-platformio-udev.rules @@ -70,6 +70,9 @@ ATTRS{idVendor}=="0451", ATTRS{idProduct}=="f432", MODE="0666", ENV{ID_MM_DEVICE #GD32V DFU Bootloader ATTRS{idVendor}=="28e9", ATTRS{idProduct}=="0189", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1" +# FireBeetle-ESP32 +ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7522", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1" + # # Debuggers # From 1d72a96654ac29a252f52521da0687f325dee6ab Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 5 Feb 2022 20:00:37 +0200 Subject: [PATCH 2/7] Merge tag 'v5.2.5' into develop Bump version to 5.2.5 # Conflicts: # docs # platformio/__init__.py --- HISTORY.rst | 1 + setup.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index e463857e..566842af 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -15,6 +15,7 @@ PlatformIO Core 5 - Improved checking of available Internet connection for IPv6-only workstations (`pull #4151 `_) - Better detecting of default PlatformIO project directory on Linux OS (`pull #4158 `_) - Respect disabling debugging server from "platformio.ini" passing an empty value to the `debug_server `__ option +- Fixed a "module 'asyncio' has no attribute 'run'" error when launching PIO Home using Python 3.6 (`issue #4169 `_) 5.2.4 (2021-12-15) ~~~~~~~~~~~~~~~~~~ diff --git a/setup.py b/setup.py index 1b1cb8f8..6b645300 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import sys from setuptools import find_packages, setup from platformio import ( @@ -45,7 +46,7 @@ home_requirements = [ "aiofiles==0.8.*", "ajsonrpc==1.*", "starlette==0.18.*", - "uvicorn==0.17.*", + "uvicorn==%s" % ("0.17.*" if sys.version_info >= (3, 7) else "0.16.0"), "wsproto==1.0.*", ] From a4b414010d6d1a93d5698660c4944ca513136ed3 Mon Sep 17 00:00:00 2001 From: Kalle Bracht Date: Mon, 7 Feb 2022 12:45:56 +0100 Subject: [PATCH 3/7] Removing inconsistent dot at README.rst, HISTORY.rst and CONTRIBUTING.md (#4172) * Removing inconsistent dot at README list * Removing inconsistent dot at HISTORY file * Removing inconsistent dot at CONTRIBUTING file --- CONTRIBUTING.md | 4 ++-- HISTORY.rst | 2 +- README.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ec53bebb..5f2f4188 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ Contributing To get started, sign the Contributor License Agreement. -1. Fork the repository on GitHub. +1. Fork the repository on GitHub 2. Clone repository `git clone --recursive https://github.com/YourGithubUsername/platformio-core.git` 3. Run `pip install tox` 4. Go to the root of project where is located `tox.ini` and run `tox -e py37` @@ -18,4 +18,4 @@ To get started, si 8. Run the tests `make test` 9. Build documentation `tox -e docs` (creates a directory _build under docs where you can find the html) 10. Commit changes to your forked repository -11. Submit a Pull Request on GitHub. +11. Submit a Pull Request on GitHub diff --git a/HISTORY.rst b/HISTORY.rst index 566842af..a4d41019 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -295,7 +295,7 @@ Please check `Migration guide from 4.x to 5.0 `__ command (`issue #3522 `_) - Show ignored project environments only in the verbose mode (`issue #3641 `_) - Do not escape compiler arguments in VSCode template on Windows - - Drop support for Python 2 and 3.5. + - Drop support for Python 2 and 3.5 .. _release_notes_4: diff --git a/README.rst b/README.rst index 54a8279f..061c0142 100644 --- a/README.rst +++ b/README.rst @@ -44,7 +44,7 @@ PlatformIO Core * Cross-platform IDE and Unified Debugger * Static Code Analyzer and Remote Unit Testing * Multi-platform and Multi-architecture Build System -* Firmware File Explorer and Memory Inspection. +* Firmware File Explorer and Memory Inspection Get Started ----------- From bb1e5902226303f9f449660927b43038c30b0f34 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 7 Feb 2022 13:46:47 +0200 Subject: [PATCH 4/7] Update SPDX License List to 3.16 --- platformio/package/manifest/schema.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py index 60d0d60c..78bf43a7 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py @@ -259,7 +259,7 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): - version = "3.15" + version = "3.16" spdx_data_url = ( "https://raw.githubusercontent.com/spdx/license-list-data/" "v%s/json/licenses.json" % version From 27400f66a979dc623bea7f5a2fc20af47d6bc415 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 8 Feb 2022 17:21:13 +0200 Subject: [PATCH 5/7] Strip the path to userhome dir on Linux // Resolve #4173 Issue #4158 --- platformio/project/helpers.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platformio/project/helpers.py b/platformio/project/helpers.py index 73945185..2aab20b7 100644 --- a/platformio/project/helpers.py +++ b/platformio/project/helpers.py @@ -78,9 +78,11 @@ def get_default_projects_dir(): except: # pylint: disable=bare-except if not IS_MACOS: try: - docs_dir = subprocess.check_output( - ["xdg-user-dir", "DOCUMENTS"] - ).decode("utf-8") + docs_dir = ( + subprocess.check_output(["xdg-user-dir", "DOCUMENTS"]) + .decode("utf-8") + .strip() + ) except FileNotFoundError: # command not found pass return os.path.join(docs_dir, "PlatformIO", "Projects") From 8594012fa1b4b8d204da5e978571625886154af5 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 8 Feb 2022 17:40:50 +0200 Subject: [PATCH 6/7] Update deps --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6b645300..02b947e0 100644 --- a/setup.py +++ b/setup.py @@ -29,13 +29,13 @@ from platformio.compat import PY2 minimal_requirements = [ "bottle==0.12.*", - "click>=8,<9,!=8.0.2", + "click>=8.0.3,<9", "colorama", "marshmallow%s" % (">=2,<3" if PY2 else ">=2,<4"), "pyelftools>=0.27,<1", "pyserial==3.*", "requests==2.*", - "semantic_version==2.8.*", + "semantic_version==2.9.*", "tabulate==0.8.*", ] From 100def76096a7ae49bc7f1c8e67d61306209644f Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 10 Feb 2022 20:59:16 +0200 Subject: [PATCH 7/7] Bump version to 5.2.5 --- HISTORY.rst | 2 +- docs | 2 +- platformio/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index a4d41019..c6cd902b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -8,7 +8,7 @@ PlatformIO Core 5 **A professional collaborative platform for embedded development** -5.2.5 (2021-12-??) +5.2.5 (2022-02-10) ~~~~~~~~~~~~~~~~~~ - Improved support for private packages in `PlatformIO Registry `__ diff --git a/docs b/docs index 4de1b83a..bbf4d275 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 4de1b83a71aeb6870ceb2ecd8ec4c2e38939f361 +Subproject commit bbf4d27508f4fe600dfb5706641bdccf6b2a762e diff --git a/platformio/__init__.py b/platformio/__init__.py index a57d1159..0c9e9bd5 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (5, 2, "5a6") +VERSION = (5, 2, 5) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio"