Skip to content

Commit 00ebff8

Browse files
authored
Merge pull request #92 from Alinvor/kernel
[DONE]合并分支
2 parents 34bb8b5 + 5729af7 commit 00ebff8

File tree

4 files changed

+24
-17
lines changed

4 files changed

+24
-17
lines changed
File renamed without changes.

README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ python3 -m virtualenv -p C:\Python\Python38\python3.exe venv > venv.log
164164

165165
#### 3.1.1 activate for mac
166166

167-
在控制台中输入如下命令,使得Mac 环境下的 `virtualenv` 生效:
167+
在控制台中输入如下命令,使得 Mac 环境下的 `virtualenv` 生效:
168168

169169
```bash
170170
# python2
@@ -177,7 +177,7 @@ source ./venv/bin/activate
177177

178178
#### 3.1.2 activate for windows
179179

180-
在控制台中输入如下命令,使得Windows 环境下的 `virtualenv` 生效:
180+
在控制台中输入如下命令,使得 Windows 环境下的 `virtualenv` 生效:
181181

182182
```bash
183183
# python2
@@ -364,7 +364,7 @@ Python 软件包开发工程结构,如下所示:
364364
| --- .editorconfig
365365
| --- .env
366366
| --- .gitignore
367-
| --- .rmcache.bash
367+
| --- .rmcache.sh
368368
| --- .rmcache.ps1
369369
| --- LICENSE.txt
370370
| --- MANIFEST.in
@@ -392,7 +392,6 @@ Python 软件包开发工程结构,如下所示:
392392
11. virtualenv
393393
12. wheel
394394

395-
396395
如若没有,请使用`pip` 命令安装如下软件包:
397396

398397
```bash
@@ -480,7 +479,7 @@ include requirements.txt
480479

481480
#### 5.2.3 tox.ini
482481

483-
再然后配置 `tox` 脚本自动化测试, 指定Python 虚拟环境版本, 配置信息如下:
482+
再然后配置 `tox` 脚本自动化测试, 指定 Python 虚拟环境版本, 配置信息如下:
484483

485484
```bash
486485
# tox (https://tox.readthedocs.io/) is a tool for running tests
@@ -638,9 +637,9 @@ def read_text(file_name):
638637
return content
639638

640639

