Skip to content

Commit 2dc0b7d

Browse files
authored
Merge pull request #87 from Alinvor/feature
[DONE]合并分支
2 parents dd18d60 + eb8918a commit 2dc0b7d

File tree

4 files changed

+45
-24
lines changed

4 files changed

+45
-24
lines changed

.rmcache.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ find . -type f -name '*.pyc' -delete
55

66
### THE DELETE DIRECTORY
77
## .tox/*
8-
find .tox -path "*" -delete
8+
find .tox -path "*" ! -name ".tox" -delete
99
## ./build/*
1010
find ./build -path "*" ! -name "build" -delete
1111
## ./src/com.dvsnier.*.egg-info

.rmcache.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Get-ChildItem -Path . -include *.pyc -Recurse | Remove-Item
1010

1111
### THE DELETE DIRECTORY
1212
## .tox/*
13-
Remove-Item -Path .\.tox -Recurse
13+
Remove-Item -Path .\.tox\* -Recurse
1414
## ./build/*
1515
Remove-Item -Path .\build\* -Recurse
1616
## ./src/com.dvsnier.*.egg-info

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,6 +948,12 @@ tox-quickstart
948948
```bash
949949
tox
950950

951+
tox --verbose
952+
tox --verbose --parallel all
953+
tox --verbose --parallel auto
954+
tox --verbose --parallel 4 // 4 cpu core
955+
tox --verbose --parallel 8 // 8 cpu core
956+
951957
python2 -m tox --result-json ./Temp/help/python2_tox_result_json.txt
952958
python3 -m tox --result-json ./Temp/help/python3_tox_result_json.txt
953959

Temp/bash/python_command.md

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
- [三. flake8](#三-flake8)
1111
- [四. tox](#四-tox)
1212
- [4.1. tox --version](#41-tox---version)
13-
- [4.2. tox --help](#42-tox---help)
14-
- [4.3. tox --help-ini](#43-tox---help-ini)
15-
- [4.4. tox --showconfig](#44-tox---showconfig)
16-
- [4.4. tox --result-json](#44-tox---result-json)
13+
- [4.2. tox --verbose](#42-tox---verbose)
14+
- [4.3. tox --help](#43-tox---help)
15+
- [4.4. tox --help-ini](#44-tox---help-ini)
16+
- [4.5. tox --showconfig](#45-tox---showconfig)
17+
- [4.6. tox --result-json](#46-tox---result-json)
1718

1819
> 平常工作和生活当中, 需要跨系统, 跨语言, 跨环境, 好多都需要笔录的方式记忆下来(已超出个体记忆能力), 好记性不如烂笔头, 故整理后续参考;
1920
@@ -42,13 +43,21 @@ pip3 install -e .
4243
# pip list
4344
pip2 list > ./Temp/txt/python2_pip2_list.txt
4445
pip3 list > ./Temp/txt/python3_pip3_list.txt
45-
python2 -m pip2 list > ./Temp/txt/2021_python2_pip2_list.txt
46-
python3 -m pip3 list > ./Temp/txt/2021_python3_pip3_list.txt
46+
47+
pip2 list > ./Temp/txt/2021_python2_pip2_list.txt
48+
pip3 list > ./Temp/txt/2021_python3_pip3_list.txt
49+
50+
python2 -m pip list > ./Temp/txt/2021_python2_pip2_list.txt
51+
python3 -m pip list > ./Temp/txt/2021_python3_pip3_list.txt
4752
# pip freeze
4853
pip2 freeze > ./Temp/txt/python2_pip2_freeze.txt
4954
pip3 freeze > ./Temp/txt/python3_pip3_freeze.txt
50-
python2 -m pip2 freeze > ./Temp/txt/2021_python2_pip2_freeze.txt
51-
python3 -m pip3 freeze > ./Temp/txt/2021_python3_pip3_freeze.txt
55+
56+
pip2 freeze > ./Temp/txt/2021_python2_pip2_freeze.txt
57+
pip3 freeze > ./Temp/txt/2021_python3_pip3_freeze.txt
58+
59+
python2 -m pip freeze > ./Temp/txt/2021_python2_pip2_freeze.txt
60+
python3 -m pip freeze > ./Temp/txt/2021_python3_pip3_freeze.txt
5261
```
5362

5463
### 2.3. pip install
@@ -60,15 +69,15 @@ python3 -m pip3 freeze > ./Temp/txt/2021_python3_pip3_freeze.txt
6069
pip2 install -r ./requirements.txt
6170
pip3 install -r ./requirements.txt
6271

63-
python2 -m pip2 install -r ./requirements.txt
64-
python3 -m pip3 install -r ./requirements.txt
72+
python2 -m pip install -r ./requirements.txt
73+
python3 -m pip install -r ./requirements.txt
6574

6675
# the base chain component requirements
6776
pip2 install -r ./Temp/archives/material/requirements.txt
6877
pip3 install -r ./Temp/archives/material/requirements.txt
6978

70-
python2 -m pip2 install -r ./Temp/archives/material/requirements.txt
71-
python3 -m pip3 install -r ./Temp/archives/material/requirements.txt
79+
python2 -m pip install -r ./Temp/archives/material/requirements.txt
80+
python3 -m pip install -r ./Temp/archives/material/requirements.txt
7281
```
7382

7483
#### 2.3.2. pip install xxx
@@ -95,20 +104,26 @@ flake8 --help > ./Temp/help/python3_flake8_help.txt
95104

96105
## 四. tox
97106

98-
```bash
99-
tox --verbose
107+
### 4.1. tox --version
100108

101-
python2 -m tox --verbose > ./Temp/help/python2_tox_verbose.txt
102-
python3 -m tox --verbose > ./Temp/help/python3_tox_verbose.txt
109+
```bash
110+
tox --version
103111
```
104112

105-
### 4.1. tox --version
113+
### 4.2. tox --verbose
106114

107115
```bash
108-
tox --version
116+
tox --verbose
117+
tox --verbose --parallel all
118+
tox --verbose --parallel auto
119+
tox --verbose --parallel 4 // 4 cpu core
120+
tox --verbose --parallel 8 // 8 cpu core
121+
122+
python2 -m tox --verbose > ./Temp/help/python2_tox_verbose.txt
123+
python3 -m tox --verbose > ./Temp/help/python3_tox_verbose.txt
109124
```
110125

111-
### 4.2. tox --help
126+
### 4.3. tox --help
112127

113128
```bash
114129
tox --help
@@ -117,7 +132,7 @@ python2 -m tox --help > ./Temp/help/python2_tox_help.txt
117132
python3 -m tox --help > ./Temp/help/python3_tox_help.txt
118133
```
119134

120-
### 4.3. tox --help-ini
135+
### 4.4. tox --help-ini
121136

122137
```bash
123138
tox --help-ini
@@ -126,7 +141,7 @@ python2 -m tox --help-ini > ./Temp/help/python2_tox_help_ini.txt
126141
python3 -m tox --help-ini > ./Temp/help/python3_tox_help_ini.txt
127142
```
128143

129-
### 4.4. tox --showconfig
144+
### 4.5. tox --showconfig
130145

131146
```bash
132147
tox --showconfig
@@ -135,7 +150,7 @@ python2 -m tox --showconfig > ./Temp/help/python2_tox_show_config.txt
135150
python3 -m tox --showconfig > ./Temp/help/python3_tox_show_config.txt
136151
```
137152

138-
### 4.4. tox --result-json
153+
### 4.6. tox --result-json
139154

140155
```bash
141156
tox --result-json

0 commit comments

Comments
 (0)