Skip to content

Commit

Permalink
fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
varunkumar-dev committed Dec 22, 2015
2 parents 596424b + a050a33 commit 1362361
Show file tree
Hide file tree
Showing 116 changed files with 6,417 additions and 2,376 deletions.
14 changes: 0 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@ matrix:
- FULL_DEPS=true
- CLIPBOARD=xsel
- BUILD_TYPE=conda
- python: 3.3
env:
- JOB_NAME: "33_nslow"
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- BUILD_TYPE=conda
- python: 2.7
env:
- JOB_NAME: "27_slow"
Expand Down Expand Up @@ -104,13 +97,6 @@ matrix:
- BUILD_TYPE=pydata
- PANDAS_TESTING_MODE="deprecate"
allow_failures:
- python: 3.3
env:
- JOB_NAME: "33_nslow"
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- BUILD_TYPE=conda
- python: 2.7
env:
- JOB_NAME: "27_slow"
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@
<td>Build Status</td>
<td>
<a href="https://travis-ci.org/pydata/pandas">
<img src="https://travis-ci.org/pydata/pandas.svg?branch=master" alt="build status" />
<img src="https://travis-ci.org/pydata/pandas.svg?branch=master" alt="travis build status" />
</a>
</td>
</tr>
<td></td>
<td>
<a href="https://ci.appveyor.com/project/jreback/pandas-465">
<img src="https://ci.appveyor.com/api/projects/status/iblk29s98quexwxi/branch/master?svg=true" alt="appveyor build status" />
</a>
</td>
</tr>
Expand Down
73 changes: 58 additions & 15 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# With infos from
# http://tjelvarolsson.com/blog/how-to-continuously-test-your-python-code-on-windows-using-appveyor/
# https://packaging.python.org/en/latest/appveyor/
# https://github.com/rmcgibbo/python-appveyor-conda-example

# Backslashes in quotes need to be escaped: \ -> "\\"

matrix:
fast_finish: true # immediately finish build once one of the jobs fails.

environment:
global:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
Expand All @@ -6,33 +16,66 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\run_with_env.cmd"

matrix:
- PYTHON: "C:\\Python27_32"
PYTHON_VERSION: "2.7"
PYTHON_ARCH: "32"
- PYTHON: "C:\\Python34_64"
PYTHON_VERSION: "3.4"
PYTHON_ARCH: "64"
CONDA_PY: "34"
CONDA_NPY: "110"

- PYTHON: "C:\\Python27_64"
PYTHON_VERSION: "2.7"
PYTHON_ARCH: "64"
CONDA_PY: "27"
CONDA_NPY: "110"

- PYTHON: "C:\\Python34_32"
PYTHON_VERSION: "3.4"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python34_64"
PYTHON_VERSION: "3.4"
- PYTHON: "C:\\Python35_64"
PYTHON_VERSION: "3.5"
PYTHON_ARCH: "64"
CONDA_PY: "35"
CONDA_NPY: "110"

# We always use a 64-bit machine, but can build x86 distributions
# with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
platform:
- x64

# all our python builds have to happen in tests_script...
build: false

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

install:
# this installs the appropriate Miniconda (Py2/Py3, 32/64 bit),
# as well as pip, conda-build, and the binstar CLI
- powershell .\ci\install.ps1
- SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
- echo "install"
- cd
- ls -ltr
- powershell .\\ci\\install_appveyor.ps1
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- git tag --sort v:refname

build: false
# install our build environment
- cmd: conda config --set show_channel_urls yes --set always_yes yes --set changeps1 no
- cmd: conda update -q conda
- cmd: conda config --add channels http://conda.anaconda.org/pandas
- cmd: conda config --set ssl_verify false

# this is now the downloaded conda...
- conda info -a

# build em using the local source checkout in the correct windows env
- conda install conda-build
- cmd: '%CMD_IN_ENV% conda build conda.recipe -q --no-test'

# create our env
- SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
- cmd: conda create -q -n pandas python=%PYTHON_VERSION% nose
- cmd: activate pandas
- cmd: conda install -q --file=%REQ%
- ps: conda install -q (conda build conda.recipe -q --output --no-test)

test_script:
- "%CMD_IN_ENV% %PYTHON%/python.exe setup.py build_ext --inplace"
- "%PYTHON%/Scripts/nosetests -A \"not slow and not network and not disabled\" pandas"
# tests
- cd \
- conda list pandas
- nosetests --exe -A "not slow and not network and not disabled" pandas
17 changes: 15 additions & 2 deletions asv_bench/benchmarks/plotting.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
try:
from pandas import date_range
except ImportError:

def date_range(start=None, end=None, periods=None, freq=None):
return DatetimeIndex(start, end, periods=periods, offset=freq)
from pandas.tools.plotting import andrews_curves


