Skip to content

Commit

Permalink
CI / BLD: Various CI Backports (#22637)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
gfyoung committed Sep 11, 2018
1 parent 932de54 commit 183e92f
Show file tree
Hide file tree
Showing 28 changed files with 272 additions and 95 deletions.
147 changes: 147 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
version: 2
jobs:

# --------------------------------------------------------------------------
# 0. py27_compat
# --------------------------------------------------------------------------
py27_compat:
docker:
- image: continuumio/miniconda:latest
# databases configuration
- image: circleci/postgres:9.6.5-alpine-ram
environment:
POSTGRES_USER: postgres
POSTGRES_DB: pandas_nosetest
- image: circleci/mysql:8-ram
environment:
MYSQL_USER: "root"
MYSQL_HOST: "localhost"
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_DATABASE: "pandas_nosetest"
environment:
JOB: "2.7_COMPAT"
ENV_FILE: "ci/circle-27-compat.yaml"
LOCALE_OVERRIDE: "it_IT.UTF-8"
MINICONDA_DIR: /home/ubuntu/miniconda3
steps:
- checkout
- run:
name: build
command: |
./ci/install_circle.sh
./ci/show_circle.sh
- run:
name: test
command: ./ci/run_circle.sh --skip-slow --skip-network

# --------------------------------------------------------------------------
# 1. py36_locale
# --------------------------------------------------------------------------
py36_locale:
docker:
- image: continuumio/miniconda:latest
# databases configuration
- image: circleci/postgres:9.6.5-alpine-ram
environment:
POSTGRES_USER: postgres
POSTGRES_DB: pandas_nosetest
- image: circleci/mysql:8-ram
environment:
MYSQL_USER: "root"
MYSQL_HOST: "localhost"
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_DATABASE: "pandas_nosetest"

environment:
JOB: "3.6_LOCALE"
ENV_FILE: "ci/circle-36-locale.yaml"
LOCALE_OVERRIDE: "zh_CN.UTF-8"
MINICONDA_DIR: /home/ubuntu/miniconda3
steps:
- checkout
- run:
name: build
command: |
./ci/install_circle.sh
./ci/show_circle.sh
- run:
name: test
command: ./ci/run_circle.sh --skip-slow --skip-network

# --------------------------------------------------------------------------
# 2. py36_locale_slow
# --------------------------------------------------------------------------
py36_locale_slow:
docker:
- image: continuumio/miniconda:latest
# databases configuration
- image: circleci/postgres:9.6.5-alpine-ram
environment:
POSTGRES_USER: postgres
POSTGRES_DB: pandas_nosetest
- image: circleci/mysql:8-ram
environment:
MYSQL_USER: "root"
MYSQL_HOST: "localhost"
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_DATABASE: "pandas_nosetest"

environment:
JOB: "3.6_LOCALE_SLOW"
ENV_FILE: "ci/circle-36-locale_slow.yaml"
LOCALE_OVERRIDE: "zh_CN.UTF-8"
MINICONDA_DIR: /home/ubuntu/miniconda3
steps:
- checkout
- run:
name: build
command: |
./ci/install_circle.sh
./ci/show_circle.sh
- run:
name: test
command: ./ci/run_circle.sh --only-slow --skip-network

# --------------------------------------------------------------------------
# 3. py35_ascii
# --------------------------------------------------------------------------
py35_ascii:
docker:
- image: continuumio/miniconda:latest
# databases configuration
- image: circleci/postgres:9.6.5-alpine-ram
environment:
POSTGRES_USER: postgres
POSTGRES_DB: pandas_nosetest
- image: circleci/mysql:8-ram
environment:
MYSQL_USER: "root"
MYSQL_HOST: "localhost"
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_DATABASE: "pandas_nosetest"

environment:
JOB: "3.5_ASCII"
ENV_FILE: "ci/circle-35-ascii.yaml"
LOCALE_OVERRIDE: "C"
MINICONDA_DIR: /home/ubuntu/miniconda3
steps:
- checkout
- run:
name: build
command: |
./ci/install_circle.sh
./ci/show_circle.sh
- run:
name: test
command: ./ci/run_circle.sh --skip-slow --skip-network


workflows:
version: 2
build_and_test:
jobs:
- py27_compat
- py36_locale
- py36_locale_slow
- py35_ascii
2 changes: 1 addition & 1 deletion ci/appveyor-27.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- matplotlib
- numexpr
- numpy=1.10*
- openpyxl
- openpyxl=2.5.5
- pytables==3.2.2
- python=2.7.*
- pytz
Expand Down
2 changes: 1 addition & 1 deletion ci/appveyor-36.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- matplotlib
- numexpr
- numpy=1.13*
- openpyxl
- openpyxl=2.5.5
- pyarrow
- pytables
- python-dateutil
Expand Down
6 changes: 3 additions & 3 deletions ci/circle-27-compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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
- openpyxl
- numpy=1.9.3
- openpyxl=2.5.5
- psycopg2
- pytables=3.2.2
- python-dateutil=2.5.0
Expand Down
2 changes: 1 addition & 1 deletion ci/circle-35-ascii.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pandas
channels:
- defaults
dependencies:
- cython
- cython>=0.28.2
- nomkl
- numpy
- python-dateutil
Expand Down
2 changes: 1 addition & 1 deletion ci/circle-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- nomkl
- numexpr
- numpy
- openpyxl
- openpyxl=2.5.5
- psycopg2
- pymysql
- pytables
Expand Down
2 changes: 1 addition & 1 deletion ci/circle-36-locale_slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- nomkl
- numexpr
- numpy
- openpyxl
- openpyxl=2.5.5
- psycopg2
- pymysql
- pytables
Expand Down
19 changes: 10 additions & 9 deletions ci/install_circle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,7 @@ echo "[home_dir: $home_dir]"
echo "[ls -ltr]"
ls -ltr

echo "[Using clean Miniconda install]"
rm -rf "$MINICONDA_DIR"

# install miniconda
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -q -O miniconda.sh || exit 1
bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1

export PATH="$MINICONDA_DIR/bin:$PATH"
apt-get update -y && apt-get install -y build-essential postgresql-client-9.6

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

# edit the locale override if needed
if [ -n "$LOCALE_OVERRIDE" ]; then

apt-get update && apt-get -y install locales locales-all

export LANG=$LOCALE_OVERRIDE
export LC_ALL=$LOCALE_OVERRIDE

python -c "import locale; locale.setlocale(locale.LC_ALL, \"$LOCALE_OVERRIDE\")" || exit 1;

echo "[Adding locale to the first line of pandas/__init__.py]"
rm -f pandas/__init__.pyc
sedc="3iimport locale\nlocale.setlocale(locale.LC_ALL, '$LOCALE_OVERRIDE')\n"
sedc="3iimport locale\nlocale.setlocale(locale.LC_ALL, \"$LOCALE_OVERRIDE\")\n"
sed -i "$sedc" pandas/__init__.py
echo "[head -4 pandas/__init__.py]"
head -4 pandas/__init__.py
Expand Down
8 changes: 0 additions & 8 deletions ci/install_db_circle.sh

This file was deleted.

2 changes: 1 addition & 1 deletion ci/requirements-optional-conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ lxml
matplotlib
nbsphinx
numexpr
openpyxl
openpyxl=2.5.5
pyarrow
pymysql
pytables
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-optional-pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ lxml
matplotlib
nbsphinx
numexpr
openpyxl
openpyxl=2.5.5
pyarrow
pymysql
tables
Expand All @@ -26,4 +26,4 @@ sqlalchemy
xarray
xlrd
xlsxwriter
xlwt
xlwt
2 changes: 1 addition & 1 deletion ci/run_circle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ export PATH="$MINICONDA_DIR/bin:$PATH"
source activate pandas

echo "pytest --strict --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas"
pytest --strict --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas
pytest --strict --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas
2 changes: 1 addition & 1 deletion ci/travis-27-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- cython=0.24
- lxml
- matplotlib=1.4.3
- numpy=1.9.2
- numpy=1.9.3
- openpyxl=2.4.0
- python-dateutil
- python-blosc
Expand Down
1 change: 1 addition & 0 deletions ci/travis-27.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies:
- PyCrypto
- pymysql=0.6.3
- pytables
- blosc=1.14.3
- python-blosc
- python-dateutil=2.5.0
- python=2.7*
Expand Down
2 changes: 1 addition & 1 deletion ci/travis-35-osx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- nomkl
- numexpr
- numpy=1.10.4
- openpyxl
- openpyxl=2.5.5
- pytables
- python=3.5*
- pytz
Expand Down
2 changes: 1 addition & 1 deletion ci/travis-36-doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- notebook
- numexpr
- numpy=1.13*
- openpyxl
- openpyxl=2.5.5
- pandoc
- pyqt
- pytables
Expand Down
2 changes: 1 addition & 1 deletion ci/travis-36-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- matplotlib
- numexpr
- numpy
- openpyxl
- openpyxl=2.5.5
- patsy
- psycopg2
- pymysql
Expand Down
2 changes: 1 addition & 1 deletion ci/travis-36.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- nomkl
- numexpr
- numpy
- openpyxl
- openpyxl=2.5.5
- psycopg2
- pyarrow
- pymysql
Expand Down
38 changes: 0 additions & 38 deletions circle.yml

This file was deleted.

Loading

0 comments on commit 183e92f

Please sign in to comment.