Skip to content

Commit 07c84d5

Browse files
committed
CI: fix appveyor to use fixed versioning
since the GIT_* env variables are not available
1 parent 23fb736 commit 07c84d5

File tree

6 files changed

+22
-24
lines changed

6 files changed

+22
-24
lines changed

appveyor.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
matrix:
99
fast_finish: true # immediately finish build once one of the jobs fails.
1010

11-
# set clone depth
12-
clone_depth: 300
13-
1411
environment:
1512
global:
1613
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
@@ -23,7 +20,7 @@ environment:
2320
PYTHON_VERSION: "3.4"
2421
PYTHON_ARCH: "64"
2522
CONDA_PY: "34"
26-
CONDA_NPY: "110"
23+
CONDA_NPY: "19"
2724

2825
- PYTHON: "C:\\Python27_64"
2926
PYTHON_VERSION: "2.7"
@@ -49,36 +46,41 @@ init:
4946
- "ECHO %PYTHON_VERSION% %PYTHON%"
5047

5148
install:
52-
# this installs the appropriate Miniconda (Py2/Py3, 32/64 bit),
49+
# this installs the appropriate Miniconda (Py2/Py3, 32/64 bit)
50+
# updates conda & installs: conda-build jinja2 anaconda-client
5351
- powershell .\ci\install.ps1
5452
- SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
5553
- echo "install"
5654
- cd
5755
- ls -ltr
5856
- git tag --sort v:refname
5957

58+
# this can conflict with git
59+
- cmd: rmdir C:\cygwin /s /q
60+
6061
# install our build environment
6162
- cmd: conda config --set show_channel_urls yes --set always_yes yes --set changeps1 no
6263
- cmd: conda update -q conda
6364
- cmd: conda config --add channels http://conda.anaconda.org/pandas
6465
- cmd: conda config --set ssl_verify false
6566

6667
# this is now the downloaded conda...
67-
- conda info -a
68+
- cmd: conda info -a
6869

6970
# build em using the local source checkout in the correct windows env
70-
- conda install conda-build
71-
- cmd: '%CMD_IN_ENV% conda build ci\appveyor.recipe -q --no-test'
71+
- cmd: '%CMD_IN_ENV% conda build ci\appveyor.recipe -q'
7272

7373
# create our env
74-
- SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
7574
- cmd: conda create -q -n pandas python=%PYTHON_VERSION% nose
7675
- cmd: activate pandas
77-
- cmd: conda install -q --file=%REQ%
78-
- ps: conda install -q (conda build ci\appveyor.recipe -q --output --no-test)
76+
- SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
77+
- cmd: echo "installing requirements from %REQ%"
78+
- cmd: conda install -n pandas -q --file=%REQ%
79+
- ps: conda install -n pandas (conda build ci\appveyor.recipe -q --output)
7980

8081
test_script:
8182
# tests
8283
- cd \
83-
- conda list pandas
84-
- nosetests --exe -A "not slow and not network and not disabled" pandas
84+
- cmd: activate pandas
85+
- cmd: conda list
86+
- cmd: nosetests --exe -A "not slow and not network and not disabled" pandas

ci/appveyor.recipe/meta.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package:
22
name: pandas
3-
version: {{ environ.get('GIT_DESCRIBE_TAG','') }}
3+
version: 0.18.0
44

55
build:
6-
number: {{ environ.get('GIT_DESCRIBE_NUMBER',0) }}
7-
string: np{{ environ.get('CONDA_NPY') }}py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR','') }}
6+
number: {{environ.get('APPVEYOR_BUILD_NUMBER', 0)}} # [win]
7+
string: np{{ environ.get('CONDA_NPY') }}py{{ environ.get('CONDA_PY') }}_{{ environ.get('APPVEYOR_BUILD_NUMBER', 0) }} # [win]
88

99
source:
1010

ci/install.ps1

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ $MINICONDA_URL = "http://repo.continuum.io/miniconda/"
77

88
function DownloadMiniconda ($python_version, $platform_suffix) {
99
$webclient = New-Object System.Net.WebClient
10-
if ($python_version -match "3.4") {
11-
$filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
12-
} else {
13-
$filename = "Miniconda-latest-Windows-" + $platform_suffix + ".exe"
14-
}
10+
$filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
1511
$url = $MINICONDA_URL + $filename
1612

1713
$basedir = $pwd.Path + "\"

ci/requirements-2.7-64.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dateutil
22
pytz
3-
numpy
3+
numpy=1.10*
44
xlwt
55
numexpr
66
pytables

ci/requirements-3.4-64.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
python-dateutil
22
pytz
3-
numpy
3+
numpy=1.9*
44
openpyxl
55
xlsxwriter
66
xlrd

ci/requirements-3.5-64.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
python-dateutil
22
pytz
3-
numpy
3+
numpy=1.10*
44
openpyxl
55
xlsxwriter
66
xlrd

0 commit comments

Comments
 (0)