class plot_timeseries_period(object):
Expand All @@ -16,4 +16,17 @@ def setup(self):
self.df = DataFrame(np.random.randn(self.N, self.M), index=date_range('1/1/1975', periods=self.N))

def time_plot_timeseries_period(self):
self.df.plot()
self.df.plot()

class plot_andrews_curves(object):
goal_time = 0.6

def setup(self):
self.N = 500
self.M = 10
data_dict = {x: np.random.randn(self.N) for x in range(self.M)}
data_dict["Name"] = ["A"] * self.N
self.df = DataFrame(data_dict)

def time_plot_andrews_curves(self):
andrews_curves(self.df, "Name")
96 changes: 96 additions & 0 deletions ci/install.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
# Sample script to install Miniconda under Windows
# Authors: Olivier Grisel, Jonathan Helmus and Kyle Kastner, Robert McGibbon
# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/

$MINICONDA_URL = "http://repo.continuum.io/miniconda/"


function DownloadMiniconda ($python_version, $platform_suffix) {
$webclient = New-Object System.Net.WebClient
if ($python_version -match "3.4") {
$filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
} else {
$filename = "Miniconda-latest-Windows-" + $platform_suffix + ".exe"
}
$url = $MINICONDA_URL + $filename

$basedir = $pwd.Path + "\"
$filepath = $basedir + $filename
if (Test-Path $filename) {
Write-Host "Reusing" $filepath
return $filepath
}

# Download and retry up to 3 times in case of network transient errors.
Write-Host "Downloading" $filename "from" $url
$retry_attempts = 2
for($i=0; $i -lt $retry_attempts; $i++){
try {
$webclient.DownloadFile($url, $filepath)
break
}
Catch [Exception]{
Start-Sleep 1
}
}
if (Test-Path $filepath) {
Write-Host "File saved at" $filepath
} else {
# Retry once to get the error message if any at the last try
$webclient.DownloadFile($url, $filepath)
}
return $filepath
}


function InstallMiniconda ($python_version, $architecture, $python_home) {
Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home
if (Test-Path $python_home) {
Write-Host $python_home "already exists, skipping."
return $false
}
if ($architecture -match "32") {
$platform_suffix = "x86"
} else {
$platform_suffix = "x86_64"
}

$filepath = DownloadMiniconda $python_version $platform_suffix
Write-Host "Installing" $filepath "to" $python_home
$install_log = $python_home + ".log"
$args = "/S /D=$python_home"
Write-Host $filepath $args
Start-Process -FilePath $filepath -ArgumentList $args -Wait -Passthru
if (Test-Path $python_home) {
Write-Host "Python $python_version ($architecture) installation complete"
} else {
Write-Host "Failed to install Python in $python_home"
Get-Content -Path $install_log
Exit 1
}
}


function InstallCondaPackages ($python_home, $spec) {
$conda_path = $python_home + "\Scripts\conda.exe"
$args = "install --yes " + $spec
Write-Host ("conda " + $args)
Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru
}

function UpdateConda ($python_home) {
$conda_path = $python_home + "\Scripts\conda.exe"
Write-Host "Updating conda..."
$args = "update --yes conda"
Write-Host $conda_path $args
Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru
}


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

main
22 changes: 22 additions & 0 deletions ci/requirements-2.7-64.run
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
dateutil
pytz
numpy
xlwt
numexpr
pytables
matplotlib
openpyxl
xlrd
sqlalchemy
lxml=3.2.1
scipy
xlsxwriter
boto
bottleneck
patsy
html5lib
beautiful-soup
jinja2=2.8

#pymysql=0.6.3
#psycopg2=2.5.2
4 changes: 0 additions & 4 deletions ci/requirements-3.3.build

This file was deleted.

2 changes: 0 additions & 2 deletions ci/requirements-3.3.pip

This file was deleted.

17 changes: 0 additions & 17 deletions ci/requirements-3.3.run

This file was deleted.

17 changes: 17 additions & 0 deletions ci/requirements-3.4-64.run
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
python-dateutil
pytz
numpy
openpyxl
xlsxwriter
xlrd
xlwt
html5lib
patsy
beautiful-soup
scipy
numexpr
pytables
lxml
sqlalchemy
bottleneck
jinja2=2.8
25 changes: 25 additions & 0 deletions ci/requirements-3.5-64.run
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
python-dateutil
pytz
numpy
openpyxl
xlsxwriter
xlrd
xlwt
patsy
scipy
numexpr
pytables
html5lib
lxml
matplotlib
jinja2
blosc

# currently causing some warnings
#sqlalchemy
#pymysql
#psycopg2

# not available from conda
#beautiful-soup
#bottleneck
Loading

0 comments on commit 1362361

Please sign in to comment.