Skip to content

Commit e63fb51

Browse files
authored
Merge pull request #3 from microsoft/master
Sync to upstream
2 parents 147ff15 + 90a5ce7 commit e63fb51

File tree

1,837 files changed

+228597
-158229
lines changed

Some content is hidden

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

1,837 files changed

+228597
-158229
lines changed

.devcontainer/Dockerfile

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,49 @@
55

66
FROM node:8
77

8-
# Configure apt
8+
# Avoid warnings by switching to noninteractive
99
ENV DEBIAN_FRONTEND=noninteractive
10-
RUN apt-get update \
11-
&& apt-get -y install --no-install-recommends apt-utils 2>&1
1210

13-
# Verify git and needed tools are installed
14-
RUN apt-get install -y git procps
11+
# The node image comes with a base non-root 'node' user which this Dockerfile
12+
# gives sudo access. However, for Linux, this user's GID/UID must match your local
13+
# user UID/GID to avoid permission issues with bind mounts. Update USER_UID / USER_GID
14+
# if yours is not 1000. See https://aka.ms/vscode-remote/containers/non-root-user.
15+
ARG USER_UID=1000
16+
ARG USER_GID=$USER_UID
1517

16-
# Remove outdated yarn from /opt and install via package
17-
# so it can be easily updated via apt-get upgrade yarn
18-
RUN rm -rf /opt/yarn-* \
18+
# Configure apt and install packages
19+
RUN apt-get update \
20+
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
21+
#
22+
# Verify git and needed tools are installed
23+
&& apt-get -y install git iproute2 procps \
24+
#
25+
# Remove outdated yarn from /opt and install via package
26+
# so it can be easily updated via apt-get upgrade yarn
27+
&& rm -rf /opt/yarn-* \
1928
&& rm -f /usr/local/bin/yarn \
2029
&& rm -f /usr/local/bin/yarnpkg \
2130
&& apt-get install -y curl apt-transport-https lsb-release \
2231
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2332
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2433
&& apt-get update \
25-
&& apt-get -y install --no-install-recommends yarn
26-
27-
# Install tslint and typescript
28-
RUN npm install -g tslint typescript
29-
30-
# Clean up
31-
RUN apt-get autoremove -y \
34+
&& apt-get -y install --no-install-recommends yarn \
35+
#
36+
# Install tslint and typescript globally
37+
&& npm install -g tslint typescript \
38+
#
39+
# [Optional] Update a non-root user to match UID/GID - see https://aka.ms/vscode-remote/containers/non-root-user.
40+
&& if [ "$USER_GID" != "1000" ]; then groupmod node --gid $USER_GID; fi \
41+
&& if [ "$USER_UID" != "1000" ]; then usermod --uid $USER_UID node; fi \
42+
# [Optional] Add add sudo support for non-root user
43+
&& apt-get install -y sudo \
44+
&& echo node ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/node \
45+
&& chmod 0440 /etc/sudoers.d/node \
46+
#
47+
# Clean up
48+
&& apt-get autoremove -y \
3249
&& apt-get clean -y \
3350
&& rm -rf /var/lib/apt/lists/*
34-
ENV DEBIAN_FRONTEND=dialog
51+
52+
# Switch back to dialog for any ad-hoc use of apt-get
53+
ENV DEBIAN_FRONTEND=

.devcontainer/devcontainer.json

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
1-
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
1+
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or the definition README at
2+
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node-8
23
{
3-
"name": "Node.js 8 & TypeScript",
4-
"dockerFile": "Dockerfile",
5-
"extensions": [
6-
"ms-vscode.vscode-typescript-tslint-plugin"
7-
]
8-
}
4+
"name": "Node.js 8 & TypeScript",
5+
"dockerFile": "Dockerfile",
6+
7+
// Use 'settings' to set *default* container specific settings.json values on container create.
8+
// You can edit these settings after create using File > Preferences > Settings > Remote.
9+
"settings": {
10+
"terminal.integrated.shell.linux": "/bin/bash"
11+
},
12+
13+
// Uncomment the next line if you want to publish any ports.
14+
// "appPort": [],
15+
16+
// Uncomment the next line to run commands after the container is created.
17+
// "postCreateCommand": "yarn install",
18+
19+
// Uncomment the next line to use a non-root user. On Linux, this will prevent
20+
// new files getting created as root, but you may need to update the USER_UID
21+
// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
22+
// "runArgs": [ "-u", "node" ],
23+
24+
// Add the IDs of extensions you want installed when the container is created in the array below.
25+
"extensions": ["ms-vscode.vscode-typescript-tslint-plugin"]
26+
}

.env

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
"no-cond-assign": 0,
1010
"no-unused-vars": 1,
1111
"no-extra-semi": "warn",
12-
"semi": "warn"
12+
"semi": "warn",
13+
"prettier/prettier": "error"
1314
},
14-
"extends": "eslint:recommended"
15+
"extends": ["eslint:recommended", "prettier"],
16+
"plugins": ["prettier"]
1517
}

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
package.json text eol=lf
22
package-lock.json text eol=lf
3+
requirements.txt text eol=lf

.github/ISSUE_TEMPLATE/1_ds_bug_report.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Bug report for Notebook Editor, Interactive Window, Python Editor cells
33
about: Create a report to help us improve
44
labels: type-bug, data science
55
---
6+
67
# Bug: Notebook Editor, Interactive Window, Editor cells
78

89
<!-----------------------------------------------------------------------------------------------
@@ -13,6 +14,7 @@ bug template instead of this one. ***Thank you!***
1314
------------------------------------------------------------------------------------------------->
1415

1516
## Steps to cause the bug to occur
17+
1618
1.
1719

1820
## Actual behavior
@@ -25,22 +27,23 @@ https://github.com/phw/peek or https://www.screentogif.com/ to create one.
2527
------------------------------------------------------------------------------------------------->
2628

2729
### Your Jupyter and/or Python environment
28-
*Please provide as much info as you readily know*
29-
- **Jupyter server running:** Local | Remote | N/A
30-
- **Extension version:** 20YY.MM.#####-xxx
31-
- **VS Code version:** #.##
32-
- **Setting python.jediEnabled:** true | false
33-
- **Python and/or Anaconda version:** #.#.#
34-
- **OS:** Windows | Mac | Linux (distro):
35-
- **Virtual environment:** conda | venv | virtualenv | N/A | ...
30+
31+
_Please provide as much info as you readily know_
32+
33+
- **Jupyter server running:** Local | Remote | N/A
34+
- **Extension version:** 20YY.MM.#####-xxx
35+
- **VS Code version:** #.##
36+
- **Setting python.jediEnabled:** true | false
37+
- **Python and/or Anaconda version:** #.#.#
38+
- **OS:** Windows | Mac | Linux (distro):
39+
- **Virtual environment:** conda | venv | virtualenv | N/A | ...
3640

3741
## Developer Tools Console Output
42+
3843
<!-----------------------------------------------------------------------------------------------
3944
Copy/paste the output in the "Console" tab in the "Developer Tools" panel (Help >
4045
Toggle Developer Tools). For better details, run the "Enable source map support for
4146
extension debugging" command in VS Code at least once beforehand.
4247
------------------------------------------------------------------------------------------------->
43-
Microsoft Data Science for VS Code Engineering Team: @rchiodo, @IanMatthewHuff, @DavidKutu, @DonJayamanne, @greazer
44-
45-
4648

49+
Microsoft Data Science for VS Code Engineering Team: @rchiodo, @IanMatthewHuff, @DavidKutu, @DonJayamanne, @greazer

.github/ISSUE_TEMPLATE/2_bug_report.md

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ labels: classify, type-bug
88

99
## Environment data
1010

11-
- VS Code version: XXX
12-
- Extension version (available under the Extensions sidebar): XXX
13-
- OS and version: XXX
14-
- Python version (& distribution if applicable, e.g. Anaconda): XXX
15-
- Type of virtual environment used (N/A | venv | virtualenv | conda | ...): XXX
16-
- Relevant/affected Python packages and their versions: XXX
17-
- Jedi or Language Server? (i.e. what is `"python.jediEnabled"` set to; more info #3977): XXX
11+
- VS Code version: XXX
12+
- Extension version (available under the Extensions sidebar): XXX
13+
- OS and version: XXX
14+
- Python version (& distribution if applicable, e.g. Anaconda): XXX
15+
- Type of virtual environment used (N/A | venv | virtualenv | conda | ...): XXX
16+
- Relevant/affected Python packages and their versions: XXX
17+
- Relevant/affected Python-related VS Code extensions and their versions: XXX
18+
- Jedi or Language Server? (i.e. what is `"python.jediEnabled"` set to; more info #3977): XXX
19+
- Value of the `python.languageServer` setting: XXX
1820

1921
## Expected behaviour
2022

@@ -25,6 +27,7 @@ XXX
2527
XXX
2628

2729
## Steps to reproduce:
30+
2831
[**NOTE**: Self-contained, minimal reproducing code samples are **extremely** helpful and will expedite addressing your issue]
2932

3033
1. XXX
@@ -34,14 +37,34 @@ Note: If you think a GIF of what is happening would be helpful, consider tools l
3437
-->
3538

3639
## Logs
37-
Output for `Python` in the `Output` panel (`View``Output`, change the drop-down the upper-right of the `Output` panel to `Python`)
40+
41+
<details>
42+
43+
<summary>Output for <code>Python</code> in the <code>Output</code> panel (<code>View</code>→<code>Output</code>, change the drop-down the upper-right of the <code>Output</code> panel to <code>Python</code>)
44+
</summary>
45+
46+
<p>
3847

3948
```
4049
XXX
4150
```
4251

43-
Output from `Console` under the `Developer Tools` panel (toggle Developer Tools on under `Help`; turn on source maps to make any tracebacks be useful by running `Enable source map support for extension debugging`)
52+
</p>
53+
</details>
54+
55+
<br />
56+
57+
<details>
58+
59+
<summary>
60+
Output from <code>Console</code> under the <code>Developer Tools</code> panel (toggle Developer Tools on under <code>Help</code>; turn on source maps to make any tracebacks be useful by running <code>Enable source map support for extension debugging</code>)
61+
</summary>
62+
63+
<p>
4464

4565
```
46-
XXX
66+
XXXX
4767
```
68+
69+
</p>
70+
</details>

.github/ISSUE_TEMPLATE/3_ds_feature_request.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Feature request for Notebook Editor, Interactive Window, Editor cells
33
about: Suggest an idea for this project
44
labels: type-enhancement, data science
55
---
6+
67
# Feature: Notebook Editor, Interactive Window, Python Editor cells
78

89
<!-----------------------------------------------------------------------------------------------
@@ -14,7 +15,4 @@ request template instead of this one. ***Thank you!***
1415

1516
## Description
1617

17-
1818
Microsoft Data Science for VS Code Engineering Team: @rchiodo, @IanMatthewHuff, @DavidKutu, @DonJayamanne, @greazer
19-
20-

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blank_issues_enabled: true
1+
blank_issues_enabled: false
22
contact_links:
33
- name: Stack Overflow
44
url: https://stackoverflow.com/questions/tagged/visual-studio-code+python

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ For #
44
If an item below does not apply to you, then go ahead and check it off as "done" and strikethrough the text, e.g.:
55
- [x] ~Has unit tests & system/integration tests~
66
-->
7-
- [ ] Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR)
8-
- [ ] Title summarizes what is changing
9-
- [ ] Has a [news entry](https://github.com/Microsoft/vscode-python/tree/master/news) file (remember to thank yourself!)
10-
- [ ] Appropriate comments and documentation strings in the code
11-
- [ ] Has sufficient logging.
12-
- [ ] Has telemetry for enhancements.
13-
- [ ] Unit tests & system/integration tests are added/updated
14-
- [ ] [Test plan](https://github.com/Microsoft/vscode-python/blob/master/.github/test_plan.md) is updated as appropriate
15-
- [ ] [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package-lock.json) has been regenerated by running `npm install` (if dependencies have changed)
16-
- [ ] The wiki is updated with any design decisions/details.
7+
8+
- [ ] Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
9+
- [ ] Title summarizes what is changing.
10+
- [ ] Has a [news entry](https://github.com/Microsoft/vscode-python/tree/master/news) file (remember to thank yourself!).
11+
- [ ] Appropriate comments and documentation strings in the code.
12+
- [ ] Has sufficient logging.
13+
- [ ] Has telemetry for enhancements.
14+
- [ ] Unit tests & system/integration tests are added/updated.
15+
- [ ] [Test plan](https://github.com/Microsoft/vscode-python/blob/master/.github/test_plan.md) is updated as appropriate.
16+
- [ ] [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package-lock.json) has been regenerated by running `npm install` (if dependencies have changed).
17+
- [ ] The wiki is updated with any design decisions/details.

0 commit comments

Comments
 (0)