Skip to content

BUG: support fused types in roll_min/max #12373 #12481

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

Closed
wants to merge 82 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
f27beba
Bugfix for GH12373:
joshuastorck Feb 27, 2016
fcfc200
Bugfix for GH12373:
joshuastorck Feb 27, 2016
1648f8f
Post-rebase move of test_rolling_min_max_numeric_types unit test from…
joshuastorck Feb 27, 2016
ce0d440
Merge branch 'GH12373' of github.com:joshuastorck/pandas into GH12373
joshuastorck Feb 27, 2016
2396314
pyflakes fixup
joshuastorck Feb 27, 2016
bcc987c
BUG: describe() outputs bool similarly to categorical data
Feb 26, 2016
91967c8
ENH: add missing methods to .dt for Period, resolves #8848
andrew-rosenfeld-ts Feb 27, 2016
2e4da9b
ERR: Better error reporting with .transform and an invalid output
Feb 27, 2016
2d2f173
BUG: Simple operation unexpectedly changes dtype.
Feb 26, 2016
4efb5e9
TST/DOC: some test cleanups
jreback Feb 27, 2016
ef6de76
PEP fixes
jreback Feb 27, 2016
cb43b2f
COMPAT: older numpies compat on dtype upcasting, xref #10503
jreback Feb 27, 2016
41b1d25
typo
Feb 28, 2016
bc6ab05
DOC: fixed references to DataFrameGroupBy methods in comparison_with_…
mortada Mar 1, 2016
f263ef9
* Removing struct pairs from algos as it's no longer being
joshuastorck Mar 1, 2016
91b15ab
pyflakes fixup
joshuastorck Mar 1, 2016
65e7ca6
Adding documentation
joshuastorck Mar 1, 2016
170fb27
Fixing sphinx markup in documentation
joshuastorck Mar 1, 2016
1343011
DOC: extract ValueError message
tdhock Feb 29, 2016
3ab35b4
CLN: cleanup strings._wrap_result
sinhrks Mar 2, 2016
eba7803
CLN: Removed pandas.util.testing.choice
paul-reiners Mar 2, 2016
84781b4
COMPAT: blacklist numexpr=2.4.4
jreback Mar 3, 2016
9b9c7a7
BUG: Make Styler ignore None index names to match to_html behaviour
TomAugspurger Mar 3, 2016
9313089
BUG: Make dict iterators real iterators, provide "next()" in Python 2
toobaz Mar 3, 2016
c69037c
BUG: Fixed grow_buffer to grow when capacity is reached
gfyoung Mar 3, 2016
c387fd8
TST: Rework style test skip
TomAugspurger Mar 4, 2016
3928102
CI: pin libgfortran=1.0
jreback Mar 4, 2016
60b307f
ENH: optional ':' separator in ISO8601 strings
thejohnfreeman Mar 5, 2016
486fcfa
Fix typo
yuvallanger Mar 5, 2016
55f21ca
Revert "ENH: optional ':' separator in ISO8601 strings"
jreback Mar 5, 2016
3d70be7
BUG: rolling functions raise ValueError on float32 data
BranYang Feb 18, 2016
a0aaad9
TST: more comprehensive dtype testing for rolling
jreback Mar 5, 2016
547c784
ENH: Allow exponentially weighted functions to specify alpha directly
Mar 6, 2016
a174898
BUG: Allow assignment by indexing with duplicate column names
gfyoung Mar 6, 2016
820e110
ENH: Optional ':' HHMMSS separator in ISO8601 strings
thejohnfreeman Feb 27, 2016
a58ad4f
BLD: Install texlive packages in Travis CI
Mar 6, 2016
0b1e1c9
TST: Add more period tests
sinhrks Mar 7, 2016
13b7a40
Added pandas logo and separator
philipgura Mar 7, 2016
23fb736
DOC: fix doc build warnings
jreback Mar 8, 2016
07c84d5
CI: fix appveyor to use fixed versioning
jreback Mar 7, 2016
5f7e290
API: allow scalar setting/getting via float indexer on integer indexes
jreback Mar 8, 2016
14cf67f
BUG: resample fixes
jreback Mar 8, 2016
0d082c6
TST: nicer output from pd.test()
jreback Mar 9, 2016
b168377
CI: add osx to travis, xref #8630
jreback Mar 8, 2016
8bc66eb
DOC: fix doc-build warnings & cleanup
jreback Mar 9, 2016
e5ed87b
RLS: v0.18.0rc2
jreback Mar 9, 2016
b43617d
removed Panel.to_json from docs
Mar 10, 2016
19e40a0
CI: remove leading v from built versions
jreback Mar 10, 2016
fcab956
DOC: clean up some doc-build warnings
jreback Mar 9, 2016
f258844
CI/BLD: suppress cython warnings
jreback Mar 10, 2016
e9fde88
BLD: suppress useless warnings
jreback Mar 11, 2016
71b7237
Resolve ImportError in read_gbq which appears with oauthclient >= 2.0
tonypartheniou Mar 10, 2016
d14dc1b
BLD: allow different options for compiler warnings on windows
jreback Mar 11, 2016
7c7f987
Using cython ndarray creation so that the numpy array owns its data
joshuastorck Mar 11, 2016
c22f0b0
Bugfix for GH12373:
joshuastorck Feb 27, 2016
3cd5fce
Post-rebase move of test_rolling_min_max_numeric_types unit test from…
joshuastorck Feb 27, 2016
3689db4
pyflakes fixup
joshuastorck Feb 27, 2016
4e16006
* Removing struct pairs from algos as it's no longer being
joshuastorck Mar 1, 2016
068200f
pyflakes fixup
joshuastorck Mar 1, 2016
83e4df2
Adding documentation
joshuastorck Mar 1, 2016
e06f79c
Fixing sphinx markup in documentation
joshuastorck Mar 1, 2016
a08982c
Using cython ndarray creation so that the numpy array owns its data
joshuastorck Mar 11, 2016
ab3a727
Merge from fork
joshuastorck Mar 11, 2016
bb0044b
Bugfix for GH12373:
joshuastorck Feb 27, 2016
4721216
Post-rebase move of test_rolling_min_max_numeric_types unit test from…
joshuastorck Feb 27, 2016
e3f3faa
pyflakes fixup
joshuastorck Feb 27, 2016
5407403
* Removing struct pairs from algos as it's no longer being
joshuastorck Mar 1, 2016
1fb511d
pyflakes fixup
joshuastorck Mar 1, 2016
a5f5c2c
Adding documentation
joshuastorck Mar 1, 2016
da0a186
Fixing sphinx markup in documentation
joshuastorck Mar 1, 2016
972d84e
Using cython ndarray creation so that the numpy array owns its data
joshuastorck Mar 11, 2016
70f353d
Adding documentation
joshuastorck Mar 1, 2016
1e588a7
Fixing bad merge from rebase
joshuastorck Mar 11, 2016
d5e1701
Add as_float to all of the cases for the _Window._prep_values functio…
joshuastorck Mar 11, 2016
2cd6079
Merge with origin
joshuastorck Mar 11, 2016
c400eef
Adding whitespace
joshuastorck Mar 11, 2016
000652c
Removing whitespace
joshuastorck Mar 11, 2016
a6cfc78
DOC: whatsnew and doc changes
jreback Mar 11, 2016
298cbfa
DOC: add release note thanks
jreback Mar 11, 2016
8294bf2
DOC: Fixes LaTeX build error
TomAugspurger Mar 11, 2016
9c85b9d
Bugfix for GH12373:
joshuastorck Feb 27, 2016
300eea5
Merge branch 'GH12373' of github.com:joshuastorck/pandas into GH12373
joshuastorck Mar 11, 2016
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
51 changes: 26 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ git:
matrix:
fast_finish: true
include:
- python: 2.7
- language: objective-c
os: osx
compiler: clang
osx_image: xcode6.4
env:
- JOB_NAME: "27_nslow_nnet_COMPAT"
- NOSE_ARGS="not slow and not network and not disabled"
- CLIPBOARD=xclip
- LOCALE_OVERRIDE="it_IT.UTF-8"
- BUILD_TYPE=conda
- INSTALL_TEST=true
- JOB_TAG=_COMPAT
- JOB_NAME: "35_osx"
- NOSE_ARGS="not slow and not network and not disabled"
- BUILD_TYPE=conda
- JOB_TAG=_OSX
- TRAVIS_PYTHON_VERSION=3.5
- python: 2.7
env:
- JOB_NAME: "27_slow_nnet_LOCALE"
Expand Down Expand Up @@ -75,18 +76,20 @@ matrix:
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- BUILD_TEST=true
- python: 2.7
env:
- JOB_NAME: "27_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- NOSE_ARGS="not slow and not network and not disabled"
- PANDAS_TESTING_MODE="deprecate"
- python: 3.5
env:
- JOB_NAME: "35_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- NOSE_ARGS="not slow and not network and not disabled"
- PANDAS_TESTING_MODE="deprecate"
- python: 2.7
env:
- JOB_NAME: "27_nslow_nnet_COMPAT"
- NOSE_ARGS="not slow and not network and not disabled"
- LOCALE_OVERRIDE="it_IT.UTF-8"
- BUILD_TYPE=conda
- INSTALL_TEST=true
- JOB_TAG=_COMPAT
- python: 2.7
env:
- JOB_NAME: "doc_build"
Expand All @@ -108,12 +111,6 @@ matrix:
- NOSE_ARGS="slow and not network and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- python: 2.7
env:
- JOB_NAME: "27_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- NOSE_ARGS="not slow and not network and not disabled"
- PANDAS_TESTING_MODE="deprecate"
- python: 2.7
env:
- JOB_NAME: "27_build_test_conda"
Expand All @@ -127,6 +124,14 @@ matrix:
- JOB_TAG=_NUMPY_DEV
- NOSE_ARGS="not slow and not network and not disabled"
- PANDAS_TESTING_MODE="deprecate"
- python: 2.7
env:
- JOB_NAME: "27_nslow_nnet_COMPAT"
- NOSE_ARGS="not slow and not network and not disabled"
- LOCALE_OVERRIDE="it_IT.UTF-8"
- BUILD_TYPE=conda
- INSTALL_TEST=true
- JOB_TAG=_COMPAT
- python: 2.7
env:
- JOB_NAME: "doc_build"
Expand All @@ -139,16 +144,13 @@ before_install:
- echo "before_install"
- echo $VIRTUAL_ENV
- export PATH="$HOME/miniconda/bin:$PATH"
- sudo apt-get install ccache
- df -h
- date
- pwd
- uname -a
- python -V
- ci/before_install_travis.sh
# Xvfb stuff for clipboard functionality; see the travis-ci documentation
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

