Skip to content

AppVeyor: don't download huge pillow-depends.zip #7407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 24, 2023
Merged

AppVeyor: don't download huge pillow-depends.zip #7407

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c50b11b
Attempt download from pillow-depends mirror first
hugovk Sep 18, 2023
66bf71b
Add type hints
hugovk Sep 18, 2023
cf79e2c
Capitalise constants
hugovk Sep 18, 2023
82c3999
Don't download entire pillow-depends.zip (851 MB)
hugovk Sep 18, 2023
15b1d60
Use curl with --ssl-no-revoke
hugovk Sep 18, 2023
f4d9c44
Restrict "params" to list or None
radarhere Sep 20, 2023
1ba79d2
Re-instate for/else to avoid a raise after an error and a subsequent …
hugovk Sep 20, 2023
6e58b34
Merge pull request #104 from radarhere/ci-appveyor-depends
hugovk Sep 20, 2023
4edfe13
Merge branch 'main' into ci-appveyor-depends
radarhere Sep 20, 2023
9c754eb
Re-remove --ssl-no-revoke
hugovk Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Capitalise constants
  • Loading branch information
@hugovk
hugovk committed Sep 18, 2023
commit cf79e2c3d3f2c3ef743776707cd79ec36657d946
14 changes: 7 additions & 7 deletions winbuild/build_prepare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ def cmd_msbuild(

SF_PROJECTS = "https://sourceforge.net/projects"

architectures = {
ARCHITECTURES = {
"x86": {"vcvars_arch": "x86", "msbuild_arch": "Win32"},
"x64": {"vcvars_arch": "x86_amd64", "msbuild_arch": "x64"},
"ARM64": {"vcvars_arch": "x86_arm64", "msbuild_arch": "ARM64"},
}

# dependencies, listed in order of compilation
deps = {
DEPS = {
"libjpeg": {
"url": SF_PROJECTS
+ "/libjpeg-turbo/files/3.0.0/libjpeg-turbo-3.0.0.tar.gz/download",
Expand Down Expand Up @@ -530,7 +530,7 @@ def build_env() -> None:


def build_dep(name: str) -> str:
dep = deps[name]
dep = DEPS[name]
dir = dep["dir"]
file = f"build_dep_{name}.cmd"

Expand Down Expand Up @@ -581,7 +581,7 @@ def build_dep(name: str) -> str:

def build_dep_all() -> None:
lines = [r'call "{build_dir}\build_env.cmd"']
for dep_name in deps:
for dep_name in DEPS:
print()
if dep_name in disabled:
print(f"Skipping disabled dependency {dep_name}")
Expand Down Expand Up @@ -627,7 +627,7 @@ def build_dep_all() -> None:
)
parser.add_argument(
"--architecture",
choices=architectures,
choices=ARCHITECTURES,
default=os.environ.get(
"ARCHITECTURE",
(
Expand Down Expand Up @@ -659,7 +659,7 @@ def build_dep_all() -> None:
)
args = parser.parse_args()

arch_prefs = architectures[args.architecture]
arch_prefs = ARCHITECTURES[args.architecture]
print("Target architecture:", args.architecture)

msvs = find_msvs()
Expand Down Expand Up @@ -718,7 +718,7 @@ def build_dep_all() -> None:
# TODO find NASM automatically
}

for k, v in deps.items():
for k, v in DEPS.items():
prefs[f"dir_{k}"] = os.path.join(sources_dir, v["dir"])

print()
Expand Down