Merge branch 'between-time-axis' of https://github.com/yrhooke/pandas into between-time-axis

Author: yrhooke

ci/appveyor-27.yaml

@@ -24,7 +24,7 @@ dependencies:
   - xlsxwriter
   - xlwt
   # universal
-  - cython
+  - cython>=0.28.2
   - pytest
   - pytest-xdist
   - moto

ci/appveyor-36.yaml

@@ -22,6 +22,6 @@ dependencies:
   - xlsxwriter
   - xlwt
   # universal
-  - cython
+  - cython>=0.28.2
   - pytest
   - pytest-xdist

ci/circle-27-compat.yaml

@@ -4,7 +4,7 @@ channels:
   - conda-forge
 dependencies:
   - bottleneck=1.0.0
-  - cython=0.24
+  - cython=0.28.2
   - jinja2=2.8
   - numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr
   - numpy=1.9.2

ci/circle-35-ascii.yaml

@@ -2,7 +2,7 @@ name: pandas
 channels:
   - defaults
 dependencies:
-  - cython
+  - cython>=0.28.2
   - nomkl
   - numpy
   - python-dateutil

ci/circle-36-locale.yaml

@@ -4,7 +4,7 @@ channels:
   - conda-forge
 dependencies:
   - beautifulsoup4
-  - cython
+  - cython>=0.28.2
   - html5lib
   - ipython
   - jinja2

ci/circle-36-locale_slow.yaml

@@ -4,7 +4,7 @@ channels:
   - conda-forge
 dependencies:
   - beautifulsoup4
-  - cython
+  - cython>=0.28.2
   - gcsfs
   - html5lib
   - ipython

ci/environment-dev.yaml

@@ -3,7 +3,7 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - Cython
+  - Cython>=0.28.2
   - NumPy
   - flake8
   - moto

ci/travis-27-locale.yaml

@@ -4,7 +4,7 @@ channels:
   - conda-forge
 dependencies:
   - bottleneck=1.0.0
-  - cython=0.24
+  - cython=0.28.2
   - lxml
   - matplotlib=1.4.3
   - numpy=1.9.2

ci/travis-27.yaml

@@ -5,7 +5,7 @@ channels:
 dependencies:
   - beautifulsoup4
   - bottleneck
-  - cython=0.24
+  - cython=0.28.2
   - fastparquet
   - feather-format
   - flake8=3.4.1

ci/travis-35-osx.yaml

@@ -4,7 +4,7 @@ channels:
 dependencies:
   - beautifulsoup4
   - bottleneck
-  - cython
+  - cython>=0.28.2
   - html5lib
   - jinja2
   - lxml