install:
- echo "install"
Expand All @@ -157,8 +159,7 @@ install:
- ci/submit_ccache.sh

before_script:
- mysql -e 'create database pandas_nosetest;'
- psql -c 'create database pandas_nosetest;' -U postgres
- ci/install_db.sh

script:
- echo "script"
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<div align="center">
<img src="http://pandas.pydata.org/_static/pandas_logo.png"><br>
</div>
-----------------

# pandas: powerful Python data analysis toolkit

<table>
Expand Down
28 changes: 15 additions & 13 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
matrix:
fast_finish: true # immediately finish build once one of the jobs fails.

# set clone depth
clone_depth: 300

environment:
global:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
Expand All @@ -23,7 +20,7 @@ environment:
PYTHON_VERSION: "3.4"
PYTHON_ARCH: "64"
CONDA_PY: "34"
CONDA_NPY: "110"
CONDA_NPY: "19"

- PYTHON: "C:\\Python27_64"
PYTHON_VERSION: "2.7"
Expand All @@ -49,36 +46,41 @@ init:
- "ECHO %PYTHON_VERSION% %PYTHON%"

install:
# this installs the appropriate Miniconda (Py2/Py3, 32/64 bit),
# 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%
- echo "install"
- cd
- ls -ltr
- git tag --sort v:refname

