Skip to content

Commit c3e550c

Browse files
authored
Merge pull request #3 from pandas-dev/master
!I master -> fork
2 parents e510b1a + b841374 commit c3e550c

File tree

876 files changed

+64167
-46353
lines changed

Some content is hidden

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

876 files changed

+64167
-46353
lines changed

.circleci/config.yml

Lines changed: 10 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,6 @@
11
version: 2
22
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:
3+
build:
414
docker:
425
- image: continuumio/miniconda:latest
436
# databases configuration
@@ -54,94 +17,22 @@ jobs:
5417

5518
environment:
5619
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"
20+
ENV_FILE: "ci/deps/circle-36-locale.yaml"
9221
LOCALE_OVERRIDE: "zh_CN.UTF-8"
9322
MINICONDA_DIR: /home/ubuntu/miniconda3
9423
steps:
9524
- checkout
9625
- run:
9726
name: build
9827
command: |
99-
./ci/install_circle.sh
100-
./ci/show_circle.sh
28+
./ci/circle/install_circle.sh
29+
export PATH="$MINICONDA_DIR/bin:$PATH"
30+
source activate pandas-dev
31+
python -c "import pandas; pandas.show_versions();"
10132
- run:
10233
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
13234
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
35+
export PATH="$MINICONDA_DIR/bin:$PATH"
36+
source activate pandas-dev
37+
echo "pytest -m "not slow and not network" --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml pandas"
38+
pytest -m "not slow and not network" --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml pandas

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,5 @@ doc/build/html/index.html
109109
# Windows specific leftover:
110110
doc/tmp.sv
111111
doc/source/styled.xlsx
112-
doc/source/templates/
113112
env/
114113
doc/source/savefig/

.pep8speaks.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
scanner:
44
diff_only: True # If True, errors caused by only the patch are shown
55

6+
# Opened issue in pep8speaks, so we can directly use the config in setup.cfg
7+
# (and avoid having to duplicate it here):
8+
# https://github.com/OrkoHunter/pep8speaks/issues/95
9+
610
pycodestyle:
711
max-line-length: 79
8-
ignore: # Errors and warnings to ignore
12+
ignore:
13+
- W503, # line break before binary operator
14+
- W504, # line break after binary operator
915
- E402, # module level import not at top of file
1016
- E731, # do not assign a lambda expression, use a def
11-
- W503 # line break before binary operator
17+
- C406, # Unnecessary list literal - rewrite as a dict literal.
18+
- C408, # Unnecessary dict call - rewrite as a literal.
19+
- C409 # Unnecessary list passed to tuple() - rewrite as a tuple literal.

.travis.yml

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323

2424
git:
2525
# for cloning
26-
depth: 1000
26+
depth: 1500
2727

2828
matrix:
2929
fast_finish: true
@@ -34,29 +34,28 @@ matrix:
3434
include:
3535
- dist: trusty
3636
env:
37-
- JOB="3.7" ENV_FILE="ci/travis-37.yaml" TEST_ARGS="--skip-slow --skip-network"
37+
- JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="not slow and not network"
3838

3939
- dist: trusty
4040
env:
41-
- JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
41+
- JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/deps/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" PATTERN="slow"
4242
addons:
4343
apt:
4444
packages:
4545
- language-pack-zh-hans
4646
- dist: trusty
4747
env:
48-
- JOB="2.7, lint" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true
48+
- JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="not slow"
4949
addons:
5050
apt:
5151
packages:
5252
- python-gtk2
5353
- dist: trusty
5454
env:
55-
- JOB="3.6, coverage" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true DOCTEST=true
56-
55+
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="not slow and not network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
5756
- dist: trusty
5857
env:
59-
- JOB="3.7, NumPy dev" ENV_FILE="ci/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate"
58+
- JOB="3.7, NumPy dev" ENV_FILE="ci/deps/travis-37-numpydev.yaml" PATTERN="not slow and not network" TEST_ARGS="-W error" PANDAS_TESTING_MODE="deprecate"
6059
addons:
6160
apt:
6261
packages:
@@ -65,19 +64,19 @@ matrix:
6564
# In allow_failures
6665
- dist: trusty
6766
env:
68-
- JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
67+
- JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
6968

7069
# In allow_failures
7170
- dist: trusty
7271
env:
73-
- JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
72+
- JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
7473
allow_failures:
7574
- dist: trusty
7675
env:
77-
- JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
76+
- JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
7877
- dist: trusty
7978
env:
80-
- JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
79+
- JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
8180

8281
before_install:
8382
- echo "before_install"
@@ -106,25 +105,17 @@ before_script:
106105

107106
script:
108107
- echo "script start"
108+
- source activate pandas-dev
109109
- ci/run_build_docs.sh
110-
- ci/script_single.sh
111-
- ci/script_multi.sh
112-
- ci/lint.sh
113-
- ci/doctests.sh
114-
- echo "checking imports"
115-
- source activate pandas && python ci/check_imports.py
116-
- echo "script done"
117-
118-
after_success:
119-
- ci/upload_coverage.sh
110+
- ci/run_tests.sh
120111

121112
after_script:
122113
- echo "after_script start"
123-
- source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
124-
- if [ -e /tmp/single.xml ]; then
125-
ci/print_skipped.py /tmp/single.xml;
114+
- source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
115+
- if [ -e test-data-single.xml ]; then
116+
ci/print_skipped.py test-data-single.xml;
126117
fi
127-
- if [ -e /tmp/multiple.xml ]; then
128-
ci/print_skipped.py /tmp/multiple.xml;
118+
- if [ -e test-data-multiple.xml ]; then
119+
ci/print_skipped.py test-data-multiple.xml;
129120
fi
130121
- echo "after_script done"

0 commit comments

Comments
 (0)