saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update to python 3.7 - Remove Py2

Browse source
This commit is contained in:
twangboy 2020-02-05 17:24:33 -07:00 • committed by Daniel Wozniak
parent f52a2f2490
commit dc4e8dc8a9
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/windows/build.bat
View file

@ -61,7 +61,7 @@ if "%Version%"=="" (
:: Define Variables
@echo %0 :: Defining Variables...
@echo ---------------------------------------------------------------------
Set "PyDir=C:\Python35"
Set "PyDir=C:\Python37"
Set "PATH=%PATH%;%PyDir%;%PyDir%\Scripts"
Set "CurDir=%~dp0"

4
pkg/windows/build_pkg.bat
View file

@ -27,9 +27,9 @@ if "%Version%"=="" (
:: Define Variables
@echo Defining Variables...
@echo ----------------------------------------------------------------------
Set "PyDir=C:\Python35"
Set "PyDir=C:\Python37"
Set "PyVerMajor=3"
Set "PyVerMinor=5"
Set "PyVerMinor=7"
:: Verify the Python Installation
If not Exist "%PyDir%\python.exe" (

4
pkg/windows/clean_env.bat
View file

@ -104,13 +104,13 @@ goto eof
echo ---------------------------------------------------------------------
:: 64 bit
if exist "%LOCALAPPDATA%\Package Cache\{8ae589dd-de2e-42cd-af56-102374115fee}" (
echo %0 :: - Python 3.7.4 64bit
echo %0 :: - 3.7.4 64bit
"%LOCALAPPDATA%\Package Cache\{8ae589dd-de2e-42cd-af56-102374115fee}\python-3.7.4-amd64.exe" /uninstall /quiet
)
:: 32 bit
if exist "%LOCALAPPDATA%\Package Cache\{b66087e3-469e-4725-8b9b-f0981244afea}" (
echo %0 :: - Python 3.7.4 32bit
echo %0 :: - 3.7.4 32bit
"%LOCALAPPDATA%\Package Cache\{b66087e3-469e-4725-8b9b-f0981244afea}\python-3.7.4" /uninstall /quiet
)
:: Python Launcher, seems to be the same for 32 and 64 bit

10
pkg/windows/modules/get-settings.psm1
View file

@ -16,9 +16,9 @@ Function Get-Settings {
$Settings = @{
"SaltRepo" = "https://repo.saltstack.com/windows/dependencies"
"SaltDir" = "C:\salt"
"PythonDir" = "C:\Python35"
"ScriptsDir" = "C:\Python35\Scripts"
"SitePkgsDir" = "C:\Python35\Lib\site-packages"
"PythonDir" = "C:\Python37"
"ScriptsDir" = "C:\Python37\Scripts"
"SitePkgsDir" = "C:\Python37\Lib\site-packages"
"DownloadDir" = "$env:Temp\DevSalt"
}
@ -50,13 +50,13 @@ Function Get-Settings {
# Filenames for 64 bit Windows
$64bitPrograms = @{
"Python" = "python-3.5.4-amd64.exe"
"Python" = "python-3.7.4-amd64.exe"
}
$ini.Add("64bitPrograms", $64bitPrograms)
# Filenames for 32 bit Windows
$32bitPrograms = @{
"Python" = "python-3.5.4.exe"
"Python" = "python-3.7.4.exe"
}
$ini.Add("32bitPrograms", $32bitPrograms)