Skip to content

Commit eed4ec2

Browse files
Merge branch 'main' into anaconda_rework_patch_for_GHSA-94vc-p8w7-5p49
2 parents 538d548 + c492728 commit eed4ec2

File tree

3 files changed

+2
-29
lines changed

3 files changed

+2
-29
lines changed

src/anaconda/.devcontainer/devcontainer.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,7 @@
1818
"vscode": {
1919
// Set *default* container specific settings.json values on container create.
2020
"settings": {
21-
"python.defaultInterpreterPath": "/opt/conda/bin/python",
22-
"python.linting.enabled": true,
23-
"python.linting.pylintEnabled": true,
24-
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
25-
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
26-
"python.linting.flake8Path": "/opt/conda/bin/flake8",
27-
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
28-
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
29-
"python.linting.pylintPath": "/opt/conda/bin/pylint"
21+
"python.defaultInterpreterPath": "/opt/conda/bin/python"
3022
},
3123
// Add the IDs of extensions you want installed when the container is created.
3224
"extensions": [

src/miniconda/.devcontainer/devcontainer.json

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,7 @@
1717
"vscode": {
1818
// Set *default* container specific settings.json values on container create.
1919
"settings": {
20-
"python.defaultInterpreterPath": "/opt/conda/bin/python",
21-
"python.linting.enabled": true,
22-
"python.linting.pylintEnabled": true,
23-
"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
24-
"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
25-
"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
26-
"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
27-
"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
28-
"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
29-
"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
30-
"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
31-
"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
20+
"python.defaultInterpreterPath": "/opt/conda/bin/python"
3221
},
3322
// Add the IDs of extensions you want installed when the container is created.
3423
"extensions": [

src/universal/.devcontainer/devcontainer.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,6 @@
117117
"go.useLanguageServer": true,
118118
"go.gopath": "/go",
119119
"python.defaultInterpreterPath": "/home/codespace/.python/current/bin/python3",
120-
"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
121-
"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
122-
"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
123-
"python.linting.flake8Enabled": false,
124-
"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
125-
"python.linting.mypyEnabled": false,
126-
"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
127-
"python.linting.pylintEnabled": false,
128120
"jupyter.kernels.filter": [
129121
{
130122
"path": "/opt/conda/bin/python",

0 commit comments

Comments
 (0)