Skip to content

TST/BLD: test 3.6 on appveyor #15088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 11 additions & 21 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ environment:

matrix:

# disable python 3.4 ATM
#- PYTHON: "C:\\Python34_64"
# PYTHON_VERSION: "3.4"
# PYTHON_ARCH: "64"
# CONDA_PY: "34"
# CONDA_NPY: "19"

- PYTHON: "C:\\Python27_64"
- CONDA_ROOT: "C:\\Miniconda3.5_64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
CONDA_PY: "36"
CONDA_NPY: "111"

- CONDA_ROOT: "C:\\Miniconda3.5_64"
PYTHON_VERSION: "2.7"
PYTHON_ARCH: "64"
CONDA_PY: "27"
CONDA_NPY: "110"

- PYTHON: "C:\\Python35_64"
- CONDA_ROOT: "C:\\Miniconda3.5_64"
PYTHON_VERSION: "3.5"
PYTHON_ARCH: "64"
CONDA_PY: "35"
Expand All @@ -45,9 +44,6 @@ platform:
# all our python builds have to happen in tests_script...
build: false

init:
- "ECHO %PYTHON_VERSION% %PYTHON%"

install:
# cancel older builds for the same PR
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
Expand All @@ -58,7 +54,7 @@ install:
# this installs the appropriate Miniconda (Py2/Py3, 32/64 bit)
# updates conda & installs: conda-build jinja2 anaconda-client
- powershell .\ci\install.ps1
- SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
- SET PATH=%CONDA_ROOT%;%CONDA_ROOT%\Scripts;%PATH%
- echo "install"
- cd
- ls -ltr
Expand All @@ -70,21 +66,13 @@ install:
# install our build environment
- cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false
- cmd: conda update -q conda

# fix conda-build version
# https://github.com/conda/conda-build/issues/1001
# disabling 3.4 as windows complains upon compiling byte
# code

- cmd: conda install conda-build=1.21.7
- cmd: conda config --set ssl_verify false

# add the pandas channel *before* defaults to have defaults take priority
- cmd: conda config --add channels conda-forge
- cmd: conda config --add channels pandas
- cmd: conda config --remove channels defaults
- cmd: conda config --add channels defaults
- cmd: conda install anaconda-client

# this is now the downloaded conda...
- cmd: conda info -a
Expand All @@ -98,6 +86,8 @@ install:
- SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
- cmd: echo "installing requirements from %REQ%"
- cmd: conda install -n pandas -q --file=%REQ%
- cmd: conda list -n pandas
- cmd: echo "installing requirements from %REQ% - done"
- ps: conda install -n pandas (conda build ci\appveyor.recipe -q --output)

test_script:
Expand Down
2 changes: 1 addition & 1 deletion ci/appveyor.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: pandas
version: 0.18.1
version: 0.20.0

build:
number: {{environ.get('APPVEYOR_BUILD_NUMBER', 0)}} # [win]
Expand Down
6 changes: 3 additions & 3 deletions ci/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ function UpdateConda ($python_home) {


function main () {
InstallMiniconda $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
UpdateConda $env:PYTHON
InstallCondaPackages $env:PYTHON "conda-build jinja2 anaconda-client"
InstallMiniconda "3.5" $env:PYTHON_ARCH $env:CONDA_ROOT
UpdateConda $env:CONDA_ROOT
InstallCondaPackages $env:CONDA_ROOT "conda-build jinja2 anaconda-client"
}

main
133 changes: 0 additions & 133 deletions ci/install_appveyor.ps1

This file was deleted.

13 changes: 13 additions & 0 deletions ci/requirements-3.6-64.run
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
python-dateutil
pytz
numpy
openpyxl
xlsxwriter
xlrd
#xlwt
scipy
feather-format
numexpr
pytables
matplotlib
blosc
2 changes: 2 additions & 0 deletions pandas/io/tests/test_excel.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ def test_read_excel_blank_with_header(self):

# GH 12292 : error when read one empty column from excel file
def test_read_one_empty_col_no_header(self):
_skip_if_no_xlwt()
df = pd.DataFrame(
[["", 1, 100],
["", 2, 200],
Expand Down Expand Up @@ -504,6 +505,7 @@ def test_read_one_empty_col_with_header(self):
tm.assert_frame_equal(actual_header_zero, expected_header_zero)

def test_set_column_names_in_parameter(self):
_skip_if_no_xlwt()
# GH 12870 : pass down column names associated with
# keyword argument names
refdf = pd.DataFrame([[1, 'foo'], [2, 'bar'],
Expand Down