Skip to content

Commit 4d12c7d

Browse files
committed
Merge pull request #12 from python-hyper/windows-wheels
Windows wheels
2 parents 59487e1 + 45e07b8 commit 4d12c7d

File tree

3 files changed

+109
-199
lines changed

3 files changed

+109
-199
lines changed

appveyor.yml

Lines changed: 102 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,139 @@ clone_depth: 1
55
environment:
66
matrix:
77
- TOOLCHAIN_VERSION: 14.0
8-
RUST: 1.5.0
8+
RUST: 1.8.0
99
PYTHON: "C:\\Python35"
10-
PYTHON_VERSION: "3.5.0"
11-
PYTHON_ARCH: "32"
1210
platform: Win32
1311

1412
- TOOLCHAIN_VERSION: 14.0
1513
RUST: beta
1614
PYTHON: "C:\\Python35"
17-
PYTHON_VERSION: "3.5.0"
18-
PYTHON_ARCH: "32"
1915
platform: Win32
2016

2117
- TOOLCHAIN_VERSION: 14.0
2218
RUST: nightly
2319
PYTHON: "C:\\Python35"
24-
PYTHON_VERSION: "3.5.0"
25-
PYTHON_ARCH: "32"
2620
platform: Win32
2721

2822
- TOOLCHAIN_VERSION: 14.0
29-
RUST: 1.5.0
23+
RUST: 1.8.0
3024
PYTHON: "C:\\Python35-x64"
31-
PYTHON_VERSION: "3.5.0"
32-
PYTHON_ARCH: "64"
3325
platform: x64
3426

3527
- TOOLCHAIN_VERSION: 14.0
3628
RUST: beta
3729
PYTHON: "C:\\Python35-x64"
38-
PYTHON_VERSION: "3.5.0"
39-
PYTHON_ARCH: "64"
4030
platform: x64
4131

4232
- TOOLCHAIN_VERSION: 14.0
4333
RUST: nightly
4434
PYTHON: "C:\\Python35-x64"
45-
PYTHON_VERSION: "3.5.0"
46-
PYTHON_ARCH: "64"
35+
platform: x64
36+
37+
- TOOLCHAIN_VERSION: 14.0
38+
RUST: 1.8.0
39+
PYTHON: "C:\\Python34"
40+
platform: Win32
41+
42+
- TOOLCHAIN_VERSION: 14.0
43+
RUST: beta
44+
PYTHON: "C:\\Python34"
45+
platform: Win32
46+
47+
- TOOLCHAIN_VERSION: 14.0
48+
RUST: nightly
49+
PYTHON: "C:\\Python34"
50+
platform: Win32
51+
52+
- TOOLCHAIN_VERSION: 14.0
53+
RUST: 1.8.0
54+
PYTHON: "C:\\Python34-x64"
55+
DISTUTILS_USE_SDK: "1"
56+
platform: x64
57+
58+
- TOOLCHAIN_VERSION: 14.0
59+
RUST: beta
60+
PYTHON: "C:\\Python34-x64"
61+
DISTUTILS_USE_SDK: "1"
62+
platform: x64
63+
64+
- TOOLCHAIN_VERSION: 14.0
65+
RUST: nightly
66+
PYTHON: "C:\\Python34-x64"
67+
DISTUTILS_USE_SDK: "1"
68+
platform: x64
69+
70+
- TOOLCHAIN_VERSION: 14.0
71+
RUST: 1.8.0
72+
PYTHON: "C:\\Python33"
73+
platform: Win32
74+
75+
- TOOLCHAIN_VERSION: 14.0
76+
RUST: beta
77+
PYTHON: "C:\\Python33"
78+
platform: Win32
79+
80+
- TOOLCHAIN_VERSION: 14.0
81+
RUST: nightly
82+
PYTHON: "C:\\Python33"
83+
platform: Win32
84+
85+
- TOOLCHAIN_VERSION: 14.0
86+
RUST: 1.8.0
87+
PYTHON: "C:\\Python33-x64"
88+
DISTUTILS_USE_SDK: "1"
89+
platform: x64
90+
91+
- TOOLCHAIN_VERSION: 14.0
92+
RUST: beta
93+
PYTHON: "C:\\Python33-x64"
94+
DISTUTILS_USE_SDK: "1"
95+
platform: x64
96+
97+
- TOOLCHAIN_VERSION: 14.0
98+
RUST: nightly
99+
PYTHON: "C:\\Python33-x64"
100+
DISTUTILS_USE_SDK: "1"
101+
platform: x64
102+
103+
- TOOLCHAIN_VERSION: 14.0
104+
RUST: 1.8.0
105+
PYTHON: "C:\\Python27"
106+
platform: Win32
107+
108+
- TOOLCHAIN_VERSION: 14.0
109+
RUST: beta
110+
PYTHON: "C:\\Python27"
111+
platform: Win32
112+
113+
- TOOLCHAIN_VERSION: 14.0
114+
RUST: nightly
115+
PYTHON: "C:\\Python27"
116+
platform: Win32
117+
118+
- TOOLCHAIN_VERSION: 14.0
119+
RUST: 1.8.0
120+
PYTHON: "C:\\Python27-x64"
121+
platform: x64
122+
123+
- TOOLCHAIN_VERSION: 14.0
124+
RUST: beta
125+
PYTHON: "C:\\Python27-x64"
126+
platform: x64
127+
128+
- TOOLCHAIN_VERSION: 14.0
129+
RUST: nightly
130+
PYTHON: "C:\\Python27-x64"
47131
platform: x64
48132

