Merge pull request #317 from microsoft/dev

Official micro:bit release

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+# This workflow will do a clean install of node dependencies, python dependencies, build the source code and run tests
+
+name: CI
+
+on:
+  push:
+    branches: [ dev, staging ]
+  pull_request:
+    branches: [ dev, staging ]
+
+jobs:
+  build-and-test:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-18.04]
+        node-version: [10.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Linux dependencies
+      if: matrix.os == 'ubuntu-18.04'
+      run: |
+        sudo apt-get update
+        sudo apt-get install g++-multilib
+        sudo apt-get install -y build-essential
+        sudo apt-get install libudev-dev
+    - name: Use Node.js ${{ matrix.node-version }} and install npm dependencies
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - name: Setup Python environment
+      uses: actions/[email protected]
+      with:
+        python-version: 3.x
+    - run: |
+        python -m pip install --upgrade pip
+        pip install -r ./src/dev-requirements.txt
+    - name: Use npm to compile, format-check and test
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm run compile
+    - run: npm run check
+    - name: Run tests
+      uses: GabrielBB/[email protected]
+      with: 
+        run: npm run test

.vscode/settings.json

@@ -5,7 +5,6 @@
     },
     "search.exclude": {
         "out": true // set this to false to include "out" folder in search results
-    },
+    }
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
-    "typescript.tsc.autoDetect": "off"
 }

gulpfile.js

@@ -35,8 +35,12 @@ gulp.task("clean", () => {
 
 const pythonToMove = [
   "./src/adafruit_circuitplayground/*.*",
-  "./src/microbit/*.*",
-  "./src/microbit/!(test)/**/*",
+  "./src/clue/*.*",
+  "./src/clue/!(test)/**/*",
+  "./src/base_circuitpython/**/*",
+  "./src/micropython/*.*",
+  "./src/micropython/microbit/*.*",
+  "./src/micropython/microbit/!(test)/**/*",
   "./src/*.py",
   "./src/common/*.py",
   "./src/dev-requirements.txt",

locales/en/out/constants.i18n.json

@@ -14,7 +14,8 @@
   "error.debuggerServerInitFailed": "Warning : The Debugger Server cannot be opened. Please try to free the port {0} if it's already in use or select another one in your Settings 'Device Simulator Express: Debugger Server Port' and start another debug session.\n You can still debug your code but you won't be able to use the Simulator.",
   "error.debuggingSessionInProgress": "[ERROR] A debugging session is currently in progress, please stop it before running your code. \n",
   "error.noDevice": "No plugged in boards detected. Please double check if your board is connected and/or properly formatted",
-  "error.noFileToRun": "\n[ERROR] We can't find the .py file to run on simulator. Open up a new .py file, or browse through some examples\n",
+  "error.noFileToRun": "\n[ERROR] We can't find the .py file to run. Open up a new .py file, or browse through some examples\n",
+  "error.noFileToDeploy": "\n[ERROR] We can't find a Python file to deploy to your device.\n",
   "error.noFolderCreated": "In order to use the Serial Monitor, you need to open a folder and reload VS Code.",
   "error.noProgramFoundDebug": "Cannot find a program to debug.",
   "error.noPythonPath": "We found that you don't have Python 3 installed on your computer, please install the latest version, add it to your PATH and try again.",
@@ -28,6 +29,9 @@
   "info.installPythonDependencies": "Do you want us to try and install this extensions dependencies for you?",
   "error.invalidFileExtensionDebug": "The file you tried to run isn\\'t a Python file.",
   "info.newFile": "New to Python or the Circuit Playground Express? We are here to help!",
+  "info.noDeviceChosenToDeployTo": "\n[INFO] No device was selected to deploy to.\n",
+  "info.noDeviceChosenToSimulateTo": "\n[INFO] No device was selected to simulate.\n",
+  "info.noDeviceChosenForNewFile": "\n[INFO] No device was selected to open a template file for.\n",
   "info.redirect": "You are being redirected.",
   "info.runningCode": "Running user code",
   "info.privacyStatement": "Privacy Statement",

locales/en/package.i18n.json

@@ -1,20 +1,18 @@
 {
-  "deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
-  "deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
-  "deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
-  "deviceSimulatorExpressExtension.commands.common.changeBaudRate": "Change Baud Rate",
-  "deviceSimulatorExpressExtension.commands.common.closeSerialMonitor": "Close Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.common.openSerialMonitor": "Open Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.common.selectSerialPort": "Select Serial Port",
-  "deviceSimulatorExpressExtension.commands.cpx.openSimulator": "[Circuit Playground Express] Open Simulator",
-  "deviceSimulatorExpressExtension.commands.cpx.newFile": "[Circuit Playground Express] New File",
-  "deviceSimulatorExpressExtension.commands.cpx.deployToDevice": "[Circuit Playground Express] Deploy to Device",
-  "deviceSimulatorExpressExtension.commands.microbit.deployToDevice": "[micro:bit] Deploy to Device",
-  "deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
-  "deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
-  "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
-  "deviceSimulatorExpressExtension.configuration.properties.configEnvOnChange": "When you change the Python interpreter, the Device Simulator Express will automatically configure itself for the required dependencies.",
-  "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger.",
-  "deviceSimulatorExpressExtension.configuration.properties.dependencyChecker": "Whether or not to ask if we can download dependencies. If unchecked, the extension will default to never download dependencies, except when automatically creating a virtual environment in the extension files.",
-  "deviceSimulatorExpressExtension.configuration.properties.previewMode": "Enable this to test out and play with the new micro:bit simulator!"
-}
+    "deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
+    "deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
+    "deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
+    "deviceSimulatorExpressExtension.commands.common.gettingStarted": "Getting Started",
+    "deviceSimulatorExpressExtension.commands.common.changeBaudRate": "Change Baud Rate",
+    "deviceSimulatorExpressExtension.commands.common.closeSerialMonitor": "Close Serial Monitor",
+    "deviceSimulatorExpressExtension.commands.common.openSerialMonitor": "Open Serial Monitor",
+    "deviceSimulatorExpressExtension.commands.common.selectSerialPort": "Select Serial Port",
+    "deviceSimulatorExpressExtension.commands.common.deployToDevice": "Deploy to Device",
+    "deviceSimulatorExpressExtension.commands.common.openSimulator": "Open Simulator",
+    "deviceSimulatorExpressExtension.commands.common.newFile": "New File",
+    "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
+    "deviceSimulatorExpressExtension.configuration.properties.configEnvOnChange": "When you change the Python interpreter, the Device Simulator Express will automatically configure itself for the required dependencies.",
+    "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger.",
+    "deviceSimulatorExpressExtension.configuration.properties.dependencyChecker": "Whether or not to ask if we can download dependencies. If unchecked, the extension will default to never download dependencies, except when automatically creating a virtual environment in the extension files.",
+    "deviceSimulatorExpressExtension.configuration.properties.previewMode": "Enable this to test out and play with the new Adafruit CLUE simulator!"
+}