# this can conflict with git
- cmd: rmdir C:\cygwin /s /q

# 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
- cmd: 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 ci\appveyor.recipe -q --no-test'
- cmd: '%CMD_IN_ENV% conda build ci\appveyor.recipe -q'

# 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 ci\appveyor.recipe -q --output --no-test)
- SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
- cmd: echo "installing requirements from %REQ%"
- cmd: conda install -n pandas -q --file=%REQ%
- ps: conda install -n pandas (conda build ci\appveyor.recipe -q --output)

test_script:
# tests
- cd \
- conda list pandas
- nosetests --exe -A "not slow and not network and not disabled" pandas
- cmd: activate pandas
- cmd: conda list
- cmd: nosetests --exe -A "not slow and not network and not disabled" pandas
6 changes: 3 additions & 3 deletions ci/appveyor.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package:
name: pandas
version: {{ environ.get('GIT_DESCRIBE_TAG','') }}
version: 0.18.0

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

source:

Expand Down
6 changes: 5 additions & 1 deletion ci/before_install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
echo "inside $0"

# overview
sudo apt-get update $APT_ARGS # run apt-get update for all versions
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
sudo apt-get update $APT_ARGS # run apt-get update for all versions

sh -e /etc/init.d/xvfb start
fi

true # never fail because bad things happened here
11 changes: 10 additions & 1 deletion ci/build_docs.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#!/bin/bash

if [ "${TRAVIS_OS_NAME}" != "linux" ]; then
echo "not doing build_docs on non-linux"
exit 0
fi

cd "$TRAVIS_BUILD_DIR"
echo "inside $0"

Expand All @@ -19,7 +24,7 @@ if [ x"$DOC_BUILD" != x"" ]; then
source activate pandas
conda install -n pandas -c r r rpy2 --yes

