Merge branch 'release/v0.14.2'

platformio · Apr 27, 2018 · b08fe42 · b08fe42
2 parents c764b28 + ae56e63
commit b08fe42
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 0.14.2 (2018-04-28)
+
+* Fixed "PIP: Could not find a version that satisfies the requirement" (issue [#102](https://github.com/platformio/platformio-vscode-ide/issues/102))
+
 ## 0.14.1 (2018-04-09)
 
 * Temporary workaround for urgent VSCode bug in v1.22 with a broken task runner for Windows OS (issue [#97](https://github.com/platformio/platformio-vscode-ide/issues/97))

diff --git a/package.json b/package.json
@@ -1,50 +1,28 @@
 {
   "name": "platformio-ide",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "publisher": "platformio",
   "engines": {
     "vscode": "^1.18.0"
   },
   "license": "Apache-2.0",
   "displayName": "PlatformIO IDE",
-  "description": "Official PlatformIO IDE for IoT, Arduino, ARM mbed, Espressif (ESP8266/ESP32), STM32, PIC32, nRF51/nRF52, FPGA, CMSIS, SPL, AVR, Samsung ARTIK, libOpenCM3",
+  "description": "Development environment for IoT, Arduino, ARM mbed, Espressif (ESP8266/ESP32), STM32, PIC32, nRF51/nRF52, FPGA, CMSIS, SPL, AVR, Samsung ARTIK, libOpenCM3",
   "categories": [
-    "Languages",
     "Debuggers",
+    "Languages",
     "Other"
   ],
   "keywords": [
-    "PlatformIO",
     "IoT",
-    "arduino",
-    "mbed",
-    "debug",
-    "serial",
-    "unittest",
     "embedded",
-    "flash",
     "firmware",
-    "CMSIS",
-    "ESP-IDF",
-    "SPL",
-    "STM32Cube",
-    "avr",
-    "arm",
-    "espressif",
-    "esp8266",
-    "esp32",
-    "stm32",
-    "pic32",
-    "nRF51",
-    "nRF52",
-    "fpga",
-    "verilog",
-    "hardware",
-    "monitor"
+    "debug",
+    "arduino"
   ],
   "preview": true,
   "main": "./lib/main",
-  "icon": "images/icon.png",
+  "icon": "resources/platformio-logo.png",
   "homepage": "http://platformio.org",
   "author": {
     "name": "PlatformIO.Org"
@@ -244,7 +222,7 @@
   "dependencies": {
     "fs-plus": "^3.0.0",
     "ini": "^1.3.4",
-    "platformio-node-helpers": "^0.5.1"
+    "platformio-node-helpers": "^0.5.2"
   },
   "extensionDependencies": [
     "ms-vscode.cpptools",

diff --git a/images/icon.png → resources/platformio-logo.png b/images/icon.png → resources/platformio-logo.png
diff --git a/src/main.js b/src/main.js
@@ -45,9 +45,8 @@ class PlatformIOVSCodeExtension {
       }
     });
 
-    this.registerCommands();
-
     await this.startInstaller();
+    this.registerCommands();
 
     if (!hasPIOProject) {
       await this.startPIOHome();
@@ -155,10 +154,18 @@ class PlatformIOVSCodeExtension {
 
   registerCommands() {
     // PIO Home
-    this._context.subscriptions.push(vscode.workspace.registerTextDocumentContentProvider('platformio-home', new HomeContentProvider()));
+    this._context.subscriptions.push(vscode.workspace.registerTextDocumentContentProvider(
+      'platformio-home',
+      new HomeContentProvider())
+    );
     this._context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.showHome',
-      () => vscode.commands.executeCommand('vscode.previewHtml', vscode.Uri.parse('platformio-home://'), vscode.ViewColumn.One, 'PIO Home')
+      () => vscode.commands.executeCommand(
+        'vscode.previewHtml',
+        vscode.Uri.parse('platformio-home://'),
+        vscode.ViewColumn.One,
+        this.getEnterpriseSetting('pioHomeTitle', 'PIO Home')
+      )
     ));
 
     this._context.subscriptions.push(vscode.commands.registerCommand(

diff --git a/src/tasks.js b/src/tasks.js
@@ -67,7 +67,6 @@ export default class PIOTasksProvider {
 
     this._refreshTimeout = null;
 
-    this.removeStaticTasks();
     this.requestRefresh();
   }
 
@@ -78,28 +77,6 @@ export default class PIOTasksProvider {
     this.subscriptions = [];
   }
 
-  async removeStaticTasks() {
-    const manifestPath = path.join(this.projectDir, '.vscode', 'tasks.json');
-    if (!fs.isFileSync(manifestPath)) {
-      return;
-    }
-    const content = await new Promise(resolve => {
-      fs.readFile(
-        manifestPath,
-        'utf-8',
-        (err, data) => resolve(err ? '' : data)
-      );
-    });
-    if (!content.includes('PlatformIO: Upload SPIFFS image')) {
-      return;
-    }
-    try {
-      fs.unlink(manifestPath);
-    } catch (err) {
-      console.error(err);
-    }
-  }
-
   requestRefresh() {
     if (this._refreshTimeout) {
       clearTimeout(this._refreshTimeout);
@@ -251,24 +228,14 @@ class TaskCreator {
   }
 
   create() {
-    let pioCmd = 'platformio';
-    if (IS_WINDOWS) {
-      pioCmd = 'platformio.exe';
-      process.env.PATH.split(path.delimiter).forEach(item => {
-        if (fs.isFileSync(path.join(item, pioCmd))) {
-          pioCmd = path.join(item, pioCmd);
-          return;
-        }
-      });
-    }
     const task = new vscode.Task(
       {
         type: PIOTasksProvider.title,
         args: this._args
       },
       this.name,
       PIOTasksProvider.title,
-      new vscode.ProcessExecution(pioCmd, this._args, {
+      new vscode.ProcessExecution(IS_WINDOWS ? 'platformio.exe' : 'platformio', this._args, {
         env: process.env
       }),
       '$platformio'