Remove do_not_merge

Delete pyx file

Add pyx file

Change pyx file

Undo pyx change

Un test commit

Test commit after ci change

Change a pyx file

Bug fix

Author: nparley

do_not_merge renamed to DO_NOT_MERGE

@@ -29,7 +29,7 @@ if [ -f "$CACHE_File" ] && [ "$USE_CACHE" ] && [ -d "$PYX_CACHE_DIR" ]; then
     for i in ${pyx_file_list}
     do
             diff=`diff -u $i $PYX_CACHE_DIR${i}`
-            if [[ $? -ne 0 ]]
+            if [[ $? -eq 2 ]]
             then
                     echo "${i##*/} can't be diffed; probably not in cache"
                     clear_cache=1

ci/prep_cython_cache.sh

@@ -1,4 +1,5 @@
 from datetime import datetime, date, timedelta
+
 import operator
 
 from cpython cimport (
@@ -21,6 +22,7 @@ from pandas.tseries import offsets
 from pandas.tseries.tools import parse_time_string
 
 cimport cython
+
 from datetime cimport *
 cimport util
 cimport lib