Skip to content

Commit 9b94c59

Browse files
authored
Merge pull request #99 from Alinvor/feature
[DONE]合并分支
2 parents b2d4a54 + 656c9a6 commit 9b94c59

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,11 @@ celerybeat-schedule
8484
# Environments
8585
.env
8686
.env/
87-
# dev.env
88-
# test.env
89-
# prep.env
90-
# prod.env
87+
asterisk.env/
88+
dev.env
89+
test.env
90+
prep.env
91+
prod.env
9192
*.env
9293
.venv
9394
env/

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
// "python.defaultInterpreterPath": "${workspaceFolder}/venv2/bin/python",
5151
// "python.defaultInterpreterPath": "venv2/bin/python",
5252
// "python.diagnostics.sourceMapsEnabled": true,
53-
"python.envFile": "${workspaceFolder}/.env/dev.env",
53+
"python.envFile": "${workspaceFolder}/asterisk.env/dev.env",
5454
// "python.envFile": "${workspaceFolder}/.env/test.env",
5555
// "python.envFile": "${workspaceFolder}/.env/pred.env",
5656
// "python.envFile": "${workspaceFolder}/.env/prod.env",

Temp/debug/env/interpreterInfo.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
obj = {}
1010
obj["is64Bit"] = sys.maxsize > 2**32
1111
obj["PWD"] = os.environ.get('PWD')
12-
obj["PYTHON_PROJECT_PREFIX"] = os.getenv('PYTHON_PROJECT_PREFIX', None)
13-
obj["PYTHON_PROJECT_NAME"] = os.getenv('PYTHON_PROJECT_NAME', None)
14-
obj["PYTHON_PROJECT_PATH"] = os.getenv('PYTHON_PROJECT_PATH', None)
15-
if obj["PYTHON_PROJECT_PATH"] is None:
16-
raise KeyError('the please configure PYTHON_PROJECT_PATH environment variable, otherwise it cannot run')
12+
# obj["PYTHON_PROJECT_PREFIX"] = os.getenv('PYTHON_PROJECT_PREFIX', None)
13+
# obj["PYTHON_PROJECT_NAME"] = os.getenv('PYTHON_PROJECT_NAME', None)
14+
# obj["PYTHON_PROJECT_PATH"] = os.getenv('PYTHON_PROJECT_PATH', None)
15+
# if obj["PYTHON_PROJECT_PATH"] is None:
16+
# raise KeyError('the please configure PYTHON_PROJECT_PATH environment variable, otherwise it cannot run')
1717
obj["PYTHONPATH"] = os.environ.get('PYTHONPATH')
1818
obj["PYTHONTRACEMALLOC"] = os.getenv('PYTHONTRACEMALLOC', None)
1919
obj["PYTHONUTF8"] = os.getenv('PYTHONUTF8', None)

0 commit comments

Comments
 (0)