Skip to content

Commit

Permalink
Merge pull request h5py#2016 from takluyver/ci-azure-vs-2019
Browse files Browse the repository at this point in the history
Build HDF5 with Visual Studio 2019 on Azure CI
  • Loading branch information
aragilar authored Dec 11, 2021
2 parents 050c8fc + 39fc18e commit 5fcf193
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
variables:
HDF5_VERSION: 1.12.1
HDF5_DIR: $(HDF5_CACHE_DIR)/$(HDF5_VERSION)
HDF5_VSVERSION: "15-64"
HDF5_VSVERSION: "16-64"
CIBW_BUILD: cp3{7,8,9,10}-win_amd64
steps:
- template: ci/azure-pipelines-wheels.yml
Expand Down Expand Up @@ -179,22 +179,22 @@ jobs:
TOXENV: py37-test-deps,py37-test-deps-pre
HDF5_VERSION: 1.8.17
HDF5_DIR: $(HDF5_CACHE_DIR)/$(HDF5_VERSION)
HDF5_VSVERSION: "15-64"
HDF5_VSVERSION: "16-64"
H5PY_ENFORCE_COVERAGE: yes
# 64 bit - HDF5 1.10
py38-hdf5110:
python.version: '3.8'
TOXENV: py38-test-deps,py38-test-mindeps,py38-test-deps-pre
HDF5_VERSION: 1.10.6
HDF5_DIR: $(HDF5_CACHE_DIR)/$(HDF5_VERSION)
HDF5_VSVERSION: "15-64"
HDF5_VSVERSION: "16-64"
H5PY_ENFORCE_COVERAGE: yes
py39-hdf5110:
python.version: '3.9'
TOXENV: py39-test-deps,py39-test-mindeps,py39-test-deps-pre
HDF5_VERSION: 1.10.6
HDF5_DIR: $(HDF5_CACHE_DIR)/$(HDF5_VERSION)
HDF5_VSVERSION: "15-64"
HDF5_VSVERSION: "16-64"
H5PY_ENFORCE_COVERAGE: yes
# 64 bit - HDF5 1.12
# Fewer combinations here; test_windows_wheels also tests HDF5 1.12
Expand All @@ -203,7 +203,7 @@ jobs:
TOXENV: py38-test-deps
HDF5_VERSION: 1.12.0
HDF5_DIR: $(HDF5_CACHE_DIR)/$(HDF5_VERSION)
HDF5_VSVERSION: "15-64"
HDF5_VSVERSION: "16-64"
H5PY_ENFORCE_COVERAGE: yes
maxParallel: 4

Expand Down
2 changes: 1 addition & 1 deletion ci/get_hdf5_win.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"10-64": "Visual Studio 10 2010 Win64",
"14-64": "Visual Studio 14 2015 Win64",
"15-64": "Visual Studio 15 2017 Win64",
"16-64": "Visual Studio 16 2019 Win64",
"16-64": "Visual Studio 16 2019",
}


Expand Down

0 comments on commit 5fcf193

Please sign in to comment.