platformio: 4.1.0 -> 4.3.1
This commit is contained in:
parent
c392d70518
commit
40998c81a6
|
@ -34,6 +34,8 @@ let
|
||||||
"commands/test_test.py::test_local_env"
|
"commands/test_test.py::test_local_env"
|
||||||
"test_builder.py::test_build_flags"
|
"test_builder.py::test_build_flags"
|
||||||
"test_builder.py::test_build_unflags"
|
"test_builder.py::test_build_unflags"
|
||||||
|
"test_builder.py::test_debug_default_build_flags"
|
||||||
|
"test_builder.py::test_debug_custom_build_flags"
|
||||||
"test_misc.py::test_api_cache"
|
"test_misc.py::test_api_cache"
|
||||||
"test_misc.py::test_ping_internet_ips"
|
"test_misc.py::test_ping_internet_ips"
|
||||||
"test_misc.py::test_platformio_cli"
|
"test_misc.py::test_platformio_cli"
|
||||||
|
@ -49,14 +51,14 @@ let
|
||||||
|
|
||||||
in buildPythonApplication rec {
|
in buildPythonApplication rec {
|
||||||
pname = "platformio";
|
pname = "platformio";
|
||||||
version = "4.1.0";
|
version = "4.3.1";
|
||||||
|
|
||||||
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "platformio";
|
owner = "platformio";
|
||||||
repo = "platformio-core";
|
repo = "platformio-core";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "10v9jw1zjfqr3wl6kills3cfp0ky7xbm1gc3z0n57wrqbc6cmz95";
|
sha256 = "1dxnjy60zpkgyrbvbf6b9qi6m37gm8gwjmxwfj30npr1y7rvxwrw";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -79,11 +81,6 @@ in buildPythonApplication rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./fix-searchpath.patch
|
./fix-searchpath.patch
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/platformio/platformio-core/commit/442a7e357636522e844d95375c246644b21a7802.patch";
|
|
||||||
sha256 = "0a3kj3k02237gr2yk30gpwc6vm04dsd1wxldj4dsbzs4a9yyi70m";
|
|
||||||
excludes = ["HISTORY.rst"];
|
|
||||||
})
|
|
||||||
./use-local-spdx-license-list.patch
|
./use-local-spdx-license-list.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
|
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
|
||||||
index f1d68e08..9b7b1da8 100644
|
index be49b3ee..d1390a88 100644
|
||||||
--- a/platformio/package/manifest/schema.py
|
--- a/platformio/package/manifest/schema.py
|
||||||
+++ b/platformio/package/manifest/schema.py
|
+++ b/platformio/package/manifest/schema.py
|
||||||
@@ -174,9 +174,5 @@ class ManifestSchema(Schema):
|
@@ -240,9 +240,5 @@ class ManifestSchema(BaseSchema):
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@memoized(expire="1h")
|
@memoized(expire="1h")
|
||||||
def load_spdx_licenses():
|
def load_spdx_licenses():
|
||||||
- r = requests.get(
|
- r = requests.get(
|
||||||
- "https://raw.githubusercontent.com/spdx/license-list-data"
|
- "https://raw.githubusercontent.com/spdx/license-list-data"
|
||||||
- "/v3.7/json/licenses.json"
|
- "/v3.8/json/licenses.json"
|
||||||
- )
|
- )
|
||||||
- r.raise_for_status()
|
- r.raise_for_status()
|
||||||
- return r.json()
|
- return r.json()
|
||||||
|
|
Loading…
Reference in New Issue