Skip to content

Commit

Permalink
Merge pull request #1933 from twangboy/update_python
Browse files Browse the repository at this point in the history 
Update python to version 3.10.4, add missing versions
  • Loading branch information
@twangboy
twangboy authored Apr 1, 2022
2 parents bdd347d + 9332075 commit 7bfa485
Show file tree
Hide file tree
Showing 3 changed files with 123 additions and 62 deletions.
3 changes: 3 additions & 0 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@ repos:
- gitpython
- pycurl
- python-magic
# Pin jinja until we have a release of salt
# that handles the new jinja
- jinja2<3.1.0
- salt
- tabulate
93 changes: 61 additions & 32 deletions python3_x64.sls
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,66 @@
{% set EXE_VERSIONS = [('3.9.4', '3.9.4150.0'),
('3.9.3', '3.9.3150.0'),
('3.9.2', '3.9.2150.0'),
('3.9.1', '3.9.1150.0'),
('3.9.0', '3.9.150.0'),
('3.8.9', '3.8.9150.0'),
('3.8.8', '3.8.8150.0'),
('3.8.7', '3.8.7150.0'),
('3.8.6', '3.8.6150.0'),
('3.8.5', '3.8.5150.0'),
('3.8.4', '3.8.4150.0'),
('3.8.3', '3.8.3150.0'),
('3.8.2', '3.8.2150.0'),
('3.8.1', '3.8.1150.0'),
('3.8.0', '3.8.150.0'),
('3.7.4', '3.7.4150.0'),
('3.7.3', '3.7.3150.0'),
('3.7.2', '3.7.2150.0'),
('3.7.1', '3.7.1150.0'),
('3.7.0', '3.7.150.0'),
('3.6.8', '3.6.8150.0'),
('3.6.6', '3.6.6150.0'),
('3.5.4', '3.5.4150.0'),
('3.5.2', '3.5.2150.0'),
('3.5.1', '3.5.1150.0')] %}
{% set MSI_VERSIONS = [('3.4.4', '3.4.16789'),
('3.4.3', '3.4.3150'),
('3.4.2', '3.4.2150'),
('3.4.1', '3.4.1150'),
('3.3.3', '3.3.3150')] %}
{% set EXE_VERSIONS = [
('3.10.4', '3.10.4150.0'),
('3.10.3', '3.10.3150.0'),
('3.10.2', '3.10.2150.0'),
('3.10.1', '3.10.1150.0'),
('3.9.12', '3.9.12150.0'),
('3.9.11', '3.9.11150.0'),
('3.9.10', '3.9.10150.0'),
('3.9.9', '3.9.9150.0'),
('3.9.8', '3.9.8150.0'),
('3.9.7', '3.9.7150.0'),
('3.9.6', '3.9.6150.0'),
('3.9.5', '3.9.5150.0'),
('3.9.4', '3.9.4150.0'),
('3.9.3', '3.9.3150.0'),
('3.9.2', '3.9.2150.0'),
('3.9.1', '3.9.1150.0'),
('3.9.0', '3.9.150.0'),
('3.8.10', '3.8.10150.0'),
('3.8.9', '3.8.9150.0'),
('3.8.8', '3.8.8150.0'),
('3.8.7', '3.8.7150.0'),
('3.8.6', '3.8.6150.0'),
('3.8.5', '3.8.5150.0'),
('3.8.4', '3.8.4150.0'),
('3.8.3', '3.8.3150.0'),
('3.8.2', '3.8.2150.0'),
('3.8.1', '3.8.1150.0'),
('3.8.0', '3.8.150.0'),
('3.7.9', '3.7.9150.0'),
('3.7.8', '3.7.8150.0'),
('3.7.7', '3.7.7150.0'),
('3.7.6', '3.7.6150.0'),
('3.7.5', '3.7.5150.0'),
('3.7.4', '3.7.4150.0'),
('3.7.3', '3.7.3150.0'),
('3.7.2', '3.7.2150.0'),
('3.7.1', '3.7.1150.0'),
('3.7.0', '3.7.150.0'),
('3.6.8', '3.6.8150.0'),
('3.6.7', '3.6.7150.0'),
('3.6.6', '3.6.6150.0'),
('3.6.5', '3.6.5150.0'),
('3.6.4', '3.6.4150.0'),
('3.6.3', '3.6.3150.0'),
('3.6.2', '3.6.2150.0'),
('3.6.1', '3.6.1150.0'),
('3.5.4', '3.5.4150.0'),
('3.5.3', '3.5.3150.0'),
('3.5.2', '3.5.2150.0'),
('3.5.1', '3.5.1150.0'),
]%}
{% set MSI_VERSIONS = [
('3.4.4', '3.4.16789'),
('3.4.3', '3.4.3150'),
('3.4.2', '3.4.2150'),
('3.4.1', '3.4.1150'),
('3.3.3', '3.3.3150'),
]%}
python3_x64:
{% for VER, RAW_VER in EXE_VERSIONS %}
'{{ RAW_VER }}':
full_name: 'Python {{ VER }} Core Interpreter (64-bit)'
full_name: 'Python {{ VER }} (64-bit)'
installer: 'https://www.python.org/ftp/python/{{ VER }}/python-{{ VER }}-amd64.exe'
install_flags: '/quiet InstallAllUsers=1'
uninstaller: 'https://www.python.org/ftp/python/{{ VER }}/python-{{ VER }}-amd64.exe'
Expand All @@ -42,7 +71,7 @@ python3_x64:
{% endfor %}
{% for VER, RAW_VER in MSI_VERSIONS %}
'{{ RAW_VER }}':
full_name: 'Python {{ VER }} Core Interpreter (64-bit)'
full_name: 'Python {{ VER }} (64-bit)'
installer: 'https://www.python.org/ftp/python/{{ VER }}/python-{{ VER }}.amd64.msi'
install_flags: '/qn ALLUSERS=1 /norestart'
uninstaller: 'https://www.python.org/ftp/python/{{ VER }}/python-{{ VER }}.amd64.msi'
Expand Down
89 changes: 59 additions & 30 deletions python3_x86.sls
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,62 @@
{% set EXE_VERSIONS = [('3.9.4', '3.9.4150.0'),
('3.9.3', '3.9.3150.0'),
('3.9.2', '3.9.2150.0'),
('3.9.1', '3.9.1150.0'),
('3.9.0', '3.9.150.0'),
('3.8.9', '3.8.9150.0'),
('3.8.8', '3.8.8150.0'),
('3.8.7', '3.8.7150.0'),
('3.8.6', '3.8.6150.0'),
('3.8.5', '3.8.5150.0'),
('3.8.4', '3.8.4150.0'),
('3.8.3', '3.8.3150.0'),
('3.8.2', '3.8.2150.0'),
('3.8.1', '3.8.1150.0'),
('3.8.0', '3.8.150.0'),
('3.7.4', '3.7.4150.0'),
('3.7.3', '3.7.3150.0'),
('3.7.2', '3.7.2150.0'),
('3.7.1', '3.7.1150.0'),
('3.7.0', '3.7.150.0'),
('3.6.8', '3.6.8150.0'),
('3.6.6', '3.6.6150.0'),
('3.5.4', '3.5.4150.0'),
('3.5.2', '3.5.2150.0'),
('3.5.1', '3.5.1150.0')] %}
{% set MSI_VERSIONS = [('3.4.4', '3.4.16789'),
('3.4.3', '3.4.3150'),
('3.4.2', '3.4.2150'),
('3.4.1', '3.4.1150'),
('3.3.3', '3.3.3150')] %}
{% set EXE_VERSIONS = [
('3.10.4', '3.10.4150.0'),
('3.10.3', '3.10.3150.0'),
('3.10.2', '3.10.2150.0'),
('3.10.1', '3.10.1150.0'),
('3.9.12', '3.9.12150.0'),
('3.9.11', '3.9.11150.0'),
('3.9.10', '3.9.10150.0'),
('3.9.9', '3.9.9150.0'),
('3.9.8', '3.9.8150.0'),
('3.9.7', '3.9.7150.0'),
('3.9.6', '3.9.6150.0'),
('3.9.5', '3.9.5150.0'),
('3.9.4', '3.9.4150.0'),
('3.9.3', '3.9.3150.0'),
('3.9.2', '3.9.2150.0'),
('3.9.1', '3.9.1150.0'),
('3.9.0', '3.9.150.0'),
('3.8.10', '3.8.10150.0'),
('3.8.9', '3.8.9150.0'),
('3.8.8', '3.8.8150.0'),
('3.8.7', '3.8.7150.0'),
('3.8.6', '3.8.6150.0'),
('3.8.5', '3.8.5150.0'),
('3.8.4', '3.8.4150.0'),
('3.8.3', '3.8.3150.0'),
('3.8.2', '3.8.2150.0'),
('3.8.1', '3.8.1150.0'),
('3.8.0', '3.8.150.0'),
('3.7.9', '3.7.9150.0'),
('3.7.8', '3.7.8150.0'),
('3.7.7', '3.7.7150.0'),
('3.7.6', '3.7.6150.0'),
('3.7.5', '3.7.5150.0'),
('3.7.4', '3.7.4150.0'),
('3.7.3', '3.7.3150.0'),
('3.7.2', '3.7.2150.0'),
('3.7.1', '3.7.1150.0'),
('3.7.0', '3.7.150.0'),
('3.6.8', '3.6.8150.0'),
('3.6.7', '3.6.7150.0'),
('3.6.6', '3.6.6150.0'),
('3.6.5', '3.6.5150.0'),
('3.6.4', '3.6.4150.0'),
('3.6.3', '3.6.3150.0'),
('3.6.2', '3.6.2150.0'),
('3.6.1', '3.6.1150.0'),
('3.5.4', '3.5.4150.0'),
('3.5.3', '3.5.3150.0'),
('3.5.2', '3.5.2150.0'),
('3.5.1', '3.5.1150.0'),
]%}
{% set MSI_VERSIONS = [
('3.4.4', '3.4.16789'),
('3.4.3', '3.4.3150'),
('3.4.2', '3.4.2150'),
('3.4.1', '3.4.1150'),
('3.3.3', '3.3.3150'),
]%}
python3_x86:
{% for VER, RAW_VER in EXE_VERSIONS %}
'{{ RAW_VER }}':
Expand Down

0 comments on commit 7bfa485

Please sign in to comment.