641-
project = os.getenv('BASE_PROJECT_PREFIX')
640+
project = os.getenv('PYTHON_PROJECT_PATH')
642641
if project is None:
643-
raise KeyError('the please configure BASE_PROJECT_PREFIX environment variable, otherwise it cannot run')
642+
raise KeyError('the please configure PYTHON_PROJECT_PATH environment variable, otherwise it cannot run')
644643
print(project)
645644
PROJECT_DIRECTORY = 'xxx' # project directory
646645
PROJECT_README_FILE = 'README.md' # project readme file
@@ -987,7 +986,7 @@ python3 -m build --wheel
987986
#### 5.3.1 注册账号
988987
989988
1. 账户注册地址: https://pypi.org/account/register/
990-
2. 创建一个[PyPI API令牌](https://pypi.org/help/#apitoken), 以便能够安全地上传您的项目;
989+
2. 创建一个[PyPI API 令牌](https://pypi.org/help/#apitoken), 以便能够安全地上传您的项目;
991990
3. 为了避免每次上载时都必须复制和粘贴令牌,可以创建一个`$HOME/.pypirc` 文件, 参考如下:
992991
993992
```bash
@@ -1048,7 +1047,7 @@ twine upload dist/*
10481047
10491048
### 6.5 日志与清理
10501049
1051-
1. [【Clean: darwin】](./.rmcache.bash)
1050+
1. [【Clean: darwin】](./.rmcache.sh)
10521051
2. [【Clean: win】](./.rmcache.ps1)
10531052
10541053
## 七. 参考

Temp/debug/env/interpreterInfo.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@
77
import sys
88

99
obj = {}
10-
obj["BASE_PROJECT_PREFIX"] = os.getenv('BASE_PROJECT_PREFIX', None)
11-
if obj["BASE_PROJECT_PREFIX"] is None:
12-
raise KeyError('the please configure BASE_PROJECT_PREFIX environment variable, otherwise it cannot run')
1310
obj["is64Bit"] = sys.maxsize > 2**32
1411
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')
1517
obj["PYTHONPATH"] = os.environ.get('PYTHONPATH')
18+
obj["PYTHONTRACEMALLOC"] = os.getenv('PYTHONTRACEMALLOC', None)
19+
obj["PYTHONUTF8"] = os.getenv('PYTHONUTF8', None)
1620
obj["sysModules"] = {}
1721
for (k, v) in sys.modules.items():
1822
(obj["sysModules"])[str(k)] = str(v)

doc/project_help/the_global_rules.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@ pass
3737

3838
目前我们规定如下可选全局变量:
3939

40+
- `PYTHON_PROJECT_PREFIX`: 【必选项】, Python 工作区目录前缀;
41+
- `PYTHON_PROJECT_NAME`: 【必选项】, Python 项目名称;
42+
- `PYTHON_PROJECT_PATH`: 【必选项】, Python 项目路径;
4043
- `PYTHONPATH`: 【可选项】, Python 环境变量;
41-
- `BASE_PROJECT_PREFIX`: 【必选项】, 当前工作区目录前缀;
44+
- `PYTHONTRACEMALLOC`: 【可选项】, Python 追踪内存分配;
45+
- `PYTHONUTF8`: 【可选项】, Python 是否开启UTF-8 编码;
4246

4347
> 1. `工作区`: 当前程序被系统`调用并执行`的区间点;
4448
> 2. `运行区`: 当前程序被系统`执行`的区间点;
@@ -49,11 +53,11 @@ pass
4953
```bash
5054
# darwin Python
5155
# export PYTHONPATH=.
52-
export BASE_PROJECT_PREFIX="/Users/.../Python-DeMo"
56+
export PYTHON_PROJECT_PATH="/Users/.../Python-DeMo"
5357

5458
# win Python
5559
# PYTHONPATH=.
56-
BASE_PROJECT_PREFIX="D:\\...\\Python-DeMo"
60+
PYTHON_PROJECT_PATH="D:\\...\\Python-DeMo"
5761
```
5862

5963
### 4.2. VSCode PYTHONPATH
@@ -69,9 +73,9 @@ VSCode 环境变量指定的默认配置选项为:
6973
**注意**:
7074

7175
1.`${workspaceFolder}/.env` 文件中所指定 `PYTHONPATH` 请使用`绝对路径`, 因为使用相对路径目前的版本不受支持;
72-
2. 目前无需在 VSCode 中使用`.` 操作符指定当前目录, 从而被重复加入到VSCode `PYTHONPATH` 中, VSCode 默认具有当前功能(隐含默认将当前执行目录加入`PYTHONPATH` 环境变量);
76+
2. 目前无需在 VSCode 中使用`.` 操作符指定当前目录, 从而被重复加入到 VSCode `PYTHONPATH` 中, VSCode 默认具有当前功能(隐含默认将当前执行目录加入`PYTHONPATH` 环境变量);
7377
3. 加载环境变量顺序需要注意, VSCode 默认加载位置为: `["VSCode DEFAULT RULES(stdlib)", "VSCode DEFAULT INLINE RULUES WITH PYTHON PATH . AND SRC", "VSCode PYTHONPATH WITH ENV", "SYSTEM DEFAULT PYTHON PATH LIST", "virtual environment list"]`
74-
4. `.` 操作符在VSCode `PYTHONPATH` 中单独使用是起作用的, 联合使用不起作用, 是 VSCode 的一个 Bug, 同时不支持 `${workspaceFolder}` 变量替换;
78+
4. `.` 操作符在 VSCode `PYTHONPATH` 中单独使用是起作用的, 联合使用不起作用, 是 VSCode 的一个 Bug, 同时不支持 `${workspaceFolder}` 变量替换;
7579

7680
具体 `PYTHONPATH` 添加规则如下:
7781

0 commit comments

Comments
 (0)