Skip to content

Commit 106d45f

Browse files
committed
Merge branch 'feature/env' into develop
2 parents 335ba42 + ec802c7 commit 106d45f

37 files changed

+799
-1914
lines changed

.vscode/launch.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"program": "${workspaceFolder}/cdl/app.py",
1212
"console": "integratedTerminal",
1313
"envFile": "${workspaceFolder}/.env",
14-
"python": "${config:python.defaultInterpreterPath}",
1514
"justMyCode": false,
1615
"args": [
1716
// "--reset"
@@ -33,7 +32,6 @@
3332
"program": "${workspaceFolder}/cdl/tests/__init__.py",
3433
"console": "integratedTerminal",
3534
"envFile": "${workspaceFolder}/.env",
36-
"python": "${config:python.defaultInterpreterPath}",
3735
"justMyCode": true,
3836
"env": {
3937
// "DEBUG": "1",
@@ -47,7 +45,6 @@
4745
"program": "${file}",
4846
"console": "integratedTerminal",
4947
"envFile": "${workspaceFolder}/.env",
50-
"python": "${config:python.defaultInterpreterPath}",
5148
"justMyCode": false,
5249
"args": [
5350
// "--h5browser",
@@ -74,7 +71,6 @@
7471
"program": "${file}",
7572
"console": "integratedTerminal",
7673
"envFile": "${workspaceFolder}/.env",
77-
"python": "${config:python.defaultInterpreterPath}",
7874
"pythonArgs": [
7975
"-W error::DeprecationWarning",
8076
"-W error::RuntimeWarning",
@@ -99,7 +95,6 @@
9995
"module": "cProfile",
10096
"console": "integratedTerminal",
10197
"envFile": "${workspaceFolder}/.env",
102-
"python": "${config:python.defaultInterpreterPath}",
10398
"args": [
10499
"-o",
105100
"${file}.prof",
@@ -113,7 +108,6 @@
113108
"program": "${workspaceFolder}/cdl/tests/features/hdf5/h5browser1_unit.py",
114109
"console": "integratedTerminal",
115110
"envFile": "${workspaceFolder}/.env",
116-
"python": "${config:python.defaultInterpreterPath}",
117111
"justMyCode": true,
118112
"env": {
119113
"DEBUG": "1",

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
},
1313
"files.trimFinalNewlines": true,
1414
"files.trimTrailingWhitespace": true,
15-
"python.defaultInterpreterPath": "${env:CDL_PYTHONEXE}",
1615
"editor.formatOnSave": true,
1716
"python.analysis.autoFormatStrings": true,
1817
"python.testing.unittestEnabled": false,

0 commit comments

Comments
 (0)