Merge branch 'release/v5.1.1'

valeros · valeros · commit 6af5c4d61410 · 2022-02-18T21:15:06.000+02:00
diff --git a/builder/frameworks/freedom-e-sdk.py b/builder/frameworks/freedom-e-sdk.py
@@ -34,7 +34,9 @@
 except ImportError:
     env.Execute(
         env.VerboseAction(
-            "$PYTHONEXE -m pip install pyparsing==2.4.5 Jinja2==2.10.1",
+            # Note: a specific version of MarkupSafe is requrired to avoid
+            # the ImportError of 'soft_unicode' in Jinja2
+            "$PYTHONEXE -m pip install pyparsing==2.4.5 MarkupSafe==2.0.1 Jinja2==2.10.1",
             "Installing Freedom E SDK's Python dependencies",
         )
     )
diff --git a/platform.json b/platform.json
@@ -16,7 +16,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-sifive.git"
   },
-  "version": "5.1.0",
+  "version": "5.1.1",
   "frameworks": {
     "freedom-e-sdk": {
       "package": "framework-freedom-e-sdk",

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@`
`34`	`34`	`except ImportError:`
`35`	`35`	`env.Execute(`
`36`	`36`	`env.VerboseAction(`
`37`		`- "$PYTHONEXE -m pip install pyparsing==2.4.5 Jinja2==2.10.1",`
	`37`	`+ # Note: a specific version of MarkupSafe is requrired to avoid`
	`38`	`+ # the ImportError of 'soft_unicode' in Jinja2`
	`39`	`+ "$PYTHONEXE -m pip install pyparsing==2.4.5 MarkupSafe==2.0.1 Jinja2==2.10.1",`
`38`	`40`	`"Installing Freedom E SDK's Python dependencies",`
`39`	`41`	`)`
`40`	`42`	`)`