49133
matrix:
50134
allow_failures:
51135
- RUST: nightly
52136

53137
install:
54-
# Install Python (from the official .msi of http://python.org) and pip when
55-
# not already installed.
56-
- "powershell ./appveyor/install.ps1"
57138
- "git submodule update --init --recursive"
58139

59-
build_script: appveyor/build.bat
140+
build_script: appveyor/build.bat
141+
142+
artifacts:
143+
- path: dist\*

appveyor/build.bat

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ set VCVARSALL="C:\Program Files (x86)\Microsoft Visual Studio %TOOLCHAIN_VERSION
2424
if [%Platform%] NEQ [x64] goto win32
2525
set TARGET_ARCH=x86_64
2626
set TARGET_PROGRAM_FILES=%ProgramFiles%
27+
set WHEEL_PLAT_NAME=win_amd64
2728
call %VCVARSALL% amd64
2829
if %ERRORLEVEL% NEQ 0 exit 1
2930
goto download
@@ -33,6 +34,7 @@ echo on
3334
if [%Platform%] NEQ [Win32] exit 1
3435
set TARGET_ARCH=i686
3536
set TARGET_PROGRAM_FILES=%ProgramFiles(x86)%
37+
set WHEEL_PLAT_NAME=win32
3638
call %VCVARSALL% amd64_x86
3739
if %ERRORLEVEL% NEQ 0 exit 1
3840
goto download
@@ -61,7 +63,7 @@ cl /?
6163
rustc --version
6264
cargo --version
6365

64-
python -m pip install -U setuptools pip
66+
python -m pip install -U setuptools pip wheel
6567
if %ERRORLEVEL% NEQ 0 exit 1
6668

6769
python -m pip install -r test_requirements.txt
@@ -72,3 +74,7 @@ if %ERRORLEVEL% NEQ 0 exit 1
7274

7375
py.test test/
7476
if %ERRORLEVEL% NEQ 0 exit 1
77+
78+
REM We only need one 64-bit wheel and one 32-bit wheel for Windows.
79+
python setup.py bdist_wheel --plat-name %WHEEL_PLAT_NAME%
80+
if %ERRORLEVEL% NEQ 0 exit 1

appveyor/install.ps1

Lines changed: 0 additions & 180 deletions
This file was deleted.

0 commit comments

Comments
 (0)