Skip to content

Commit 260b482

Browse files
CheuktingCheukting
committed
Merge branch 'master' into Doc_str_strip
2 parents 51e459d + 7b257cf commit 260b482

File tree

87 files changed

+20745
-2
lines changed

Some content is hidden

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

87 files changed

+20745
-2
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,7 @@ doc/tmp.sv
109109
doc/source/styled.xlsx
110110
doc/source/templates/
111111
env/
112+
<<<<<<< HEAD
112113
doc/source/savefig/
114+
=======
115+
>>>>>>> a00154dcfe5057cb3fd86653172e74b6893e337d

‎asv_bench/benchmarks/plotting.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,44 @@ def time_frame_plot(self):
2525
self.df.plot()
2626

2727

28+
class Plotting(object):
29+
goal_time = 0.2
30+
31+
def setup(self):
32+
import matplotlib
33+
matplotlib.use('Agg')
34+
self.s = Series(np.random.randn(1000000))
35+
self.df = DataFrame({'col': self.s})
36+
37+
def time_series_plot(self):
38+
self.s.plot()
39+
40+
def time_frame_plot(self):
41+
self.df.plot()
42+
43+
2844
class TimeseriesPlotting(object):
2945

3046
goal_time = 0.2
3147

3248
def setup(self):
49+
<<<<<<< HEAD
50+
=======
51+
import matplotlib
52+
matplotlib.use('Agg')
53+
>>>>>>> a00154dcfe5057cb3fd86653172e74b6893e337d
3354
N = 2000
3455
M = 5
3556
idx = date_range('1/1/1975', periods=N)
3657
self.df = DataFrame(np.random.randn(N, M), index=idx)
3758

59+
<<<<<<< HEAD
3860
idx_irregular = DatetimeIndex(np.concatenate((idx.values[0:10],
3961
idx.values[12:])))
62+
=======
63+
idx_irregular = pd.DatetimeIndex(np.concatenate((idx.values[0:10],
64+
idx.values[12:])))
65+
>>>>>>> a00154dcfe5057cb3fd86653172e74b6893e337d
4066
self.df2 = DataFrame(np.random.randn(len(idx_irregular), M),
4167
index=idx_irregular)
4268

‎ci/environment-dev.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,20 @@ channels:
55
dependencies:
66
- Cython
77
- NumPy
8+
<<<<<<< HEAD
89
- flake8
910
- moto
1011
- pytest>=3.1
1112
- python-dateutil>=2.5.0
1213
- python=3
1314
- pytz
1415
- setuptools>=24.2.0
16+
=======
17+
- moto
18+
- pytest
19+
- python-dateutil
20+
- python=3
21+
- pytz
22+
- setuptools
23+
>>>>>>> a00154dcfe5057cb3fd86653172e74b6893e337d
1524
- sphinx

‎ci/install_travis.sh

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,62 @@ time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1
8484

8585
source activate pandas
8686

87+
<<<<<<< HEAD
88+
=======
89+
# may have addtl installation instructions for this build
90+
echo
91+
echo "[build addtl installs]"
92+
REQ="ci/requirements-${JOB}.build.sh"
93+
if [ -e ${REQ} ]; then
94+
time bash $REQ || exit 1
95+
fi
96+
97+
time conda install -n pandas pytest>=3.1.0
98+
time pip install pytest-xdist moto
99+
100+
if [ "$LINT" ]; then
101+
conda install flake8=3.4.1
102+
pip install cpplint
103+
fi
104+
105+
if [ "$COVERAGE" ]; then
106+
pip install coverage pytest-cov
107+
fi
108+
109+
echo
110+
if [ -z "$BUILD_TEST" ]; then
111+
112+
# build but don't install
113+
echo "[build em]"
114+
time python setup.py build_ext --inplace || exit 1
115+
116+
fi
117+
118+
# we may have run installations
119+
echo
120+
echo "[conda installs]"
121+
REQ="ci/requirements-${JOB}.run"
122+
if [ -e ${REQ} ]; then
123+
time conda install -n pandas --file=${REQ} || exit 1
124+
fi
125+
126+
# we may have additional pip installs
127+
echo
128+
echo "[pip installs]"
129+
REQ="ci/requirements-${JOB}.pip"
130+
if [ -e ${REQ} ]; then
131+
pip install -r $REQ
132+
fi
133+
134+
# may have addtl installation instructions for this build
135+
echo
136+
echo "[addtl installs]"
137+
REQ="ci/requirements-${JOB}.sh"
138+
if [ -e ${REQ} ]; then
139+
time bash $REQ || exit 1
140+
fi
141+
142+
>>>>>>> a00154dcfe5057cb3fd86653172e74b6893e337d
87143
# remove any installed pandas package
88144
# w/o removing anything else
89145
echo

