Skip to content

Commit 183e92f

Browse files
gfyounggfyoung
authored
CI / BLD: Various CI Backports (#22637)
* CI: Bump NumPy to 1.9.3 Backport of gh-22499. * BLD: Fix openpyxl to 2.5.5 Backport of gh-22601. * CI: Resolve timeout issue on Travis Backported from gh-22429. * CI: Migrate to CircleCI 2.0 Backport of gh-21814. * Upgrade Cython to >=0.28.2 Backported from gh-21688. * TST: Patch locale handling Backported from gh-21739. Backport of gh-22213.
1 parent 932de54 commit 183e92f

28 files changed

+272
-95
lines changed

‎.circleci/config.yml

+147
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
version: 2
2+
jobs:
3+
4+
# --------------------------------------------------------------------------
5+
# 0. py27_compat
6+
# --------------------------------------------------------------------------
7+
py27_compat:
8+
docker:
9+
- image: continuumio/miniconda:latest
10+
# databases configuration
11+
- image: circleci/postgres:9.6.5-alpine-ram
12+
environment:
13+
POSTGRES_USER: postgres
14+
POSTGRES_DB: pandas_nosetest
15+
- image: circleci/mysql:8-ram
16+
environment:
17+
MYSQL_USER: "root"
18+
MYSQL_HOST: "localhost"
19+
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
20+
MYSQL_DATABASE: "pandas_nosetest"
21+
environment:
22+
JOB: "2.7_COMPAT"
23+
ENV_FILE: "ci/circle-27-compat.yaml"
24+
LOCALE_OVERRIDE: "it_IT.UTF-8"
25+
MINICONDA_DIR: /home/ubuntu/miniconda3
26+
steps:
27+
- checkout
28+
- run:
29+
name: build
30+
command: |
31+
./ci/install_circle.sh
32+
./ci/show_circle.sh
33+
- run:
34+
name: test
35+
command: ./ci/run_circle.sh --skip-slow --skip-network
36+
37+
# --------------------------------------------------------------------------
38+
# 1. py36_locale
39+
# --------------------------------------------------------------------------
40+
py36_locale:
41+
docker:
42+
- image: continuumio/miniconda:latest
43+
# databases configuration
44+
- image: circleci/postgres:9.6.5-alpine-ram
45+
environment:
46+
POSTGRES_USER: postgres
47+
POSTGRES_DB: pandas_nosetest
48+
- image: circleci/mysql:8-ram
49+
environment:
50+
MYSQL_USER: "root"
51+
MYSQL_HOST: "localhost"
52+
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
53+
MYSQL_DATABASE: "pandas_nosetest"
54+
55+
environment:
56+
JOB: "3.6_LOCALE"
57+
ENV_FILE: "ci/circle-36-locale.yaml"
58+
LOCALE_OVERRIDE: "zh_CN.UTF-8"
59+
MINICONDA_DIR: /home/ubuntu/miniconda3
60+
steps:
61+
- checkout
62+
- run:
63+
name: build
64+
command: |
65+
./ci/install_circle.sh
66+
./ci/show_circle.sh
67+
- run:
68+
name: test
69+
command: ./ci/run_circle.sh --skip-slow --skip-network
70+
71+
# --------------------------------------------------------------------------
72+
# 2. py36_locale_slow
73+
# --------------------------------------------------------------------------
74+
py36_locale_slow:
75+
docker:
76+
- image: continuumio/miniconda:latest
77+
# databases configuration
78+
- image: circleci/postgres:9.6.5-alpine-ram
79+
environment:
80+
POSTGRES_USER: postgres
81+
POSTGRES_DB: pandas_nosetest
82+
- image: circleci/mysql:8-ram
83+
environment:
84+
MYSQL_USER: "root"
85+
MYSQL_HOST: "localhost"
86+
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
87+
MYSQL_DATABASE: "pandas_nosetest"
88+
89+
environment:
90+
JOB: "3.6_LOCALE_SLOW"
91+
ENV_FILE: "ci/circle-36-locale_slow.yaml"
92+
LOCALE_OVERRIDE: "zh_CN.UTF-8"
93+
MINICONDA_DIR: /home/ubuntu/miniconda3
94+
steps:
95+
- checkout
96+
- run:
97+
name: build
98+
command: |
99+
./ci/install_circle.sh
100+
./ci/show_circle.sh
101+
- run:
102+
name: test
103+
command: ./ci/run_circle.sh --only-slow --skip-network
104+
105+
# --------------------------------------------------------------------------
106+
# 3. py35_ascii
107+
# --------------------------------------------------------------------------
108+
py35_ascii:
109+
docker:
110+
- image: continuumio/miniconda:latest
111+
# databases configuration
112+
- image: circleci/postgres:9.6.5-alpine-ram
113+
environment:
114+
POSTGRES_USER: postgres
115+
POSTGRES_DB: pandas_nosetest
116+
- image: circleci/mysql:8-ram
117+
environment:
118+
MYSQL_USER: "root"
119+
MYSQL_HOST: "localhost"
120+
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
121+
MYSQL_DATABASE: "pandas_nosetest"
122+
123+
environment:
124+
JOB: "3.5_ASCII"
125+
ENV_FILE: "ci/circle-35-ascii.yaml"
126+
LOCALE_OVERRIDE: "C"
127+
MINICONDA_DIR: /home/ubuntu/miniconda3
128+
steps:
129+
- checkout
130+
- run:
131+
name: build
132+
command: |
133+
./ci/install_circle.sh
134+
./ci/show_circle.sh
135+
- run:
136+
name: test
137+
command: ./ci/run_circle.sh --skip-slow --skip-network
138+
139+
140+
workflows:
141+
version: 2
142+
build_and_test:
143+
jobs:
144+
- py27_compat
145+
- py36_locale
146+
- py36_locale_slow
147+
- py35_ascii

‎ci/appveyor-27.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- matplotlib
1313
- numexpr
1414
- numpy=1.10*
15-
- openpyxl
15+
- openpyxl=2.5.5
1616
- pytables==3.2.2
1717
- python=2.7.*
1818
- pytz

‎ci/appveyor-36.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- matplotlib
1111
- numexpr
1212
- numpy=1.13*
13-
- openpyxl
13+
- openpyxl=2.5.5
1414
- pyarrow
1515
- pytables
1616
- python-dateutil

‎ci/circle-27-compat.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ 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
10-
- numpy=1.9.2
11-
- openpyxl
10+
- numpy=1.9.3
11+
- openpyxl=2.5.5
1212
- psycopg2
1313
- pytables=3.2.2
1414
- python-dateutil=2.5.0

‎ci/circle-35-ascii.yaml

+1-1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- nomkl
1414
- numexpr
1515
- numpy
16-
- openpyxl
16+
- openpyxl=2.5.5
1717
- psycopg2
1818
- pymysql
1919
- pytables

‎ci/circle-36-locale_slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- nomkl
1414
- numexpr
1515
- numpy
16-
- openpyxl
16+
- openpyxl=2.5.5
1717
- psycopg2
1818
- pymysql
1919
- pytables

‎ci/install_circle.sh

+10-9
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@ echo "[home_dir: $home_dir]"
66
echo "[ls -ltr]"
77
ls -ltr
88

9-
echo "[Using clean Miniconda install]"
10-
rm -rf "$MINICONDA_DIR"
11-
12-
# install miniconda
13-
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -q -O miniconda.sh || exit 1
14-
bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
15-
16-
export PATH="$MINICONDA_DIR/bin:$PATH"
9+
apt-get update -y && apt-get install -y build-essential postgresql-client-9.6
1710

1811
echo "[update conda]"
1912
conda config --set ssl_verify false || exit 1
@@ -48,9 +41,17 @@ source $ENVS_FILE
4841

4942
# edit the locale override if needed
5043
if [ -n "$LOCALE_OVERRIDE" ]; then
44+
45+
apt-get update && apt-get -y install locales locales-all
46+
47+
export LANG=$LOCALE_OVERRIDE
48+
export LC_ALL=$LOCALE_OVERRIDE
49+
50+
python -c "import locale; locale.setlocale(locale.LC_ALL, \"$LOCALE_OVERRIDE\")" || exit 1;
51+
5152
echo "[Adding locale to the first line of pandas/__init__.py]"
5253
rm -f pandas/__init__.pyc
53-
sedc="3iimport locale\nlocale.setlocale(locale.LC_ALL, '$LOCALE_OVERRIDE')\n"
54+
sedc="3iimport locale\nlocale.setlocale(locale.LC_ALL, \"$LOCALE_OVERRIDE\")\n"
5455
sed -i "$sedc" pandas/__init__.py
5556
echo "[head -4 pandas/__init__.py]"
5657
head -4 pandas/__init__.py

‎ci/install_db_circle.sh

-8
This file was deleted.

‎ci/requirements-optional-conda.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ lxml
1111
matplotlib
1212
nbsphinx
1313
numexpr
14-
openpyxl
14+
openpyxl=2.5.5
1515
pyarrow
1616
pymysql
1717
pytables

‎ci/requirements-optional-pip.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ lxml
1313
matplotlib
1414
nbsphinx
1515
numexpr
16-
openpyxl
16+
openpyxl=2.5.5
1717
pyarrow
1818
pymysql
1919
tables
@@ -26,4 +26,4 @@ sqlalchemy
2626
xarray
2727
xlrd
2828
xlsxwriter
29-
xlwt
29+
xlwt

‎ci/run_circle.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ export PATH="$MINICONDA_DIR/bin:$PATH"
66
source activate pandas
77

88
echo "pytest --strict --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas"
9-
pytest --strict --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas
9+
pytest --strict --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas

‎ci/travis-27-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- cython=0.24
88
- lxml
99
- matplotlib=1.4.3
10-
- numpy=1.9.2
10+
- numpy=1.9.3
1111
- openpyxl=2.4.0
1212
- python-dateutil
1313
- python-blosc

‎ci/travis-27.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dependencies:
2727
- PyCrypto
2828
- pymysql=0.6.3
2929
- pytables
30+
- blosc=1.14.3
3031
- python-blosc
3132
- python-dateutil=2.5.0
3233
- python=2.7*

‎ci/travis-35-osx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- nomkl
1313
- numexpr
1414
- numpy=1.10.4
15-
- openpyxl
15+
- openpyxl=2.5.5
1616
- pytables
1717
- python=3.5*
1818
- pytz

‎ci/travis-36-doc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies:
2121
- notebook
2222
- numexpr
2323
- numpy=1.13*
24-
- openpyxl
24+
- openpyxl=2.5.5
2525
- pandoc
2626
- pyqt
2727
- pytables

‎ci/travis-36-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- matplotlib
1111
- numexpr
1212
- numpy
13-
- openpyxl
13+
- openpyxl=2.5.5
1414
- patsy
1515
- psycopg2
1616
- pymysql

‎ci/travis-36.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
- nomkl
1818
- numexpr
1919
- numpy
20-
- openpyxl
20+
- openpyxl=2.5.5
2121
- psycopg2
2222
- pyarrow
2323
- pymysql

‎circle.yml

-38
This file was deleted.

0 commit comments

Comments
 (0)