Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions .github/scripts/build-windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ function Initialize-VS {
# https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line
# https://docs.microsoft.com/en-us/cpp/porting/binary-compat-2015-2017

$VS_ROOT = "C:\Program Files (x86)\Microsoft Visual Studio"
$VS_ROOTS = @(
"C:\Program Files\Microsoft Visual Studio",
"C:\Program Files (x86)\Microsoft Visual Studio"
)
$VS_VERSIONS = @("2017", "2019", "2022")
$VS_EDITIONS = @("Enterprise", "Professional", "Community")
$VS_INIT_CMD_SUFFIX = "Common7\Tools\vsdevcmd.bat"
Expand All @@ -76,12 +79,14 @@ function Initialize-VS {
$VS_INIT_ARGS = "-arch=$VS_ARCH -no_logo"

$found = $false
:outer foreach ($version in $VS_VERSIONS) {
foreach ($edition in $VS_EDITIONS) {
$VS_INIT_CMD = "$VS_ROOT\$version\$edition\$VS_INIT_CMD_SUFFIX"
if (Test-Path $VS_INIT_CMD) {
$found = $true
break outer
:outer foreach ($VS_ROOT in $VS_ROOTS) {
foreach ($version in $VS_VERSIONS) {
foreach ($edition in $VS_EDITIONS) {
$VS_INIT_CMD = "$VS_ROOT\$version\$edition\$VS_INIT_CMD_SUFFIX"
if (Test-Path $VS_INIT_CMD) {
$found = $true
break outer
}
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,27 +161,27 @@ jobs:
python-version: '3.13'
numpy-version: '2.1.*'

- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.9'
numpy-version: '2.0.*'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.10'
numpy-version: '2.0.*'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.11'
numpy-version: '2.0.*'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '2.0.*'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.13'
Expand Down Expand Up @@ -391,32 +391,32 @@ jobs:
python-version: '3.13'
numpy-version: '2.1.*'

- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.9'
numpy-version: '2.0.*'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.10'
numpy-version: '2.0.*'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.11'
numpy-version: '2.0.*'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '2.0.*'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '1.26.4'
- os-image: windows-2019
- os-image: windows-2022
os-name: windows
python-arch: 'x86_64'
python-version: '3.13'
Expand Down
2 changes: 1 addition & 1 deletion rawpy/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.25.0"
__version__ = "0.25.1"