From bcee3d7040edd236dad59126269e7fc7466693ab Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 5 Oct 2016 20:21:32 -0500 Subject: [PATCH 1/9] dummy commit --- ci/prep_cython_cache.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/prep_cython_cache.sh b/ci/prep_cython_cache.sh index 6f16dce2fb431..bc0d05dddf441 100755 --- a/ci/prep_cython_cache.sh +++ b/ci/prep_cython_cache.sh @@ -2,6 +2,7 @@ ls "$HOME/.cache/" + PYX_CACHE_DIR="$HOME/.cache/pyxfiles" pyx_file_list=`find ${TRAVIS_BUILD_DIR} -name "*.pyx"` pyx_cache_file_list=`find ${PYX_CACHE_DIR} -name "*.pyx"` From 8c9071c543fbec697474415493d3e9d4037c34fb Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 5 Oct 2016 20:23:40 -0500 Subject: [PATCH 2/9] dummy pxd change --- pandas/src/util.pxd | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/src/util.pxd b/pandas/src/util.pxd index fcb5583a0a6e7..0b3f6925fc500 100644 --- a/pandas/src/util.pxd +++ b/pandas/src/util.pxd @@ -85,6 +85,7 @@ cdef inline bint _checknull(object val): except ValueError: return False + cdef inline bint _checknull_old(object val): import numpy as np cdef double INF = np.inf From 4329a4ac140e5fc4b61cf468e860bde0245a5be5 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 5 Oct 2016 20:27:03 -0500 Subject: [PATCH 3/9] change caching logic --- ci/submit_cython_cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/submit_cython_cache.sh b/ci/submit_cython_cache.sh index 4f60df0ccb2d8..5c98c3df61736 100755 --- a/ci/submit_cython_cache.sh +++ b/ci/submit_cython_cache.sh @@ -2,7 +2,7 @@ CACHE_File="$HOME/.cache/cython_files.tar" PYX_CACHE_DIR="$HOME/.cache/pyxfiles" -pyx_file_list=`find ${TRAVIS_BUILD_DIR} -name "*.pyx"` +pyx_file_list=`find ${TRAVIS_BUILD_DIR} -name "*.pyx" -o -name "*.pxd"` rm -rf $CACHE_File rm -rf $PYX_CACHE_DIR From 29f2e5ceae43a5e864a00ea602e5ae270289d088 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 5 Oct 2016 20:27:33 -0500 Subject: [PATCH 4/9] another dummy pxd change --- pandas/src/util.pxd | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/src/util.pxd b/pandas/src/util.pxd index 0b3f6925fc500..fcb5583a0a6e7 100644 --- a/pandas/src/util.pxd +++ b/pandas/src/util.pxd @@ -85,7 +85,6 @@ cdef inline bint _checknull(object val): except ValueError: return False - cdef inline bint _checknull_old(object val): import numpy as np cdef double INF = np.inf From 2a7e6afd14b7928eec630828acfd56b45a622384 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 5 Oct 2016 20:31:39 -0500 Subject: [PATCH 5/9] actually change caching logic --- ci/prep_cython_cache.sh | 5 ++--- pandas/src/util.pxd | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/prep_cython_cache.sh b/ci/prep_cython_cache.sh index bc0d05dddf441..cadc356b641f9 100755 --- a/ci/prep_cython_cache.sh +++ b/ci/prep_cython_cache.sh @@ -2,10 +2,9 @@ ls "$HOME/.cache/" - PYX_CACHE_DIR="$HOME/.cache/pyxfiles" -pyx_file_list=`find ${TRAVIS_BUILD_DIR} -name "*.pyx"` -pyx_cache_file_list=`find ${PYX_CACHE_DIR} -name "*.pyx"` +pyx_file_list=`find ${TRAVIS_BUILD_DIR} -name "*.pyx" -o -name "*.pxd"` +pyx_cache_file_list=`find ${PYX_CACHE_DIR} -name "*.pyx" -o -name "*.pxd"` CACHE_File="$HOME/.cache/cython_files.tar" diff --git a/pandas/src/util.pxd b/pandas/src/util.pxd index fcb5583a0a6e7..0b3f6925fc500 100644 --- a/pandas/src/util.pxd +++ b/pandas/src/util.pxd @@ -85,6 +85,7 @@ cdef inline bint _checknull(object val): except ValueError: return False + cdef inline bint _checknull_old(object val): import numpy as np cdef double INF = np.inf From d1bc4f67e8b5237036ffeaa3c1eaa229be5ec3cb Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 5 Oct 2016 20:31:58 -0500 Subject: [PATCH 6/9] another dummy pxd change --- pandas/src/util.pxd | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/src/util.pxd b/pandas/src/util.pxd index 0b3f6925fc500..fcb5583a0a6e7 100644 --- a/pandas/src/util.pxd +++ b/pandas/src/util.pxd @@ -85,7 +85,6 @@ cdef inline bint _checknull(object val): except ValueError: return False - cdef inline bint _checknull_old(object val): import numpy as np cdef double INF = np.inf From bebf7592ef10bb16e3804ce6caf730935a00acb7 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 6 Oct 2016 04:33:41 -0500 Subject: [PATCH 7/9] dummy - need 2 commits after change in /ci --- pandas/core/algorithms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index ee59d6552bb2f..890f6162cd631 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -29,6 +29,7 @@ is_list_like) from pandas.types.missing import isnull + import pandas.core.common as com import pandas.algos as algos import pandas.hashtable as htable From a42cb3c2b800d1d7f67758e74d0fc0cbb2c3c6e0 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 6 Oct 2016 04:36:03 -0500 Subject: [PATCH 8/9] test change in pxd --- pandas/core/algorithms.py | 1 - pandas/src/util.pxd | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index 890f6162cd631..ee59d6552bb2f 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -29,7 +29,6 @@ is_list_like) from pandas.types.missing import isnull - import pandas.core.common as com import pandas.algos as algos import pandas.hashtable as htable diff --git a/pandas/src/util.pxd b/pandas/src/util.pxd index fcb5583a0a6e7..19c01ed9edb79 100644 --- a/pandas/src/util.pxd +++ b/pandas/src/util.pxd @@ -97,5 +97,6 @@ cdef inline bint _checknull_old(object val): cdef inline bint _checknan(object val): return not cnp.PyArray_Check(val) and val != val + cdef inline bint is_period_object(object val): return getattr(val, '_typ', '_typ') == 'period' From 479c311ed905b79a1e23ce5fc96f3582b00777ea Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 8 Oct 2016 08:00:47 -0500 Subject: [PATCH 9/9] commit after cache rebuilt --- pandas/src/util.pxd | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/src/util.pxd b/pandas/src/util.pxd index 19c01ed9edb79..fcb5583a0a6e7 100644 --- a/pandas/src/util.pxd +++ b/pandas/src/util.pxd @@ -97,6 +97,5 @@ cdef inline bint _checknull_old(object val): cdef inline bint _checknan(object val): return not cnp.PyArray_Check(val) and val != val - cdef inline bint is_period_object(object val): return getattr(val, '_typ', '_typ') == 'period'