Skip to content

Commit eff4792

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents e396752 + e019766 commit eff4792

File tree

7 files changed

+619
-249
lines changed

7 files changed

+619
-249
lines changed

package.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,6 +1511,12 @@
15111511
"requirements-*.txt"
15121512
],
15131513
"configuration": "./languages/pip-requirements.json"
1514+
},
1515+
{
1516+
"id": "yaml",
1517+
"filenames": [
1518+
".condarc"
1519+
]
15141520
}
15151521
],
15161522
"grammars": [
@@ -1519,6 +1525,34 @@
15191525
"scopeName": "source.pip-requirements",
15201526
"path": "./syntaxes/pip-requirements.tmLanguage.json"
15211527
}
1528+
],
1529+
"jsonValidation": [
1530+
{
1531+
"fileMatch": ".condarc",
1532+
"url": "./schemas/condarc.json"
1533+
},
1534+
{
1535+
"fileMatch": "environment.yml",
1536+
"url": "./schemas/conda-environment.json"
1537+
},
1538+
{
1539+
"fileMatch": "meta.yaml",
1540+
"url": "./schemas/conda-meta.json"
1541+
}
1542+
],
1543+
"yamlValidation": [
1544+
{
1545+
"fileMatch": ".condarc",
1546+
"url": "./schemas/condarc.json"
1547+
},
1548+
{
1549+
"fileMatch": "environment.yml",
1550+
"url": "./schemas/conda-environment.json"
1551+
},
1552+
{
1553+
"fileMatch": "meta.yaml",
1554+
"url": "./schemas/conda-meta.json"
1555+
}
15221556
]
15231557
},
15241558
"scripts": {

python-0.7.0.vsix

-6.09 MB
Binary file not shown.

schemas/conda-environment.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"title": "conda environment file",
3+
"description": "Support for conda's enviroment.yml files (e.g. `conda env export > environment.yml`)",
4+
"id": "https://raw.githubusercontent.com/Microsoft/vscode-python/master/schemas/conda-environment.json",
5+
"$schema": "http://json-schema.org/draft-04/schema#",
6+
"definitions": {
7+
"channel": {
8+
"type": "string"
9+
},
10+
"package": {
11+
"type": "string"
12+
},
13+
"path": {
14+
"type": "string"
15+
}
16+
},
17+
"properties": {
18+
"name": {
19+
"type": "string"
20+
},
21+
"channels": {
22+
"type": "array",
23+
"items": {
24+
"$ref": "#/definitions/channel"
25+
}
26+
},
27+
"dependencies": {
28+
"type": "array",
29+
"items": {
30+
"$ref": "#/definitions/package"
31+
}
32+
},
33+
"prefix": {
34+
"$ref": "#/definitions/path"
35+
}
36+
}
37+
}

0 commit comments

Comments
 (0)