Skip to content

Commit 3a35e7b

Browse files
committed
Merge branch 'between-time-axis' of https://github.com/yrhooke/pandas into between-time-axis
2 parents bcf7e73 + 93b49e1 commit 3a35e7b

File tree

211 files changed

+10231
-7193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+10231
-7193
lines changed

ci/appveyor-27.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies:
2424
- xlsxwriter
2525
- xlwt
2626
# universal
27-
- cython
27+
- cython>=0.28.2
2828
- pytest
2929
- pytest-xdist
3030
- moto

ci/appveyor-36.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ dependencies:
2222
- xlsxwriter
2323
- xlwt
2424
# universal
25-
- cython
25+
- cython>=0.28.2
2626
- pytest
2727
- pytest-xdist

ci/circle-27-compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
dependencies:
66
- bottleneck=1.0.0
7-
- cython=0.24
7+
- cython=0.28.2
88
- jinja2=2.8
99
- numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr
1010
- numpy=1.9.2

ci/circle-35-ascii.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pandas
22
channels:
33
- defaults
44
dependencies:
5-
- cython
5+
- cython>=0.28.2
66
- nomkl
77
- numpy
88
- python-dateutil

ci/circle-36-locale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
dependencies:
66
- beautifulsoup4
7-
- cython
7+
- cython>=0.28.2
88
- html5lib
99
- ipython
1010
- jinja2

ci/circle-36-locale_slow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
dependencies:
66
- beautifulsoup4
7-
- cython
7+
- cython>=0.28.2
88
- gcsfs
99
- html5lib
1010
- ipython

ci/environment-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- defaults
44
- conda-forge
55
dependencies:
6-
- Cython
6+
- Cython>=0.28.2
77
- NumPy
88
- flake8
99
- moto

ci/travis-27-locale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
dependencies:
66
- bottleneck=1.0.0
7-
- cython=0.24
7+
- cython=0.28.2
88
- lxml
99
- matplotlib=1.4.3
1010
- numpy=1.9.2

ci/travis-27.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ channels:
55
dependencies:
66
- beautifulsoup4
77
- bottleneck
8-
- cython=0.24
8+
- cython=0.28.2
99
- fastparquet
1010
- feather-format
1111
- flake8=3.4.1

ci/travis-35-osx.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
dependencies:
55
- beautifulsoup4
66
- bottleneck
7-
- cython
7+
- cython>=0.28.2
88
- html5lib
99
- jinja2
1010
- lxml

0 commit comments

Comments
 (0)