Skip to content

Commit 57b1188

Browse files
authored
remove some registry dependencies
1 parent ee89850 commit 57b1188

File tree

11 files changed

+23
-42
lines changed

11 files changed

+23
-42
lines changed

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

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

1818
__title__ = "platformio"

platformio/dependencies.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@
1919

2020
def get_core_dependencies():
2121
return {
22-
"contrib-piohome": "~3.4.2",
23-
"contrib-pioremote": "~1.0.0",
24-
"tool-scons": "~4.40700.0",
25-
"tool-cppcheck": "~1.21100.0",
26-
"tool-clangtidy": "~1.150005.0",
27-
"tool-pvs-studio": "~7.18.0",
2822
}
2923

3024

@@ -39,6 +33,7 @@ def get_pip_dependencies():
3933
"requests%s == 2.*" % ("[socks]" if is_proxy_set(socks=True) else ""),
4034
"semantic_version == 2.10.*",
4135
"tabulate == 0.*",
36+
"intelhex", # actual esptool.py requirement
4237
]
4338

4439
home = [

platformio/maintenance.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -165,22 +165,6 @@ def print_welcome_banner():
165165
click.style("https://github.com/platformio/platformio-core", fg="cyan"),
166166
)
167167
)
168-
click.echo(
169-
"- %s us on LinkedIn to stay up-to-date "
170-
"on the latest project news > %s"
171-
% (
172-
click.style("follow", fg="cyan"),
173-
click.style("https://www.linkedin.com/company/platformio/", fg="cyan"),
174-
)
175-
)
176-
if not os.getenv("PLATFORMIO_IDE"):
177-
click.echo(
178-
"- %s PlatformIO IDE for embedded development > %s"
179-
% (
180-
click.style("try", fg="cyan"),
181-
click.style("https://platformio.org/platformio-ide", fg="cyan"),
182-
)
183-
)
184168

185169
click.echo("*" * terminal_width)
186170
click.echo("")

platformio/package/manager/core.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,17 @@ def get_installed_core_packages():
3232
return result
3333

3434

35-
def get_core_package_dir(name, spec=None, auto_install=True):
36-
if name not in get_core_dependencies():
37-
raise exception.PlatformioException("Please upgrade PlatformIO Core")
35+
# pylint: disable=unused-argument
36+
def get_core_package_dir(name, spec=None, auto_install=False):
37+
# pylint: enable=unused-argument
3838
pm = ToolPackageManager()
39-
spec = spec or PackageSpec(
40-
owner="platformio", name=name, requirements=get_core_dependencies()[name]
41-
)
42-
pkg = pm.get_package(spec)
43-
if pkg:
44-
return pkg.path
45-
if not auto_install:
46-
return None
47-
assert pm.install(spec)
48-
remove_unnecessary_core_packages()
49-
return pm.get_package(spec).path
39+
try:
40+
pkg_dir = pm.get_package(name).path
41+
except:
42+
# pylint: disable=raise-missing-from
43+
raise exception.PlatformioException("Please restart VSC/PlatformIO to fix defect install")
44+
# pylint: enable=raise-missing-from
45+
return pkg_dir
5046

5147

5248
def update_core_packages():

platformio/package/vcsclient.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ def export(self):
192192
args += [self.remote_url, self.src_dir]
193193
assert self.run_cmd(args, cwd=os.getcwd())
194194
if is_commit:
195+
assert self.run_cmd(["init", self.src_dir], cwd=os.getcwd())
196+
assert self.run_cmd(["remote", "add", "origin", self.remote_url])
197+
assert self.run_cmd(["fetch", "--depth=1", "origin", self.tag])
195198
assert self.run_cmd(["reset", "--hard", self.tag])
196199
return self.run_cmd(
197200
["submodule", "update", "--init", "--recursive", "--force"]

platformio/public.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from platformio.project.options import get_config_options_schema
2424
from platformio.test.result import TestCase, TestCaseSource, TestStatus
2525
from platformio.test.runners.base import TestRunnerBase
26-
from platformio.test.runners.doctest import DoctestTestCaseParser
26+
from platformio.test.runners.doctest import DoctestTestRunner
2727
from platformio.test.runners.googletest import GoogletestTestRunner
2828
from platformio.test.runners.unity import UnityTestRunner
2929
from platformio.util import get_systype

platformio/test/runners/doctest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def _parse_assert(self, line):
101101

102102

103103
class DoctestTestRunner(TestRunnerBase):
104-
EXTRA_LIB_DEPS = ["doctest/doctest@^2.4.9"]
104+
EXTRA_LIB_DEPS = ["doctest/doctest@^2.4.11"]
105105

106106
def __init__(self, *args, **kwargs):
107107
super().__init__(*args, **kwargs)

platformio/test/runners/googletest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def _parse_source_and_message(self, stdout):
8888

8989

9090
class GoogletestTestRunner(TestRunnerBase):
91-
EXTRA_LIB_DEPS = ["google/googletest@^1.12.1"]
91+
EXTRA_LIB_DEPS = ["google/googletest@^1.15.2"]
9292

9393
def __init__(self, *args, **kwargs):
9494
super().__init__(*args, **kwargs)

platformio/test/runners/unity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727

2828
class UnityTestRunner(TestRunnerBase):
29-
EXTRA_LIB_DEPS = ["throwtheswitch/Unity@^2.5.2"]
29+
EXTRA_LIB_DEPS = ["throwtheswitch/Unity@^2.6.0"]
3030

3131
# Examples:
3232
# test/test_foo.cpp:44:test_function_foo:FAIL: Expected 32 Was 33

0 commit comments

Comments
 (0)