python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-16 11:12:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove 7.1a dependency

Browse Source
This commit is contained in:
nulano 2019-12-31 15:36:16 +01:00 committed by Andrew Murray
parent b7120d56f1
commit e0dd636e2c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test-windows.yml vendored
View File

@ -74,6 +74,8 @@ jobs:
xcopy ..\pillow-depends\*.tar.gz $env:GITHUB_WORKSPACE\winbuild\depends\ xcopy ..\pillow-depends\*.tar.gz $env:GITHUB_WORKSPACE\winbuild\depends\
xcopy /s ..\pillow-depends\test_images\* $env:GITHUB_WORKSPACE\tests\images\ xcopy /s ..\pillow-depends\test_images\* $env:GITHUB_WORKSPACE\tests\images\
cd $env:GITHUB_WORKSPACE/winbuild/ cd $env:GITHUB_WORKSPACE/winbuild/
# reg query "HKLM\Software\Microsoft\Microsoft SDKs\Windows" /s
ls 'C:\Program Files (x86)\Microsoft SDKs\Windows\'
python.exe $env:GITHUB_WORKSPACE\winbuild\build_prepare.py python.exe $env:GITHUB_WORKSPACE\winbuild\build_prepare.py
shell: pwsh shell: pwsh

12
winbuild/build_prepare.py
View File

@ -410,11 +410,11 @@ if __name__ == "__main__":
print("Found Visual Studio at: {}".format(vs2017["vs_dir"])) print("Found Visual Studio at: {}".format(vs2017["vs_dir"]))
sdk71a = find_sdk71a() # sdk71a = find_sdk71a()
if sdk71a is None: # if sdk71a is None:
raise RuntimeError("Windows SDK v7.1A not found") # raise RuntimeError("Windows SDK v7.1A not found")
#
print("Found Windows SDK 7.1A at: {}".format(sdk71a["sdk_dir"])) # print("Found Windows SDK 7.1A at: {}".format(sdk71a["sdk_dir"]))
build_dir = os.path.join(script_dir, "build", config_name, architecture) build_dir = os.path.join(script_dir, "build", config_name, architecture)
lib_dir = os.path.join(build_dir, "lib") lib_dir = os.path.join(build_dir, "lib")
@ -441,7 +441,7 @@ if __name__ == "__main__":
"cmake": "cmake.exe", "cmake": "cmake.exe",
} }
dicts = [vs2017, sdk71a, arch_prefs, python_prefs, config] dicts = [vs2017, arch_prefs, python_prefs, config]
for x in dicts: for x in dicts:
prefs.update(x) prefs.update(x)
prefs["header"] = sum((x.get("header", []) for x in dicts), header) prefs["header"] = sum((x.get("header", []) for x in dicts), header)