Skip to content

Commit 9332075

Browse files
twangboytwangboy
committed
Update python to version 3.10.4, add missing
1 parent bdd347d commit 9332075

File tree

3 files changed

+123
-62
lines changed

3 files changed

+123
-62
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@ repos:
1919
- gitpython
2020
- pycurl
2121
- python-magic
22+
# Pin jinja until we have a release of salt
23+
# that handles the new jinja
24+
- jinja2<3.1.0
2225
- salt
2326
- tabulate

‎python3_x64.sls‎

Lines changed: 61 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,66 @@
1-
{% set EXE_VERSIONS = [('3.9.4', '3.9.4150.0'),
2-
('3.9.3', '3.9.3150.0'),
3-
('3.9.2', '3.9.2150.0'),
4-
('3.9.1', '3.9.1150.0'),
5-
('3.9.0', '3.9.150.0'),
6-
('3.8.9', '3.8.9150.0'),
7-
('3.8.8', '3.8.8150.0'),
8-
('3.8.7', '3.8.7150.0'),
9-
('3.8.6', '3.8.6150.0'),
10-
('3.8.5', '3.8.5150.0'),
11-
('3.8.4', '3.8.4150.0'),
12-
('3.8.3', '3.8.3150.0'),
13-
('3.8.2', '3.8.2150.0'),
14-
('3.8.1', '3.8.1150.0'),
15-
('3.8.0', '3.8.150.0'),
16-
('3.7.4', '3.7.4150.0'),
17-
('3.7.3', '3.7.3150.0'),
18-
('3.7.2', '3.7.2150.0'),
19-
('3.7.1', '3.7.1150.0'),
20-
('3.7.0', '3.7.150.0'),
21-
('3.6.8', '3.6.8150.0'),
22-
('3.6.6', '3.6.6150.0'),
23-
('3.5.4', '3.5.4150.0'),
24-
('3.5.2', '3.5.2150.0'),
25-
('3.5.1', '3.5.1150.0')] %}
26-
{% set MSI_VERSIONS = [('3.4.4', '3.4.16789'),
27-
('3.4.3', '3.4.3150'),
28-
('3.4.2', '3.4.2150'),
29-
('3.4.1', '3.4.1150'),
30-
('3.3.3', '3.3.3150')] %}
1+
{% set EXE_VERSIONS = [
2+
('3.10.4', '3.10.4150.0'),
3+
('3.10.3', '3.10.3150.0'),
4+
('3.10.2', '3.10.2150.0'),
5+
('3.10.1', '3.10.1150.0'),
6+
('3.9.12', '3.9.12150.0'),
7+
('3.9.11', '3.9.11150.0'),
8+
('3.9.10', '3.9.10150.0'),
9+
('3.9.9', '3.9.9150.0'),
10+
('3.9.8', '3.9.8150.0'),
11+
('3.9.7', '3.9.7150.0'),
12+
('3.9.6', '3.9.6150.0'),
13+
('3.9.5', '3.9.5150.0'),
14+
('3.9.4', '3.9.4150.0'),
15+
('3.9.3', '3.9.3150.0'),
16+
('3.9.2', '3.9.2150.0'),
17+
('3.9.1', '3.9.1150.0'),
18+
('3.9.0', '3.9.150.0'),
19+
('3.8.10', '3.8.10150.0'),
20+
('3.8.9', '3.8.9150.0'),
21+
('3.8.8', '3.8.8150.0'),
22+
('3.8.7', '3.8.7150.0'),
23+
('3.8.6', '3.8.6150.0'),
24+
('3.8.5', '3.8.5150.0'),
25+
('3.8.4', '3.8.4150.0'),
26+
('3.8.3', '3.8.3150.0'),
27+
('3.8.2', '3.8.2150.0'),
28+
('3.8.1', '3.8.1150.0'),
29+
('3.8.0', '3.8.150.0'),
30+
('3.7.9', '3.7.9150.0'),
31+
('3.7.8', '3.7.8150.0'),
32+
('3.7.7', '3.7.7150.0'),
33+
('3.7.6', '3.7.6150.0'),
34+
('3.7.5', '3.7.5150.0'),
35+
('3.7.4', '3.7.4150.0'),
36+
('3.7.3', '3.7.3150.0'),
37+
('3.7.2', '3.7.2150.0'),
38+
('3.7.1', '3.7.1150.0'),
39+
('3.7.0', '3.7.150.0'),
40+
('3.6.8', '3.6.8150.0'),
41+
('3.6.7', '3.6.7150.0'),
42+
('3.6.6', '3.6.6150.0'),
43+
('3.6.5', '3.6.5150.0'),
44+
('3.6.4', '3.6.4150.0'),
45+
('3.6.3', '3.6.3150.0'),
46+
('3.6.2', '3.6.2150.0'),
47+
('3.6.1', '3.6.1150.0'),
48+
('3.5.4', '3.5.4150.0'),
49+
('3.5.3', '3.5.3150.0'),
50+
('3.5.2', '3.5.2150.0'),
51+
('3.5.1', '3.5.1150.0'),
52+
]%}
53+
{% set MSI_VERSIONS = [
54+
('3.4.4', '3.4.16789'),
55+
('3.4.3', '3.4.3150'),
56+
('3.4.2', '3.4.2150'),
57+
('3.4.1', '3.4.1150'),
58+
('3.3.3', '3.3.3150'),
59+
]%}
3160
python3_x64:
3261
{% for VER, RAW_VER in EXE_VERSIONS %}
3362
'{{ RAW_VER }}':
34-
full_name: 'Python {{ VER }} Core Interpreter (64-bit)'
63+
full_name: 'Python {{ VER }} (64-bit)'
3564
installer: 'https://www.python.org/ftp/python/{{ VER }}/python-{{ VER }}-amd64.exe'
3665
install_flags: '/quiet InstallAllUsers=1'
3766
uninstaller: 'https://www.python.org/ftp/python/{{ VER }}/python-{{ VER }}-amd64.exe'
@@ -42,7 +71,7 @@ python3_x64:
4271
{% endfor %}
4372
{% for VER, RAW_VER in MSI_VERSIONS %}
4473
'{{ RAW_VER }}':
45-
full_name: 'Python {{ VER }} Core Interpreter (64-bit)'
74+
full_name: 'Python {{ VER }} (64-bit)'
4675
installer: 'https://www.python.org/ftp/python/{{ VER }}/python-{{ VER }}.amd64.msi'
4776
install_flags: '/qn ALLUSERS=1 /norestart'
4877
uninstaller: 'https://www.python.org/ftp/python/{{ VER }}/python-{{ VER }}.amd64.msi'

