From f045cc8d3699cb313fecc040bfe6b82101799821 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 8 Sep 2020 16:54:34 -0700 Subject: [PATCH 1/3] Use 'main' branch for experiments. --- news/2 Fixes/13839.md | 1 + src/client/common/experiments/manager.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 news/2 Fixes/13839.md diff --git a/news/2 Fixes/13839.md b/news/2 Fixes/13839.md new file mode 100644 index 000000000000..a5468e4d87af --- /dev/null +++ b/news/2 Fixes/13839.md @@ -0,0 +1 @@ +Experiments.json is now read from 'main' branch. diff --git a/src/client/common/experiments/manager.ts b/src/client/common/experiments/manager.ts index 4ad4673de419..3f6ca580b5eb 100644 --- a/src/client/common/experiments/manager.ts +++ b/src/client/common/experiments/manager.ts @@ -39,7 +39,7 @@ export const downloadedExperimentStorageKey = 'DOWNLOADED_EXPERIMENTS_STORAGE_KE * as about 40% of the users never come back for the second session. */ const configFile = path.join(EXTENSION_ROOT_DIR, 'experiments.json'); -export const configUri = 'https://raw.githubusercontent.com/microsoft/vscode-python/master/experiments.json'; +export const configUri = 'https://raw.githubusercontent.com/microsoft/vscode-python/main/experiments.json'; export const EXPERIMENTS_EFFORT_TIMEOUT_MS = 2000; // The old experiments which are working fine using the `SHA512` algorithm export const oldExperimentSalts = ['ShowExtensionSurveyPrompt', 'ShowPlayIcon', 'AlwaysDisplayTestExplorer', 'LS']; From 9fa756cebd9cebcb83201f2470d5f52d75dd6869 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 8 Sep 2020 16:59:32 -0700 Subject: [PATCH 2/3] Update changelog and versions --- CHANGELOG.md | 61 +++++++++++++++++++++++++++++++++++++++++++ news/2 Fixes/13839.md | 1 - package-lock.json | 2 +- package.json | 2 +- 4 files changed, 63 insertions(+), 3 deletions(-) delete mode 100644 news/2 Fixes/13839.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 8511d0340f45..4cb745a89cbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,66 @@ # Changelog +## 2020.8.5 (10 September 2020) + +### Fixes + +1. Experiments.json is now read from 'main' branch. + ([#13839](https://github.com/Microsoft/vscode-python/issues/13839)) + +### Thanks + +Thanks to the following projects which we fully rely on to provide some of +our features: + +- [debugpy](https://pypi.org/project/debugpy/) +- [isort](https://pypi.org/project/isort/) +- [jedi](https://pypi.org/project/jedi/) + and [parso](https://pypi.org/project/parso/) +- [Microsoft Python Language Server](https://github.com/microsoft/python-language-server) +- [Pylance](https://github.com/microsoft/pylance-release) +- [exuberant ctags](http://ctags.sourceforge.net/) (user-installed) +- [rope](https://pypi.org/project/rope/) (user-installed) + +Also thanks to the various projects we provide integrations with which help +make this extension useful: + +- Debugging support: + [Django](https://pypi.org/project/Django/), + [Flask](https://pypi.org/project/Flask/), + [gevent](https://pypi.org/project/gevent/), + [Jinja](https://pypi.org/project/Jinja/), + [Pyramid](https://pypi.org/project/pyramid/), + [PySpark](https://pypi.org/project/pyspark/), + [Scrapy](https://pypi.org/project/Scrapy/), + [Watson](https://pypi.org/project/Watson/) +- Formatting: + [autopep8](https://pypi.org/project/autopep8/), + [black](https://pypi.org/project/black/), + [yapf](https://pypi.org/project/yapf/) +- Interpreter support: + [conda](https://conda.io/), + [direnv](https://direnv.net/), + [pipenv](https://pypi.org/project/pipenv/), + [pyenv](https://github.com/pyenv/pyenv), + [venv](https://docs.python.org/3/library/venv.html#module-venv), + [virtualenv](https://pypi.org/project/virtualenv/) +- Linting: + [bandit](https://pypi.org/project/bandit/), + [flake8](https://pypi.org/project/flake8/), + [mypy](https://pypi.org/project/mypy/), + [prospector](https://pypi.org/project/prospector/), + [pylint](https://pypi.org/project/pylint/), + [pydocstyle](https://pypi.org/project/pydocstyle/), + [pylama](https://pypi.org/project/pylama/) +- Testing: + [nose](https://pypi.org/project/nose/), + [pytest](https://pypi.org/project/pytest/), + [unittest](https://docs.python.org/3/library/unittest.html#module-unittest) + +And finally thanks to the [Python](https://www.python.org/) development team and +community for creating a fantastic programming language and community to be a +part of! + ## 2020.8.4 (2 September 2020) ### Enhancements diff --git a/news/2 Fixes/13839.md b/news/2 Fixes/13839.md deleted file mode 100644 index a5468e4d87af..000000000000 --- a/news/2 Fixes/13839.md +++ /dev/null @@ -1 +0,0 @@ -Experiments.json is now read from 'main' branch. diff --git a/package-lock.json b/package-lock.json index 5cdea4efbe67..5ce96c52a562 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "python", - "version": "2020.8.4", + "version": "2020.8.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 79cd9900adbc..7271aecd9b59 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "python", "displayName": "Python", "description": "Linting, Debugging (multi-threaded, remote), Intellisense, Jupyter Notebooks, code formatting, refactoring, unit tests, snippets, and more.", - "version": "2020.8.4", + "version": "2020.8.5", "featureFlags": { "usingNewInterpreterStorage": true }, From 460bd85b0fbed14400a3227bc742023add9b511b Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 8 Sep 2020 19:45:42 -0700 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cb745a89cbe..7e58e425e431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2020.8.5 (10 September 2020) +## 2020.8.5 (9 September 2020) ### Fixes