Skip to content

Commit 0b63ada

Browse files
author
Jakob Rosenberg
authored
Merge pull request #164 from pycom/release-v1.1.14
Release v1.1.14
2 parents 33bd656 + 8305ef5 commit 0b63ada

File tree

86 files changed

+4185
-8296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+4185
-8296
lines changed

‎.babelrc

-5
This file was deleted.

‎.github/workflows/main.yml

-108
This file was deleted.

‎.github/workflows/publish.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Deploy PyMakr
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
release:
8+
types:
9+
- created
10+
11+
jobs:
12+
build:
13+
strategy:
14+
matrix:
15+
os: [ubuntu-latest]
16+
runs-on: ${{ matrix.os }}
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v2
20+
- name: Install Node.js
21+
uses: actions/setup-node@v1
22+
with:
23+
node-version: 14
24+
- run: npm ci
25+
26+
- name: Publish
27+
if: success() && startsWith( github.ref, 'refs/tags/releases/') && matrix.os == 'ubuntu-latest'
28+
run: npm run deploy
29+
env:
30+
VSCE_PAT: ${{ secrets.PUBLISHER_TOKEN }}

‎.github/workflows/serialport.yml

-57
This file was deleted.

‎.github/workflows/test.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Test Pymakr
2+
3+
on:
4+
pull_request: ~
5+
push:
6+
branches-ignore:
7+
- "dependabot/**"
8+
paths-ignore:
9+
- "doc/**"
10+
11+
jobs:
12+
build:
13+
name: "Build ${{ matrix.os }}"
14+
runs-on: ${{ matrix.os }}
15+
strategy:
16+
matrix:
17+
os: [windows-latest, macos-latest, ubuntu-latest]
18+
steps:
19+
- name: checkout
20+
uses: actions/checkout@v2
21+
22+
- name: Setup node
23+
uses: actions/setup-node@v1
24+
with:
25+
node-version: 14
26+
27+
- name: install dependencies
28+
run: npm ci
29+
30+
31+
- if: runner.os == 'Linux'
32+
name: Run tests (Linux)
33+
run: |
34+
rm /home/runner/work/pymakr-vsc/pymakr-vsc/node_modules/@serialport/bindings/build/Release/bindings.node
35+
xvfb-run -a npm test
36+
37+
- if: runner.os != 'Linux'
38+
name: Run tests (Mac/Win)
39+
run: npm test

‎.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# no node_modules
22
node_modules
3-
# no transpiled
4-
/lib
53
# no packages
64
*.vsix
75

@@ -23,3 +21,6 @@ native_modules/**/**/config.gypi
2321

2422
test-electron/package-lock.json
2523
.github/actions/fetch-electron-versions/dist
24+
.history
25+
connection_state.json
26+
config.gypi

‎.vscode/launch.json

+17-57
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,21 @@
11
// A launch configuration that launches the extension inside a new window
22
{
3-
"version": "0.1.0",
4-
"configurations": [
3+
"version": "0.2.0",
4+
"configurations": [
55
{
6-
"type": "node",
7-
"request": "launch",
8-
"name": "Electron-Test Index",
9-
"runtimeExecutable": "C:\\develop\\pymakr-vsc\\test\\test-electron\\node_modules\\electron\\dist\\electron.exe",
10-
11-
"program": "C:\\develop\\pymakr-vsc\\test\\test-electron\\index.js"
6+
"name": "Run Extension",
7+
"type": "extensionHost",
8+
"request": "launch",
9+
"runtimeExecutable": "${execPath}",
10+
"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
11+
"stopOnEntry": false
1212
},
13-
{
14-
"name": "PowerShell Launch Current File w/Args Prompt",
15-
"type": "PowerShell",
16-
"request": "launch",
17-
"script": "${file}",
18-
"args": [
19-
"${command:SpecifyScriptArgs}"
20-
],
21-
"cwd": "${workspacefolder}"
22-
},
23-
{
24-
"name": "PowerShell Launch Current File",
25-
"type": "PowerShell",
26-
"request": "launch",
27-
"script": "${file}",
28-
"args": [],
29-
"cwd": "${workspaceFolder}"
30-
},
31-
{
32-
"type": "node",
33-
"request": "launch",
34-
"name": "Launch current",
35-
"program": "${file}"
36-
},
37-
{
38-
"type": "node",
39-
"request": "launch",
40-
"name": "Debug current script",
41-
"program": "${file}"
42-
},
43-
44-
{
45-
"name": "Launch Extension",
46-
"type": "extensionHost",
47-
"request": "launch",
48-
"runtimeExecutable": "${execPath}",
49-
"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
50-
"stopOnEntry": false
51-
},
52-
{
53-
"name": "Launch Tests",
54-
"type": "extensionHost",
55-
"request": "launch",
56-
"runtimeExecutable": "${execPath}",
57-
"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/test" ],
58-
"stopOnEntry": false
59-
}
60-
]
61-
}
13+
{
14+
"name": "Extension Tests",
15+
"type": "extensionHost",
16+
"request": "launch",
17+
"runtimeExecutable": "${execPath}",
18+
"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/test/suite/index"]
19+
}
20+
]
21+
}

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Changelog
2+
3+
4+
## [1.1.14](https://github.com/pycom/pymakr-vsc/compare/release-v1.1.13...release-v1.1.14) (2021-10-11)
5+
- fix Node build tools are no longer a requirement
6+
17
## 1.1.12 - Compatibility vscode 1.53
28
- fix serialports binding for new vscode 1.56.0
39

‎src/board/authorize.js ‎lib/board/authorize.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
'use babel';
2-
3-
export default class Authorize {
1+
module.exports = class Authorize {
42

53
constructor(pyboard){
64
this.pyboard = pyboard

‎src/board/project-status.js ‎lib/board/project-status.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
'use babel';
21
var fs = require('fs');
32
var crypto = require('crypto');
4-
import Logger from '../helpers/logger.js'
5-
import Utils from '../helpers/utils.js';
3+
const Logger = require('../helpers/logger.js')
4+
const Utils = require('../helpers/utils.js')
65

7-
export default class ProjectStatus {
6+
module.exports = class ProjectStatus {
87

98
constructor(shell,settings,local_folder){
109
this.shell = shell

‎lib/board/pyboard-error.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = class PyboardError extends Error{}

0 commit comments

Comments
 (0)