Skip to content

Commit 474f226

Browse files
zewpobrammool
authored andcommitted
patch 9.0.1200: AppVeyor builds with an old Python version
Problem: AppVeyor builds with an old Python version. Solution: Switch from Python 3.8 to 3.11. (Christopher Plewright, closes #11814)
1 parent 584b853 commit 474f226

2 files changed

Lines changed: 31 additions & 1 deletion

File tree

ci/appveyor.bat

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44
setlocal ENABLEDELAYEDEXPANSION
55
cd %APPVEYOR_BUILD_FOLDER%
66

7+
:: Python3
8+
set PYTHON3_VER=311
9+
set PYTHON3_RELEASE=3.11.1
10+
set PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe
11+
set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64
12+
13+
if not exist downloads mkdir downloads
14+
15+
:: Python 3
16+
if not exist %PYTHON3_DIR% (
17+
call :downloadfile %PYTHON3_URL% downloads\python3.exe
18+
cmd /c start /wait downloads\python3.exe /quiet TargetDir=%PYTHON3_DIR% Include_pip=0 Include_tcltk=0 Include_test=0 Include_tools=0 AssociateFiles=0 Shortcuts=0 Include_doc=0 Include_launcher=0 InstallLauncherAllUsers=0
19+
)
20+
721
cd src
822

923
echo "Building MSVC 64bit console Version"
@@ -22,7 +36,7 @@ if "%FEATURE%" == "HUGE" (
2236
nmake -f Make_mvc.mak CPU=AMD64 ^
2337
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
2438
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
25-
PYTHON3_VER=38 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python38-x64 ^
39+
PYTHON3_VER=%PYTHON3_VER% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
2640
FEATURES=%FEATURE%
2741
) ELSE (
2842
nmake -f Make_mvc.mak CPU=AMD64 ^
@@ -40,3 +54,17 @@ echo "version output MSVC console"
4054
echo "version output MSVC GUI"
4155
type ver_msvc.txt || exit 1
4256
cd ..
57+
58+
goto :eof
59+
:: ----------------------------------------------------------------------
60+
61+
:downloadfile
62+
:: call :downloadfile <URL> <localfile>
63+
if not exist %2 (
64+
curl -f -L %1 -o %2
65+
)
66+
if ERRORLEVEL 1 (
67+
rem Retry once.
68+
curl -f -L %1 -o %2 || exit 1
69+
)
70+
@goto :eof

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1200,
698700
/**/
699701
1199,
700702
/**/

0 commit comments

Comments
 (0)