‎ci/requirements-2.7_BUILD_TEST.pip

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
xarray
2+
geopandas
3+
seaborn
4+
pandas_datareader
5+
statsmodels
6+
scikit-learn

‎ci/requirements-3.5.pip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
xarray==0.9.1
2+
pandas_gbq

‎ci/requirements-3.6.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
source activate pandas
4+
5+
echo "[install 3.6 downstream deps]"
6+
7+
conda install -n pandas -c conda-forge pandas-datareader xarray geopandas seaborn statsmodels scikit-learn dask

‎ci/requirements-3.6_WIN.run

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
python-dateutil
2+
pytz
3+
numpy=1.13*
4+
bottleneck
5+
openpyxl
6+
xlsxwriter
7+
xlrd
8+
xlwt
9+
scipy
10+
feather-format
11+
numexpr
12+
pytables
13+
matplotlib
14+
blosc
15+
fastparquet
16+
pyarrow

‎ci/requirements-optional-conda.txt renamed to ‎ci/requirements-optional-conda.txt~HEAD

File renamed without changes.

‎ci/requirements-optional-conda.txt~a00154dcfe5057cb3fd86653172e74b6893e337d

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
beautifulsoup4
2+
blosc
3+
bottleneck
4+
fastparquet
5+
feather-format
6+
html5lib
7+
ipython
8+
ipykernel
9+
jinja2
10+
lxml
11+
matplotlib
12+
nbsphinx
13+
numexpr
14+
openpyxl
15+
pyarrow
16+
pymysql
17+
pytables
18+
pytest-cov
19+
pytest-xdist
20+
s3fs
21+
scipy
22+
seaborn
23+
sqlalchemy
24+
xarray
25+
xlrd
26+
xlsxwriter
27+
xlwt

‎ci/requirements-optional-pip.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
# This file was autogenerated by scripts/convert_deps.py
2+
<<<<<<< HEAD
23
# Do not modify directly
34
beautifulsoup4>=4.2.1
5+
=======
6+
# Do not modify directlybeautifulsoup4
7+
>>>>>>> a00154dcfe5057cb3fd86653172e74b6893e337d
48
blosc
59
bottleneck
610
fastparquet
711
feather-format
812
html5lib
13+
<<<<<<< HEAD
914
ipython>=5.6.0
1015
ipykernel
16+
=======
17+
ipython
18+
>>>>>>> a00154dcfe5057cb3fd86653172e74b6893e337d
1119
jinja2
1220
lxml
1321
matplotlib

‎ci/requirements_dev.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@
22
# Do not modify directly
33
Cython
44
NumPy
5+
<<<<<<< HEAD
56
flake8
67
moto
78
pytest>=3.1
89
python-dateutil>=2.5.0
910
pytz
1011
setuptools>=24.2.0
1112
sphinx
13+
=======
14+
moto
15+
pytest
16+
python-dateutil
17+
pytz
18+
setuptools
19+
sphinx
20+
>>>>>>> a00154dcfe5057cb3fd86653172e74b6893e337d

‎doc/source/api.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,6 +2424,17 @@ The following functions are contained in the `pandas.plotting` module.
24242424
register_matplotlib_converters
24252425
scatter_matrix
24262426

2427+
Plotting
2428+
~~~~~~~~
2429+
2430+
.. currentmodule:: pandas
2431+
2432+
.. autosummary::
2433+
:toctree: generated/
2434+
2435+
plotting.register_matplotlib_converters
2436+
plotting.deregister_matplotlib_converters
2437+
24272438
.. currentmodule:: pandas
24282439

24292440
General utility functions

0 commit comments

Comments
 (0)