Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PYTHONPATH=./uitests
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
out
node_modules
*.pyc
*.vsix
# *.vsix
**/.vscode/.ropeproject/**
**/testFiles/**/.cache/**
*.noseids
Expand All @@ -15,7 +15,9 @@ npm-debug.log
!yarn.lock
coverage/
.vscode-test/**
.vscode-smoke/**
**/.venv*/
**/venv*/
port.txt
precommit.hook
pythonFiles/experimental/ptvsd/**
Expand Down
4 changes: 4 additions & 0 deletions .nycrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends":"@istanbuljs/nyc-config-typescript",
"all":true
}
56 changes: 37 additions & 19 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,30 @@
{
"version": "0.1.0",
"configurations": [
{
"name": "Extension",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"stopOnEntry": false,
"smartStep": true,
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/out/**/*"
],
"preLaunchTask": "Compile"
},
{
"name": "Extension inside container",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}", "${workspaceFolder}/data"
"--extensionDevelopmentPath=${workspaceFolder}",
"${workspaceFolder}/data"
],
"stopOnEntry": false,
"smartStep": true,
Expand All @@ -24,7 +41,9 @@
"request": "launch",
"module": "IPython",
"console": "integratedTerminal",
"args": ["${file}"] // Additional args should be prefixed with a '--' first.
"args": [
"${file}"
] // Additional args should be prefixed with a '--' first.
},
{
"name": "Python: Current File",
Expand All @@ -33,22 +52,6 @@
"program": "${file}",
"console": "integratedTerminal"
},
{
"name": "Extension",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"stopOnEntry": false,
"smartStep": true,
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/out/**/*"
],
"preLaunchTask": "Compile"
},
{
"name": "Debugger as debugServer",
"type": "node",
Expand Down Expand Up @@ -199,6 +202,21 @@
"args": [
"watch"
]
},
{
"name": "UI Tests (BDD)",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/uitests/__main__.py",
"args": [
"test",
"--",
"--format",
"progress3",
"--tags=wip"
],
"justMyCode": false,
"console": "internalConsole"
}
],
"compounds": [
Expand All @@ -210,4 +228,4 @@
]
}
]
}
}
25 changes: 15 additions & 10 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"obj": true,
"bin": true,
"**/__pycache__": true,
"node_modules": true,
".vscode-test": true,
"node_modules": false,
"**/.mypy_cache/**": true,
"**/.ropeproject/**": true
},
Expand All @@ -17,16 +16,22 @@
"coverage": true,
"languageServer*/**": true
},
"editor.formatOnSave": true,
"typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
"tslint.enable": true,
"python.linting.enabled": false,
"python.testing.promptToConfigure": false,
"python.workspaceSymbols.enabled": false,
"python.formatting.provider": "none",
"typescript.preferences.quoteStyle": "single",
"javascript.preferences.quoteStyle": "single",
"typescriptHero.imports.stringQuoteStyle": "'",
"prettier.tslintIntegration": false,
"prettier.printWidth": 180,
"prettier.singleQuote": true
"tslint.enable": true,
"python.jediEnabled": false,
"python.analysis.logLevel": "Trace",
"python.analysis.downloadChannel": "beta",
"python.unitTest.promptToConfigure": false,
"python.workspaceSymbols.enabled": false,
"python.formatting.provider": "black",
"python.linting.enabled": true,
"python.linting.pylintEnabled": false,
"python.linting.flake8Enabled": true,
"python.linting.flake8Args": [
"--max-line-length=120"
]
}
4 changes: 4 additions & 0 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
.gitmodules
.huskyrc.json
.npmrc
.nycrc
.travis.yml
CODE_OF_CONDUCT.md
CODING_STANDARDS.md
Expand All @@ -31,6 +32,7 @@ vscode-python-signing.*
webpack.config.js
webpack.datascience-*.config.js

