Skip to content

Commit 2b0bb51

Browse files
karthiknadigMikhail Arkhipovshsuman
authored
Update version and change log for bug fix release (#13537)
* Update LSP to latest to resolve problems with LS settings (#13511) * Fix path * Actually fix settings * Add news * Add test * Format * Suppress 'jediEnabled' removal * Drop survey first launch threshold * Update LSP to fix issue with settings in MPLS v1 * Add telemetry for `switch to Pylance` acceptance (#13526) * Fix path * Actually fix settings * Add news * Add test * Format * Suppress 'jediEnabled' removal * Drop survey first launch threshold * Initial * Add test * PR feedback * Rename property * Rename constant * Define property * Moar rename * casing * Update version and changelogs * Show status of Jupyter server (Connected/Disconnected) when the user hovers over the status icon (#13544) * Update change log with more cherry picks Co-authored-by: Mikhail Arkhipov <[email protected]> Co-authored-by: Shantnu Suman <[email protected]>
1 parent 8a1d32b commit 2b0bb51

File tree

12 files changed

+167
-76
lines changed

12 files changed

+167
-76
lines changed

‎CHANGELOG.md

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,69 @@
11
# Changelog
22

3+
## 2020.8.1 (20 August 2020)
4+
5+
### Fixes
6+
7+
1. Update LSP to latest to resolve problems with LS settings.
8+
([#13511](https://github.com/microsoft/vscode-python/pull/13511))
9+
1. Update debugger to address terminal input issues.
10+
1. Added tooltip to indicate status of server connection
11+
([#13543](https://github.com/Microsoft/vscode-python/issues/13543))
12+
13+
### Thanks
14+
15+
Thanks to the following projects which we fully rely on to provide some of
16+
our features:
17+
18+
- [debugpy](https://pypi.org/project/debugpy/)
19+
- [isort](https://pypi.org/project/isort/)
20+
- [jedi](https://pypi.org/project/jedi/)
21+
and [parso](https://pypi.org/project/parso/)
22+
- [Microsoft Python Language Server](https://github.com/microsoft/python-language-server)
23+
- [Pylance](https://github.com/microsoft/pylance-release)
24+
- [exuberant ctags](http://ctags.sourceforge.net/) (user-installed)
25+
- [rope](https://pypi.org/project/rope/) (user-installed)
26+
27+
Also thanks to the various projects we provide integrations with which help
28+
make this extension useful:
29+
30+
- Debugging support:
31+
[Django](https://pypi.org/project/Django/),
32+
[Flask](https://pypi.org/project/Flask/),
33+
[gevent](https://pypi.org/project/gevent/),
34+
[Jinja](https://pypi.org/project/Jinja/),
35+
[Pyramid](https://pypi.org/project/pyramid/),
36+
[PySpark](https://pypi.org/project/pyspark/),
37+
[Scrapy](https://pypi.org/project/Scrapy/),
38+
[Watson](https://pypi.org/project/Watson/)
39+
- Formatting:
40+
[autopep8](https://pypi.org/project/autopep8/),
41+
[black](https://pypi.org/project/black/),
42+
[yapf](https://pypi.org/project/yapf/)
43+
- Interpreter support:
44+
[conda](https://conda.io/),
45+
[direnv](https://direnv.net/),
46+
[pipenv](https://pypi.org/project/pipenv/),
47+
[pyenv](https://github.com/pyenv/pyenv),
48+
[venv](https://docs.python.org/3/library/venv.html#module-venv),
49+
[virtualenv](https://pypi.org/project/virtualenv/)
50+
- Linting:
51+
[bandit](https://pypi.org/project/bandit/),
52+
[flake8](https://pypi.org/project/flake8/),
53+
[mypy](https://pypi.org/project/mypy/),
54+
[prospector](https://pypi.org/project/prospector/),
55+
[pylint](https://pypi.org/project/pylint/),
56+
[pydocstyle](https://pypi.org/project/pydocstyle/),
57+
[pylama](https://pypi.org/project/pylama/)
58+
- Testing:
59+
[nose](https://pypi.org/project/nose/),
60+
[pytest](https://pypi.org/project/pytest/),
61+
[unittest](https://docs.python.org/3/library/unittest.html#module-unittest)
62+
63+
And finally thanks to the [Python](https://www.python.org/) development team and
64+
community for creating a fantastic programming language and community to be a
65+
part of!
66+
367
## 2020.8.0 (12 August 2020)
468

569
### Enhancements

‎package-lock.json

Lines changed: 20 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "python",
33
"displayName": "Python",
44
"description": "Linting, Debugging (multi-threaded, remote), Intellisense, Jupyter Notebooks, code formatting, refactoring, unit tests, snippets, and more.",
5-
"version": "2020.8.0",
5+
"version": "2020.8.1",
66
"featureFlags": {
77
"usingNewInterpreterStorage": true
88
},
@@ -3523,10 +3523,10 @@
35233523
"vscode-debugadapter": "^1.28.0",
35243524
"vscode-debugprotocol": "^1.28.0",
35253525
"vscode-extension-telemetry": "0.1.4",
3526-
"vscode-jsonrpc": "^6.0.0-next.3",
3527-
"vscode-languageclient": "^7.0.0-next.6",
3528-
"vscode-languageserver": "^7.0.0-next.4",
3529-
"vscode-languageserver-protocol": "^3.16.0-next.5",
3526+
"vscode-jsonrpc": "^6.0.0-next.4",
3527+
"vscode-languageclient": "^7.0.0-next.8",
3528+
"vscode-languageserver": "^7.0.0-next.6",
3529+
"vscode-languageserver-protocol": "^3.16.0-next.6",
35303530
"vscode-tas-client": "^0.0.864",
35313531
"vsls": "^0.3.1291",
35323532
"winreg": "^1.2.4",

‎package.nls.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@
179179
"DataScience.connectingToJupyter": "Connecting to Jupyter server",
180180
"DataScience.connectingToIPyKernel": "Connecting to IPython kernel",
181181
"DataScience.connectedToIPyKernel": "Connected.",
182+
"DataScience.connected": "Connected",
183+
"DataScience.disconnected": "Disconnected",
182184
"Experiments.inGroup": "User belongs to experiment group '{0}'",
183185
"Interpreters.RefreshingInterpreters": "Refreshing Python Interpreters",
184186
"Interpreters.entireWorkspace": "Entire workspace",

‎src/client/common/utils/localize.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,8 @@ export namespace DataScience {
11061106
'DataScience.previewNotebookOnlySupportedInVSCInsiders',
11071107
'The Preview Notebook Editor is supported only in the Insiders version of Visual Studio Code.'
11081108
);
1109+
export const connected = localize('DataScience.connected', 'Connected');
1110+
export const disconnected = localize('DataScience.disconnected', 'Disconnected');
11091111
}
11101112

11111113
export namespace StartPage {

‎src/client/languageServices/proposeLanguageServerBanner.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import {
1717
IPythonExtensionBanner
1818
} from '../common/types';
1919
import { Common, Pylance } from '../common/utils/localize';
20+
import { sendTelemetryEvent } from '../telemetry';
21+
import { EventName } from '../telemetry/constants';
2022

2123
export function getPylanceExtensionUri(appEnv: IApplicationEnvironment): string {
2224
return `${appEnv.uriScheme}:extension/${PYLANCE_EXTENSION_ID}`;
@@ -72,14 +74,19 @@ export class ProposePylanceBanner implements IPythonExtensionBanner {
7274
Pylance.remindMeLater()
7375
);
7476

77+
let userAction: string;
7578
if (response === Pylance.tryItNow()) {
7679
this.appShell.openUrl(getPylanceExtensionUri(this.appEnv));
80+
userAction = 'yes';
7781
await this.disable();
7882
} else if (response === Common.bannerLabelNo()) {
7983
await this.disable();
84+
userAction = 'no';
8085
} else {
8186
this.disabledInCurrentSession = true;
87+
userAction = 'later';
8288
}
89+
sendTelemetryEvent(EventName.LANGUAGE_SERVER_TRY_PYLANCE, undefined, { userAction });
8390
}
8491

8592
public async shouldShowBanner(): Promise<boolean> {

‎src/client/telemetry/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ export enum EventName {
9393
LANGUAGE_SERVER_READY = 'LANGUAGE_SERVER.READY',
9494
LANGUAGE_SERVER_TELEMETRY = 'LANGUAGE_SERVER.EVENT',
9595
LANGUAGE_SERVER_REQUEST = 'LANGUAGE_SERVER.REQUEST',
96+
LANGUAGE_SERVER_TRY_PYLANCE = 'LANGUAGE_SERVER.TRY_PYLANCE',
9697

9798
TERMINAL_CREATE = 'TERMINAL.CREATE',
9899
ACTIVATE_ENV_IN_CURRENT_TERMINAL = 'ACTIVATE_ENV_IN_CURRENT_TERMINAL',

‎src/client/telemetry/index.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,6 +1362,16 @@ export interface IEventNamePropertyMapping {
13621362
* Telemetry sent when the client makes a request to the Node.js server
13631363
*/
13641364
[EventName.LANGUAGE_SERVER_REQUEST]: any;
1365+
/**
1366+
* Telemetry sent on user response to 'Try Pylance' prompt.
1367+
*/
1368+
[EventName.LANGUAGE_SERVER_TRY_PYLANCE]: {
1369+
/**
1370+
* User response to the prompt.
1371+
* @type {string}
1372+
*/
1373+
userAction: string;
1374+
};
13651375
/**
13661376
* Telemetry captured for enabling reload.
13671377
*/

‎src/datascience-ui/interactive-common/jupyterInfo.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export class JupyterInfo extends React.Component<IJupyterInfoProps> {
6161
baseTheme={this.props.baseTheme}
6262
class="image-button-image kernel-status-icon"
6363
image={this.getIcon()}
64+
title={this.getStatus()}
6465
/>
6566
</div>
6667
<div className="kernel-status-divider" />
@@ -113,4 +114,10 @@ export class JupyterInfo extends React.Component<IJupyterInfoProps> {
113114
? ImageName.JupyterServerDisconnected
114115
: ImageName.JupyterServerConnected;
115116
}
117+
118+
private getStatus() {
119+
return this.props.kernel.jupyterServerStatus === ServerStatus.NotStarted
120+
? getLocString('DataScience.disconnected', 'Disconnected')
121+
: getLocString('DataScience.connected', 'Connected');
122+
}
116123
}

‎src/datascience-ui/react-common/image.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ interface IImageProps {
238238
baseTheme: string;
239239
image: ImageName;
240240
class: string;
241+
title?: string;
241242
}
242243

243244
export class Image extends React.Component<IImageProps> {
@@ -249,6 +250,6 @@ export class Image extends React.Component<IImageProps> {
249250
const key = ImageName[this.props.image].toString();
250251
const image = images.hasOwnProperty(key) ? images[key] : images.Cancel; // Default is cancel.
251252
const source = this.props.baseTheme.includes('dark') ? image.dark : image.light;
252-
return <InlineSVG className={this.props.class} src={source} />;
253+
return <InlineSVG className={this.props.class} src={source} title={this.props.title} />;
253254
}
254255
}

‎src/test/.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"python.linting.banditEnabled": false,
2525
"python.formatting.provider": "yapf",
2626
"python.linting.pylintUseMinimalCheckers": false,
27-
"python.pythonPath": "python",
2827
// Do not set this to "Microsoft", else it will result in LS being downloaded on CI
2928
// and that slows down tests significantly. We have other tests on CI for testing
3029
// downloading of LS with this setting enabled.

0 commit comments

Comments
 (0)