Skip to content

Commit aaa935b

Browse files
committed
appveyor fixes for py35
1 parent 76b20ef commit aaa935b

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

appveyor.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,23 @@ environment:
1010

1111
- PYTHON: "C:\\Python27"
1212
PYTHON_VERSION: "2.7"
13-
PYTHON_ARCH: "32"
1413

1514
- PYTHON: "C:\\Python27-x64"
1615
PYTHON_VERSION: "2.7"
17-
PYTHON_ARCH: "64"
16+
DISTUTILS_USE_SDK: "1"
1817

1918
- PYTHON: "C:\\Python34"
2019
PYTHON_VERSION: "3.4"
21-
PYTHON_ARCH: "32"
2220

2321
- PYTHON: "C:\\Python34-x64"
2422
PYTHON_VERSION: "3.4"
25-
PYTHON_ARCH: "64"
23+
DISTUTILS_USE_SDK: "1"
2624

2725
- PYTHON: "C:\\Python35"
2826
PYTHON_VERSION: "3.5"
29-
PYTHON_ARCH: "32"
3027

3128
- PYTHON: "C:\\Python35-x64"
3229
PYTHON_VERSION: "3.5"
33-
PYTHON_ARCH: "64"
3430

3531
install:
3632
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

build.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ IF %MAJOR_PYTHON_VERSION% == "2" (
3232
EXIT 1
3333
)
3434

35-
IF "%PYTHON_ARCH%"=="64" (
35+
IF "%DISTUTILS_USE_SDK%"=="1" (
3636
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
3737
SET DISTUTILS_USE_SDK=1
3838
SET MSSdk=1
@@ -41,7 +41,7 @@ IF "%PYTHON_ARCH%"=="64" (
4141
ECHO Executing: %COMMAND_TO_RUN%
4242
call %COMMAND_TO_RUN% || EXIT 1
4343
) ELSE (
44-
ECHO Using default MSVC build environment for 32 bit architecture
44+
ECHO Using default MSVC build environment
4545
ECHO Executing: %COMMAND_TO_RUN%
4646
call %COMMAND_TO_RUN% || EXIT 1
4747
)

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
DistutilsPlatformError
1111

1212

13+
PY2 = sys.version_info[0] == 2
14+
15+
1316
try:
1417
from Cython.Build import cythonize
1518
except ImportError:
@@ -63,7 +66,7 @@ def blosc_extension():
6366

6467
# workaround lack of support for "inline" in MSVC when building for Python
6568
# 2.7 64-bit
66-
if os.name == 'nt':
69+
if PY2 and os.name == 'nt':
6770
extra_compile_args.append('-Dinline=__inline')
6871

6972
if have_cython:

0 commit comments

Comments
 (0)