‎python3_x86.sls‎

Lines changed: 59 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,62 @@
1-
{% set EXE_VERSIONS = [('3.9.4', '3.9.4150.0'),
2-
('3.9.3', '3.9.3150.0'),
3-
('3.9.2', '3.9.2150.0'),
4-
('3.9.1', '3.9.1150.0'),
5-
('3.9.0', '3.9.150.0'),
6-
('3.8.9', '3.8.9150.0'),
7-
('3.8.8', '3.8.8150.0'),
8-
('3.8.7', '3.8.7150.0'),
9-
('3.8.6', '3.8.6150.0'),
10-
('3.8.5', '3.8.5150.0'),
11-
('3.8.4', '3.8.4150.0'),
12-
('3.8.3', '3.8.3150.0'),
13-
('3.8.2', '3.8.2150.0'),
14-
('3.8.1', '3.8.1150.0'),
15-
('3.8.0', '3.8.150.0'),
16-
('3.7.4', '3.7.4150.0'),
17-
('3.7.3', '3.7.3150.0'),
18-
('3.7.2', '3.7.2150.0'),
19-
('3.7.1', '3.7.1150.0'),
20-
('3.7.0', '3.7.150.0'),
21-
('3.6.8', '3.6.8150.0'),
22-
('3.6.6', '3.6.6150.0'),
23-
('3.5.4', '3.5.4150.0'),
24-
('3.5.2', '3.5.2150.0'),
25-
('3.5.1', '3.5.1150.0')] %}
26-
{% set MSI_VERSIONS = [('3.4.4', '3.4.16789'),
27-
('3.4.3', '3.4.3150'),
28-
('3.4.2', '3.4.2150'),
29-
('3.4.1', '3.4.1150'),
30-
('3.3.3', '3.3.3150')] %}
1+
{% set EXE_VERSIONS = [
2+
('3.10.4', '3.10.4150.0'),
3+
('3.10.3', '3.10.3150.0'),
4+
('3.10.2', '3.10.2150.0'),
5+
('3.10.1', '3.10.1150.0'),
6+
('3.9.12', '3.9.12150.0'),
7+
('3.9.11', '3.9.11150.0'),
8+
('3.9.10', '3.9.10150.0'),
9+
('3.9.9', '3.9.9150.0'),
10+
('3.9.8', '3.9.8150.0'),
11+
('3.9.7', '3.9.7150.0'),
12+
('3.9.6', '3.9.6150.0'),
13+
('3.9.5', '3.9.5150.0'),
14+
('3.9.4', '3.9.4150.0'),
15+
('3.9.3', '3.9.3150.0'),
16+
('3.9.2', '3.9.2150.0'),
17+
('3.9.1', '3.9.1150.0'),
18+
('3.9.0', '3.9.150.0'),
19+
('3.8.10', '3.8.10150.0'),
20+
('3.8.9', '3.8.9150.0'),
21+
('3.8.8', '3.8.8150.0'),
22+
('3.8.7', '3.8.7150.0'),
23+
('3.8.6', '3.8.6150.0'),
24+
('3.8.5', '3.8.5150.0'),
25+
('3.8.4', '3.8.4150.0'),
26+
('3.8.3', '3.8.3150.0'),
27+
('3.8.2', '3.8.2150.0'),
28+
('3.8.1', '3.8.1150.0'),
29+
('3.8.0', '3.8.150.0'),
30+
('3.7.9', '3.7.9150.0'),
31+
('3.7.8', '3.7.8150.0'),
32+
('3.7.7', '3.7.7150.0'),
33+
('3.7.6', '3.7.6150.0'),
34+
('3.7.5', '3.7.5150.0'),
35+
('3.7.4', '3.7.4150.0'),
36+
('3.7.3', '3.7.3150.0'),
37+
('3.7.2', '3.7.2150.0'),
38+
('3.7.1', '3.7.1150.0'),
39+
('3.7.0', '3.7.150.0'),
40+
('3.6.8', '3.6.8150.0'),
41+
('3.6.7', '3.6.7150.0'),
42+
('3.6.6', '3.6.6150.0'),
43+
('3.6.5', '3.6.5150.0'),
44+
('3.6.4', '3.6.4150.0'),
45+
('3.6.3', '3.6.3150.0'),
46+
('3.6.2', '3.6.2150.0'),
47+
('3.6.1', '3.6.1150.0'),
48+
('3.5.4', '3.5.4150.0'),
49+
('3.5.3', '3.5.3150.0'),
50+
('3.5.2', '3.5.2150.0'),
51+
('3.5.1', '3.5.1150.0'),
52+
]%}
53+
{% set MSI_VERSIONS = [
54+
('3.4.4', '3.4.16789'),
55+
('3.4.3', '3.4.3150'),
56+
('3.4.2', '3.4.2150'),
57+
('3.4.1', '3.4.1150'),
58+
('3.3.3', '3.3.3150'),
59+
]%}
3160
python3_x86:
3261
{% for VER, RAW_VER in EXE_VERSIONS %}
3362
'{{ RAW_VER }}':

0 commit comments

Comments
 (0)