Skip to content

Commit 6b99458

Browse files
karthiknadigkarthiknadig
authored
Update release version and change log for point release (#18470)
* Update release version and change log for point release * update changelog * Fix `invalid patch string` error when using conda (#18481) * Fix `invalid patch string` error when using conda * Fix tests * Update change log
1 parent cc68cd1 commit 6b99458

File tree

8 files changed

+149
-17
lines changed

8 files changed

+149
-17
lines changed

‎CHANGELOG.md

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

3+
## 2022.0.1 (8 February 2022)
4+
5+
### Fixes
6+
7+
1. Fix `invalid patch string` error when using conda.
8+
([#18455](https://github.com/Microsoft/vscode-python/issues/18455))
9+
1. Revert to old way of running debugger if conda version less than 4.9.0.
10+
([#18436](https://github.com/Microsoft/vscode-python/issues/18436))
11+
12+
### Thanks
13+
14+
Thanks to the following projects which we fully rely on to provide some of
15+
our features:
16+
17+
- [debugpy](https://pypi.org/project/debugpy/)
18+
- [isort](https://pypi.org/project/isort/)
19+
- [jedi](https://pypi.org/project/jedi/)
20+
and [parso](https://pypi.org/project/parso/)
21+
- [jedi-language-server](https://pypi.org/project/jedi-language-server/)
22+
- [Pylance](https://github.com/microsoft/pylance-release)
23+
24+
Also thanks to the various projects we provide integrations with which help
25+
make this extension useful:
26+
27+
- Debugging support:
28+
[Django](https://pypi.org/project/Django/),
29+
[Flask](https://pypi.org/project/Flask/),
30+
[gevent](https://pypi.org/project/gevent/),
31+
[Jinja](https://pypi.org/project/Jinja/),
32+
[Pyramid](https://pypi.org/project/pyramid/),
33+
[PySpark](https://pypi.org/project/pyspark/),
34+
[Scrapy](https://pypi.org/project/Scrapy/),
35+
[Watson](https://pypi.org/project/Watson/)
36+
- Formatting:
37+
[autopep8](https://pypi.org/project/autopep8/),
38+
[black](https://pypi.org/project/black/),
39+
[yapf](https://pypi.org/project/yapf/)
40+
- Interpreter support:
41+
[conda](https://conda.io/),
42+
[direnv](https://direnv.net/),
43+
[pipenv](https://pypi.org/project/pipenv/),
44+
[poetry](https://pypi.org/project/poetry/),
45+
[pyenv](https://github.com/pyenv/pyenv),
46+
[venv](https://docs.python.org/3/library/venv.html#module-venv),
47+
[virtualenv](https://pypi.org/project/virtualenv/)
48+
- Linting:
49+
[bandit](https://pypi.org/project/bandit/),
50+
[flake8](https://pypi.org/project/flake8/),
51+
[mypy](https://pypi.org/project/mypy/),
52+
[prospector](https://pypi.org/project/prospector/),
53+
[pylint](https://pypi.org/project/pylint/),
54+
[pydocstyle](https://pypi.org/project/pydocstyle/),
55+
[pylama](https://pypi.org/project/pylama/)
56+
- Testing:
57+
[pytest](https://pypi.org/project/pytest/),
58+
[unittest](https://docs.python.org/3/library/unittest.html#module-unittest)
59+
60+
And finally thanks to the [Python](https://www.python.org/) development team and
61+
community for creating a fantastic programming language and community to be a
62+
part of!
63+
364
## 2022.0.0 (3 February 2022)
465

566
### Enhancements

‎news/2 Fixes/18436.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎package-lock.json

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

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "python",
33
"displayName": "Python",
44
"description": "IntelliSense (Pylance), Linting, Debugging (multi-threaded, remote), Jupyter Notebooks, code formatting, refactoring, unit tests, and more.",
5-
"version": "2022.0.0",
5+
"version": "2022.0.1",
66
"featureFlags": {
77
"usingNewInterpreterStorage": true
88
},

‎src/client/common/process/rawProcessApis.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ function filterOutputUsingCondaRunMarkers(stdout: string) {
169169
}
170170

171171
function removeCondaRunMarkers(out: string) {
172-
out = out.replace('>>>PYTHON-EXEC-OUTPUT', '');
173-
return out.replace('<<<PYTHON-EXEC-OUTPUT', '');
172+
out = out.replace('>>>PYTHON-EXEC-OUTPUT\r\n', '').replace('>>>PYTHON-EXEC-OUTPUT\n', '');
173+
return out.replace('<<<PYTHON-EXEC-OUTPUT\r\n', '').replace('<<<PYTHON-EXEC-OUTPUT\n', '');
174174
}
175175

176176
export function execObservable(

‎src/client/pythonEnvironments/common/environmentManagers/conda.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ export class Conda {
416416
} else {
417417
args.push('-p', env.prefix);
418418
}
419-
return [this.command, 'run', ...args, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT];
419+
return [this.command, 'run', ...args, '--no-capture-output', '--live-stream', 'python', OUTPUT_MARKER_SCRIPT];
420420
}
421421

422422
/**

‎src/test/common/process/pythonEnvironment.unit.test.ts

Lines changed: 80 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,26 @@ suite('CondaEnvironment', () => {
293293

294294
expect(result).to.deep.equal({
295295
command: condaFile,
296-
args: ['run', '-n', condaInfo.name, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT, ...args],
297-
python: [condaFile, 'run', '-n', condaInfo.name, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
296+
args: [
297+
'run',
298+
'-n',
299+
condaInfo.name,
300+
'--no-capture-output',
301+
'--live-stream',
302+
'python',
303+
OUTPUT_MARKER_SCRIPT,
304+
...args,
305+
],
306+
python: [
307+
condaFile,
308+
'run',
309+
'-n',
310+
condaInfo.name,
311+
'--no-capture-output',
312+
'--live-stream',
313+
'python',
314+
OUTPUT_MARKER_SCRIPT,
315+
],
298316
pythonExecutable: pythonPath,
299317
});
300318
});
@@ -307,8 +325,26 @@ suite('CondaEnvironment', () => {
307325

308326
expect(result).to.deep.equal({
309327
command: condaFile,
310-
args: ['run', '-p', condaInfo.path, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT, ...args],
311-
python: [condaFile, 'run', '-p', condaInfo.path, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
328+
args: [
329+
'run',
330+
'-p',
331+
condaInfo.path,
332+
'--no-capture-output',
333+
'--live-stream',
334+
'python',
335+
OUTPUT_MARKER_SCRIPT,
336+
...args,
337+
],
338+
python: [
339+
condaFile,
340+
'run',
341+
'-p',
342+
condaInfo.path,
343+
'--no-capture-output',
344+
'--live-stream',
345+
'python',
346+
OUTPUT_MARKER_SCRIPT,
347+
],
312348
pythonExecutable: pythonPath,
313349
});
314350
});
@@ -317,8 +353,26 @@ suite('CondaEnvironment', () => {
317353
const condaInfo = { name: 'foo', path: 'bar' };
318354
const expected = {
319355
command: condaFile,
320-
args: ['run', '-n', condaInfo.name, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT, ...args],
321-
python: [condaFile, 'run', '-n', condaInfo.name, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
356+
args: [
357+
'run',
358+
'-n',
359+
condaInfo.name,
360+
'--no-capture-output',
361+
'--live-stream',
362+
'python',
363+
OUTPUT_MARKER_SCRIPT,
364+
...args,
365+
],
366+
python: [
367+
condaFile,
368+
'run',
369+
'-n',
370+
condaInfo.name,
371+
'--no-capture-output',
372+
'--live-stream',
373+
'python',
374+
OUTPUT_MARKER_SCRIPT,
375+
],
322376
pythonExecutable: pythonPath,
323377
};
324378
const env = await createCondaEnv(condaInfo, pythonPath, processService.object, fileSystem.object);
@@ -332,8 +386,26 @@ suite('CondaEnvironment', () => {
332386
const condaInfo = { name: '', path: 'bar' };
333387
const expected = {
334388
command: condaFile,
335-
args: ['run', '-p', condaInfo.path, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT, ...args],
336-
python: [condaFile, 'run', '-p', condaInfo.path, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
389+
args: [
390+
'run',
391+
'-p',
392+
condaInfo.path,
393+
'--no-capture-output',
394+
'--live-stream',
395+
'python',
396+
OUTPUT_MARKER_SCRIPT,
397+
...args,
398+
],
399+
python: [
400+
condaFile,
401+
'run',
402+
'-p',
403+
condaInfo.path,
404+
'--no-capture-output',
405+
'--live-stream',
406+
'python',
407+
OUTPUT_MARKER_SCRIPT,
408+
],
337409
pythonExecutable: pythonPath,
338410
};
339411
const env = await createCondaEnv(condaInfo, pythonPath, processService.object, fileSystem.object);

‎src/test/pythonEnvironments/common/environmentManagers/conda.unit.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,14 +481,14 @@ suite('Conda and its environments are located correctly', () => {
481481
expect(args).to.not.equal(undefined);
482482
assert.deepStrictEqual(
483483
args,
484-
['conda', 'run', '-n', 'envName', '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
484+
['conda', 'run', '-n', 'envName', '--no-capture-output', '--live-stream', 'python', OUTPUT_MARKER_SCRIPT],
485485
'Incorrect args for case 1',
486486
);
487487

488488
args = await conda?.getRunPythonArgs({ name: '', prefix: 'envPrefix' });
489489
assert.deepStrictEqual(
490490
args,
491-
['conda', 'run', '-p', 'envPrefix', '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
491+
['conda', 'run', '-p', 'envPrefix', '--no-capture-output', '--live-stream', 'python', OUTPUT_MARKER_SCRIPT],
492492
'Incorrect args for case 2',
493493
);
494494
});

0 commit comments

Comments
 (0)