Skip to content

Commit c07adbd

Browse files
rs2rs2
authored
Merge pull request #4 from pandas-dev/master
Reverse merge-commit
2 parents 66aefc1 + bdb7a16 commit c07adbd

File tree

987 files changed

+156192
-104686
lines changed

Some content is hidden

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

987 files changed

+156192
-104686
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

‎.coveragerc

-27
This file was deleted.

‎.github/CODE_OF_CONDUCT.md

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Contributor Code of Conduct
2+
3+
As contributors and maintainers of this project, and in the interest of
4+
fostering an open and welcoming community, we pledge to respect all people who
5+
contribute through reporting issues, posting feature requests, updating
6+
documentation, submitting pull requests or patches, and other activities.
7+
8+
We are committed to making participation in this project a harassment-free
9+
experience for everyone, regardless of level of experience, gender, gender
10+
identity and expression, sexual orientation, disability, personal appearance,
11+
body size, race, ethnicity, age, religion, or nationality.
12+
13+
Examples of unacceptable behavior by participants include:
14+
15+
* The use of sexualized language or imagery
16+
* Personal attacks
17+
* Trolling or insulting/derogatory comments
18+
* Public or private harassment
19+
* Publishing other's private information, such as physical or electronic
20+
addresses, without explicit permission
21+
* Other unethical or unprofessional conduct
22+
23+
Project maintainers have the right and responsibility to remove, edit, or
24+
reject comments, commits, code, wiki edits, issues, and other contributions
25+
that are not aligned to this Code of Conduct, or to ban temporarily or
26+
permanently any contributor for other behaviors that they deem inappropriate,
27+
threatening, offensive, or harmful.
28+
29+
By adopting this Code of Conduct, project maintainers commit themselves to
30+
fairly and consistently applying these principles to every aspect of managing
31+
this project. Project maintainers who do not follow or enforce the Code of
32+
Conduct may be permanently removed from the project team.
33+
34+
This Code of Conduct applies both within project spaces and in public spaces
35+
when an individual is representing the project or its community.
36+
37+
A working group of community members is committed to promptly addressing any
38+
reported issues. The working group is made up of pandas contributors and users.
39+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
40+
reported by contacting the working group by e-mail ([email protected]).
41+
Messages sent to this e-mail address will not be publicly visible but only to
42+
the working group members. The working group currently includes
43+
44+
- Safia Abdalla
45+
- Tom Augspurger
46+
- Joris Van den Bossche
47+
- Camille Scott
48+
- Nathaniel Smith
49+
50+
All complaints will be reviewed and investigated and will result in a response
51+
that is deemed necessary and appropriate to the circumstances. Maintainers are
52+
obligated to maintain confidentiality with regard to the reporter of an
53+
incident.
54+
55+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
56+
version 1.3.0, available at
57+
[http://contributor-covenant.org/version/1/3/0/][version],
58+
and the [Swift Code of Conduct][swift].
59+
60+
[homepage]: http://contributor-covenant.org
61+
[version]: http://contributor-covenant.org/version/1/3/0/
62+
[swift]: https://swift.org/community/#code-of-conduct
63+

‎.gitignore

+7-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
.ipynb_checkpoints
2222
.tags
2323
.cache/
24+
.vscode/
2425

2526
# Compiled source #
2627
###################
@@ -60,6 +61,9 @@ dist
6061
.coverage
6162
coverage.xml
6263
coverage_html_report
64+
*.pytest_cache
65+
# hypothesis test database
66+
.hypothesis/
6367

6468
# OS generated files #
6569
######################
@@ -87,8 +91,8 @@ scikits
8791
*.c
8892
*.cpp
8993

90-
# Performance Testing #
91-
#######################
94+
# Unit / Performance Testing #
95+
##############################
9296
asv_bench/env/
9397
asv_bench/html/
9498
asv_bench/results/
@@ -106,4 +110,5 @@ doc/build/html/index.html
106110
doc/tmp.sv
107111
doc/source/styled.xlsx
108112
doc/source/templates/
113+
env/
109114
doc/source/savefig/

‎.pep8speaks.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ scanner:
66
pycodestyle:
77
max-line-length: 79
88
ignore: # Errors and warnings to ignore
9-
- E731
10-
- E402
9+
- E402, # module level import not at top of file
10+
- E731, # do not assign a lambda expression, use a def
11+
- W503 # line break before binary operator

‎.travis.yml

+17-22
Original file line numberDiff line numberDiff line change
@@ -30,71 +30,65 @@ matrix:
3030
exclude:
3131
# Exclude the default Python 3.5 build
3232
- python: 3.5
33+
3334
include:
34-
- os: osx
35-
language: generic
35+
- dist: trusty
3636
env:
37-
- JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network"
37+
- JOB="3.7" ENV_FILE="ci/travis-37.yaml" TEST_ARGS="--skip-slow --skip-network"
38+
3839
- dist: trusty
3940
env:
40-
- JOB="2.7_LOCALE" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
41+
- JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
4142
addons:
4243
apt:
4344
packages:
4445
- language-pack-zh-hans
4546
- dist: trusty
4647
env:
47-
- JOB="2.7" TEST_ARGS="--skip-slow" LINT=true
48+
- JOB="2.7, lint" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true
4849
addons:
4950
apt:
5051
packages:
5152
- python-gtk2
5253
- dist: trusty
5354
env:
54-
- JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
55-
- dist: trusty
56-
env:
57-
- JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
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
5856
# In allow_failures
5957
- dist: trusty
6058
env:
61-
- JOB="2.7_SLOW" SLOW=true
59+
- JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
6260
# In allow_failures
6361
- dist: trusty
6462
env:
65-
- JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
63+
- JOB="3.7, NumPy dev" ENV_FILE="ci/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate"
6664
addons:
6765
apt:
6866
packages:
6967
- xsel
7068
# In allow_failures
7169
- dist: trusty
7270
env:
73-
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
74-
# In allow_failures
75-
- dist: trusty
76-
env:
77-
- JOB="3.6_DOC" DOC=true
71+
- JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
7872
allow_failures:
7973
- dist: trusty
8074
env:
81-
- JOB="2.7_SLOW" SLOW=true
75+
- JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
8276
- dist: trusty
8377
env:
84-
- JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
78+
- JOB="3.7, NumPy dev" ENV_FILE="ci/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate"
8579
addons:
8680
apt:
8781
packages:
8882
- xsel
8983
- dist: trusty
9084
env:
91-
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
92-
- dist: trusty
93-
env:
94-
- JOB="3.6_DOC" DOC=true
85+
- JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
9586

9687
before_install:
9788
- echo "before_install"
89+
# set non-blocking IO on travis
90+
# https://github.com/travis-ci/travis-ci/issues/8920#issuecomment-352661024
91+
- python -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);'
9892
- source ci/travis_process_gbq_encryption.sh
9993
- export PATH="$HOME/miniconda3/bin:$PATH"
10094
- df -h
@@ -121,6 +115,7 @@ script:
121115
- ci/script_single.sh
122116
- ci/script_multi.sh
123117
- ci/lint.sh
118+
- ci/doctests.sh
124119
- echo "checking imports"
125120
- source activate pandas && python ci/check_imports.py
126121
- echo "script done"

0 commit comments

Comments
 (0)