.devcontainer/**
.github/**
.mocha-reporter/**
.nvm/**
Expand All @@ -44,6 +46,7 @@ bin/**
build/**
BuildOutput/**
coverage/**
data/**
debug_coverage*/**
images/**/*.gif
images/**/*.png
Expand All @@ -70,3 +73,4 @@ tmp/**
tpn/**
typings/**
types/**
uitests/**
30 changes: 30 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[[source]]

url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"


[packages]

jedi = "==0.12.0"
parso = "==0.2.1"
isort = "==4.3.4"
ptvsd = "==4.2.4"
behave = "*"
selenium = "*"
progress = "*"
requests = "*"
docopt = "*"
black = "*"


[dev-packages]

"flake8" = "*"
black = "*"


[requires]

python_version = "3.7"
16 changes: 16 additions & 0 deletions build/ci/templates/build_compile_jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
jobs:
- job: Compile
variables:
build: false
pool:
vmImage: "macos-10.13"
steps:
- template: build_compile_steps.yml

- job: Build
variables:
build: true
pool:
vmImage: "macos-10.13"
steps:
- template: build_compile_steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,50 +41,50 @@ steps:
displayName: "Compile and check for errors"
inputs:
targets: "prePublishNonBundle"
condition: and(succeeded(), eq(variables['Build'], 'false'))
condition: and(succeeded(), eq(variables['build'], 'false'))

- bash: npx tslint ./src/**/*.ts{,x}
displayName: "code hygiene"
condition: and(succeeded(), eq(variables['Build'], 'false'))
condition: and(succeeded(), eq(variables['build'], 'false'))

- bash: |
python -m pip install -U pip
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
failOnStderr: true
displayName: "pip install requirements"
condition: and(succeeded(), eq(variables['Build'], 'true'))
condition: and(succeeded(), eq(variables['build'], 'true'))

- bash: |
npm install -g vsce
npm run clean
displayName: "Install vsce & Clean"
condition: and(succeeded(), eq(variables['Build'], 'true'))
condition: and(succeeded(), eq(variables['build'], 'true'))

- bash: |
npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID
displayName: "Update dev Version"
condition: and(succeeded(), eq(variables['Build'], 'true'), eq(variables['Build.SourceBranchName'], 'master'))
condition: and(succeeded(), eq(variables['build'], 'true'), eq(variables['Build.SourceBranchName'], 'master'))

- bash: |
npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID --updateChangelog
displayName: "Update release Version"
condition: and(succeeded(), eq(variables['Build'], 'true'), eq(variables['Build.SourceBranchName'], 'release'))
condition: and(succeeded(), eq(variables['build'], 'true'), eq(variables['Build.SourceBranchName'], 'release'))

- bash: |
npm run package
displayName: "Build VSIX"
condition: and(succeeded(), eq(variables['Build'], 'true'))
condition: and(succeeded(), eq(variables['build'], 'true'))

- task: CopyFiles@2
inputs:
contents: "*.vsix"
targetFolder: $(Build.ArtifactStagingDirectory)
displayName: "Copy VSIX"
condition: and(succeeded(), eq(variables['Build'], 'true'))
condition: and(succeeded(), eq(variables['build'], 'true'))

- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: $(Build.ArtifactStagingDirectory)
artifactName: VSIX
displayName: "Publish VSIX to Arifacts"
condition: and(succeeded(), eq(variables['Build'], 'true'))
condition: and(succeeded(), eq(variables['build'], 'true'))
27 changes: 0 additions & 27 deletions build/ci/templates/test_phases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -503,30 +503,3 @@ steps:
condition: and(succeeded(), contains(variables['TestsToRun'], 'testPerformance'))
env:
DISPLAY: :10

# Run the smoke tests.
#
# This task only runs if the string 'testSmoke' exists in variable `TestsToRun`.
#
# Example command line (windows pwsh):
# > npm run clean
# > npm run updateBuildNumber -- --buildNumber 0.0.0-local
# > npm run package
# > npx gulp clean:cleanExceptTests
# > npm run testSmoke
- bash: |
npm install -g vsce
npm run clean
npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID
npm run package
npx gulp clean:cleanExceptTests
npm run testSmoke
displayName: 'Run Smoke Tests'
condition: and(succeeded(), contains(variables['TestsToRun'], 'testSmoke'))
env:
DISPLAY: :10

- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: $(Build.ArtifactStagingDirectory)
artifactName: $(Agent.JobName)
Loading