Skip to content

Commit

Permalink
Merge pull request #27 from nedbat/master
Browse files Browse the repository at this point in the history
Python 3.5 final is available.
  • Loading branch information
ogrisel committed Sep 22, 2015
2 parents 0997119 + 09a1c86 commit 0b7f759
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ environment:
PYTHON_VERSION: "2.6.6"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python35rc4"
PYTHON_VERSION: "3.5.0rc4"
- PYTHON: "C:\\Python35"
PYTHON_VERSION: "3.5.0"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python35rc4-x64"
PYTHON_VERSION: "3.5.0rc4"
- PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5.0"
PYTHON_ARCH: "64"

# Major and minor releases (i.e x.0.0 and x.y.0) prior to 3.3.0 use
Expand Down
2 changes: 1 addition & 1 deletion appveyor/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function InstallPip ($python_home) {
$webclient = New-Object System.Net.WebClient
$webclient.DownloadFile($GET_PIP_URL, $GET_PIP_PATH)
Write-Host "Executing:" $python_path $GET_PIP_PATH
Start-Process -FilePath "$python_path" -ArgumentList "$GET_PIP_PATH" -Wait -Passthru
& $python_path $GET_PIP_PATH
} else {
Write-Host "pip already installed."
}
Expand Down
5 changes: 5 additions & 0 deletions appveyor/run_with_env.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

SET COMMAND_TO_RUN=%*
SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf

:: Extract the major and minor versions, and allow for the minor version to be
:: more than 9. This requires the version number to have two dots in it.
Expand All @@ -55,6 +56,10 @@ IF %MAJOR_PYTHON_VERSION% == 2 (
SET SET_SDK_64=Y
) ELSE (
SET SET_SDK_64=N
IF EXIST "%WIN_WDK%" (
:: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
REN "%WIN_WDK%" 0wdf
)
)
) ELSE (
ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
Expand Down

0 comments on commit 0b7f759

Please sign in to comment.