time sudo apt-get $APT_ARGS install dvipng
time sudo apt-get $APT_ARGS install dvipng texlive-latex-base texlive-latex-extra

mv "$TRAVIS_BUILD_DIR"/doc /tmp
cd /tmp/doc
Expand All @@ -31,6 +36,10 @@ if [ x"$DOC_BUILD" != x"" ]; then
echo ./make.py
./make.py

echo ########################
echo # Create and send docs #
echo ########################

cd /tmp/doc/build/html
git config --global user.email "[email protected]"
git config --global user.name "pandas-docs-bot"
Expand Down
6 changes: 1 addition & 5 deletions ci/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ $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"
}
$filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
$url = $MINICONDA_URL + $filename

$basedir = $pwd.Path + "\"
Expand Down
13 changes: 13 additions & 0 deletions ci/install_db.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

if [ "${TRAVIS_OS_NAME}" != "linux" ]; then
echo "not using dbs on non-linux"
exit 0
fi

echo "installing dbs"
mysql -e 'create database pandas_nosetest;'
psql -c 'create database pandas_nosetest;' -U postgres

echo "done"
exit 0
36 changes: 24 additions & 12 deletions ci/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
# make sure the locale is available
# probably useless, since you would need to relogin
time sudo locale-gen "$LOCALE_OVERRIDE"
fi

# Need to enable for locale testing. The location of the locale file(s) is
# distro specific. For example, on Arch Linux all of the locales are in a
# commented file--/etc/locale.gen--that must be commented in to be used
# whereas Ubuntu looks in /var/lib/locales/supported.d/* and generates locales
# based on what's in the files in that folder
time echo 'it_CH.UTF-8 UTF-8' | sudo tee -a /var/lib/locales/supported.d/it
time sudo locale-gen
# Need to enable for locale testing. The location of the locale file(s) is
# distro specific. For example, on Arch Linux all of the locales are in a
# commented file--/etc/locale.gen--that must be commented in to be used
# whereas Ubuntu looks in /var/lib/locales/supported.d/* and generates locales
# based on what's in the files in that folder
time echo 'it_CH.UTF-8 UTF-8' | sudo tee -a /var/lib/locales/supported.d/it
time sudo locale-gen

fi

# install gui for clipboard testing
if [ -n "$CLIPBOARD_GUI" ]; then
Expand All @@ -67,7 +67,12 @@ fi
python_major_version="${TRAVIS_PYTHON_VERSION:0:1}"
[ "$python_major_version" == "2" ] && python_major_version=""

wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
# install miniconda
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
else
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
fi
bash miniconda.sh -b -p $HOME/miniconda || exit 1

conda config --set always_yes yes --set changeps1 no || exit 1
Expand All @@ -94,7 +99,7 @@ time conda install -n pandas --file=${REQ} || exit 1
source activate pandas

# set the compiler cache to work
if [ "$IRON_TOKEN" ]; then
if [[ "$IRON_TOKEN" && "${TRAVIS_OS_NAME}" == "linux" ]]; then
export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
gcc=$(which gcc)
echo "gcc: $gcc"
Expand All @@ -113,24 +118,31 @@ if [ "$BUILD_TEST" ]; then
else

# build but don't install
echo "build em"
time python setup.py build_ext --inplace || exit 1

# we may have run installations
echo "conda installs"
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.run"
time conda install -n pandas --file=${REQ} || exit 1

# we may have additional pip installs
echo "pip installs"
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.pip"
if [ -e ${REQ} ]; then
pip install -r $REQ
fi

# remove any installed pandas package
conda remove pandas
# w/o removing anything else
echo "removing installed pandas"
conda remove pandas --force

# install our pandas
echo "running setup.py develop"
python setup.py develop || exit 1

fi

true
echo "done"
exit 0
5 changes: 5 additions & 0 deletions ci/prep_ccache.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#!/bin/bash

if [ "${TRAVIS_OS_NAME}" != "linux" ]; then
echo "not using ccache on non-linux"
exit 0
fi

if [ "$IRON_TOKEN" ]; then

home_dir=$(pwd)
Expand Down
6 changes: 1 addition & 5 deletions ci/requirements-2.7-64.run
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dateutil
pytz
numpy
numpy=1.10*
xlwt
numexpr
pytables
Expand All @@ -13,10 +13,6 @@ scipy
xlsxwriter
boto
bottleneck
patsy
html5lib
beautiful-soup
jinja2=2.8

#pymysql=0.6.3
#psycopg2=2.5.2
1 change: 1 addition & 0 deletions ci/requirements-2.7.pip
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ blosc
httplib2
google-api-python-client == 1.2
python-gflags == 2.0
oauth2client == 1.5.0
pathlib
py
Loading