Skip to content

Commit da4edba

Browse files
committed
try simpler appveyor config
1 parent ed176cc commit da4edba

File tree

5 files changed

+42
-195
lines changed

5 files changed

+42
-195
lines changed

appveyor.yml

Lines changed: 20 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,30 @@
11
environment:
2-
global:
3-
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
4-
# /E:ON and /V:ON options are not enabled in the batch script intepreter
5-
# See: http://stackoverflow.com/a/13751649/163740
6-
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
72

83
matrix:
94

10-
# PYTHON 2.7
11-
- PYTHON: "C:\\Python27_32"
12-
PYTHON_VERSION: "2.7"
13-
PYTHON_ARCH: "32"
14-
CONDA_PY: "27"
15-
CONDA_NPY: "19"
16-
17-
- PYTHON: "C:\\Python27_64"
18-
PYTHON_VERSION: "2.7"
19-
PYTHON_ARCH: "64"
20-
CONDA_PY: "27"
21-
CONDA_NPY: "19"
22-
23-
# PYTHON 3.4
24-
- PYTHON: "C:\\Python34_32"
25-
PYTHON_VERSION: "3.4"
26-
PYTHON_ARCH: "32"
27-
CONDA_PY: "34"
28-
CONDA_NPY: "19"
29-
30-
# Commented this out because the build interacts badly with previous one
31-
# Not certain how to fix this.
32-
#- PYTHON: "C:\\Python34_64"
33-
# PYTHON_VERSION: "3.4"
34-
# PYTHON_ARCH: "64"
35-
# CONDA_PY: "34"
36-
# CONDA_NPY: "19"
5+
- PYTHON: "C:\\Python27"
6+
- PYTHON: "C:\\Python34"
7+
- PYTHON: "C:\\Python35"
8+
- PYTHON: "C:\\Python27-x64"
9+
DISTUTILS_USE_SDK: "1"
10+
- PYTHON: "C:\\Python34-x64"
11+
DISTUTILS_USE_SDK: "1"
12+
- PYTHON: "C:\\Python35-x64"
3713

3814
install:
39-
# this installs the appropriate Miniconda (Py2/Py3, 32/64 bit),
40-
# as well as pip, conda-build, and the binstar CLI
41-
- powershell .\\appveyor\\install.ps1
42-
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
43-
- git submodule update --init --recursive
15+
# We need wheel installed to build wheels
16+
- "%PYTHON%\\python.exe -m pip install wheel"
17+
- "%PYTHON%\\python.exe -m pip install -rrequirements_test.txt"
18+
- "%PYTHON%\\python.exe -m pip install -rrequirements.txt"
4419

45-
build: false
20+
build: off
4621

4722
test_script:
48-
# Build and test the package. This appears(?) to sporadically fail due to a
49-
# bug in conda-build on 32 bit python.
50-
# https://github.com/conda/conda-build/issues/152
51-
#
52-
# Note also that our setup.py script, which is called by conda-build, writes
53-
# a __conda_version__.txt file, so the version number on the binary package
54-
# is set dynamically. This unfortunately mean that conda build --output
55-
# doesn't really work.
56-
#
57-
- "%CMD_IN_ENV% conda install --yes --quiet cython numpy setuptools_scm nose"
58-
- "%CMD_IN_ENV% python -m pip install zict heapdict fasteners"
23+
- "build.cmd %PYTHON%\\python.exe setup.py build_ext --inplace"
24+
- "build.cmd %PYTHON%\\python.exe -m nose -v"
25+
26+
after_test:
27+
- "build.cmd %PYTHON%\\python.exe setup.py bdist_wheel"
5928

60-
# Build the compiled extension and run the project tests
61-
- "%CMD_IN_ENV% python setup.py build_ext --inplace"
62-
- "%CMD_IN_ENV% python -m nose -v"
29+
artifacts:
30+
- path: dist\*

appveyor/install.ps1

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

appveyor/run_with_env.cmd

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

build.cmd

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
@echo off
2+
:: To build extensions for 64 bit Python 3, we need to configure environment
3+
:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
4+
:: MS Windows SDK for Windows 7 and .NET Framework 4
5+
::
6+
:: More details at:
7+
:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
8+
9+
IF "%DISTUTILS_USE_SDK%"=="1" (
10+
ECHO Configuring environment to build with MSVC on a 64bit architecture
11+
ECHO Using Windows SDK 7.1
12+
"C:\Program Files\Microsoft SDKs\Windows\v7.1\Setup\WindowsSdkVer.exe" -q -version:v7.1
13+
CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release
14+
SET MSSdk=1
15+
REM Need the following to allow tox to see the SDK compiler
16+
SET TOX_TESTENV_PASSENV=DISTUTILS_USE_SDK MSSdk INCLUDE LIB
17+
) ELSE (
18+
ECHO Using default MSVC build environment
19+
)
20+
21+
CALL %*

requirements_test.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
setuptools
22
setuptools_scm
3+
cython
34
tox
45
nose
56
coverage

0 commit comments

Comments
 (0)