Merge pull request #124 from paulober/develop

Patch v3.2.2

Author: paulober

.github/workflows/codeql-analysis.yml

@@ -62,7 +62,9 @@ jobs:
       uses: github/codeql-action/autobuild@v2
 
     - name: Custom-Build
-      run: npm run compile
+      run: |
+        npm ci
+        npm run compile
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

CHANGELOG.md

@@ -9,6 +9,16 @@ All notable changes to the "MicroPico" extension will be documented in this file
 
 ---
 
+## [3.2.2] - 2023-08-14
+
+# Added
+- `uploadproject` status-bar button
+
+# Changed
+- Upgraded pyboard-serial-com to v1.5.3 (Fixes an issue where `pyIgnore` wildcard exclusions were not working)
+- Updated stubs to patch v1.20.0-3 stable
+- Dependencies were updated
+
 ## [3.2.1] - 2023-08-01
 
 # Changed

README.md

@@ -76,7 +76,7 @@ This extension contributes the following settings:
 * `micropico.additionalSyncFolders`: Specifies additional folders that can be selected as upload sources when uploading a project. If left empty, the sync will be performed based on the folder specified in the 'syncFolder' setting. Only folders within the project are allowed. Specify the path relative to the project you have opened in Visual Studio Code, without a leading or trailing slash.
 * `micropico.syncAllFileTypes`: If enabled, all files will be uploaded no matter the file type. The list of file types below will be ignored.
 * `micropico.syncFileTypes`: All types of files that will be uploaded to the board, seperated by comma. All other filetypes will be ignored during an upload (or download) action.
-* `micropico.pyIgnore`: Comma separated list of files and folders to ignore when uploading relative to syncFolder (no wildcard or regular expressions supported except `**/<file/folder>` to exclude an item by its name in every sub folder). Use `<additionalSyncFolder>:file/to/exclude.py` to create sync folder exclusive exclusion rules (all other rules will always be applied relative to the selected sync folder). Replace `additionalSyncFolder` with a value from your `micropico.additionalSyncFolders` setting or the value from `micropico.syncFolder`.
+* `micropico.pyIgnore`: Comma separated list of files and folders to ignore when uploading relative to syncFolder (no wildcard or regular expressions supported except `**/<file|folder>` to exclude an item by its name in every sub folder). Use `<additionalSyncFolder>:file/to/exclude.py` to create sync folder exclusive exclusion rules (all other rules will always be applied relative to the selected sync folder). Replace `additionalSyncFolder` with a value from your `micropico.additionalSyncFolders` setting or the value from `micropico.syncFolder`.
 * `micropico.openOnStart`: Automatically open the MicroPico terminal (Pico (W) vREPL) and connect to the board after starting VS Code.
 * `micropico.statusbarButtons`: Select which buttons to show in the statusbar (DO NOT CHANGE, unless you know what you are doing)
 * `micropico.gcBeforeUpload`: Run garbage collection before uploading files to the board. This will free up some memory usefull when uploading large files but adds about a second or two to the upload process.

package-lock.json

@@ -2,7 +2,7 @@
   "name": "pico-w-go",
   "displayName": "MicroPico",
   "description": "Auto-completion, remote workspace and a REPL console integration for the Raspberry Pi Pico (W) with MicroPython firmware.",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "publisher": "paulober",
   "license": "MPL-2.0",
   "homepage": "https://github.com/paulober/MicroPico/blob/main/README.md",
@@ -367,7 +367,8 @@
               "settings",
               "listserial",
               "listcommands",
-              "togglepicowfs"
+              "togglepicowfs",
+              "uploadproject"
             ]
           },
           "default": [
@@ -443,6 +444,12 @@
       "command": "micropico.uploadFile",
       "tooltip": "Upload current file to your board"
     },
+    {
+      "key": "uploadproject",
+      "name": "$(triangle-up) Upload Project",
+      "command": "micropico.upload",
+      "tooltip": "Upload current project to your board"
+    },
     {
       "key": "download",
       "name": "$(triangle-down) Download",
@@ -500,29 +507,29 @@
     "test": "node ./out/test/runTest.js"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^25.0.3",
+    "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.3",
     "@rollup/plugin-typescript": "^11.1.2",
     "@types/fs-extra": "^11.0.1",
-    "@types/lodash": "^4.14.196",
+    "@types/lodash": "^4.14.197",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.x",
     "@types/uuid": "^9.0.2",
     "@types/vscode": "^1.76.0",
-    "@typescript-eslint/eslint-plugin": "^6.2.1",
-    "@typescript-eslint/parser": "^6.2.1",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "@typescript-eslint/parser": "^6.4.0",
     "@vscode/test-electron": "^2.3.4",
-    "eslint": "^8.46.0",
-    "eslint-config-prettier": "^8.9.0",
+    "eslint": "^8.47.0",
+    "eslint-config-prettier": "^9.0.0",
     "glob": "^9.3.4",
     "mocha": "^10.2.0",
-    "rollup": "^3.27.0",
+    "rollup": "^3.28.0",
     "rollup-plugin-copy": "^3.4.0",
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@paulober/pyboard-serial-com": "^1.5.2",
+    "@paulober/pyboard-serial-com": "^1.5.3",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",
     "rimraf": "^5.0.1",

package.json

@@ -11,7 +11,7 @@ import {
 } from "vscode";
 import type { ExtensionTerminalOptions } from "vscode";
 
-export const extName = "pico-w-go";
+export const extName = "micropico";
 export const extId = "paulober.pico-w-go";
 export const TERMINAL_NAME = "Pico (W) vREPL";
 

src/api.mts

@@ -1,7 +1,7 @@
 import type { Memento, WorkspaceConfiguration } from "vscode";
 import { window, workspace } from "vscode";
 import { PyboardRunner } from "@paulober/pyboard-serial-com";
-import { getProjectPath } from "./api.mjs";
+import { extName, getProjectPath } from "./api.mjs";
 import { join, relative } from "path";
 
 export enum SettingsKey {
@@ -27,7 +27,7 @@ export default class Settings {
   public pythonExecutable?: string;
 
   constructor(context: Memento) {
-    this.config = workspace.getConfiguration("micropico");
+    this.config = workspace.getConfiguration(extName);
 
     this.context = context;
     this.pythonExecutable = this.getString(SettingsKey.pythonPath);

src/settings.mts

@@ -1 +1 @@
-from umachine import *
+from .umachine import *

stubs/stubs/machine/machine.pyi

@@ -30,7 +30,7 @@ Descriptions taken from
 """
 from collections.abc import Callable, Sequence
 from typing import overload, NoReturn
-from typing import ClassVar, Any
+from typing import ClassVar, Any, Literal
 
 
 class ADC:
@@ -313,13 +313,13 @@ with `Pin.IN`, `Pin.OUT`, or `Pin.OPEN_DRAIN`, the alternate function will be re
         """
         ...
 
-    def value(self, value: Any=..., /) -> None:
+    def value(self, value: Any=..., /) -> Literal[0, 1] | None:
         """
         Get or set the digital logic level of the pin:
 
             - With no argument, return 0 or 1 depending on the logic level of the pin.
-            - With ``value`` given, set the logic level of the pin.  ``value`` can be
-            anything that converts to a boolean.  If it converts to ``True``, the pin
+            - With ``value`` given, set the logic level of the pin. `value` can be
+            anything that converts to a boolean. If it converts to `True`, the pin
             is set high, otherwise it is set low.
         """
         ...

stubs/stubs/umachine/umachine.pyi

@@ -1 +1 @@
-{"version": "1.20.0-2"}
+{"version": "1.20.0-3"}