Skip to content

Commit 9bd1949

Browse files
sthagensthagen
authored
Merge pull request #207 from pandas-dev/master
Sync Fork from Upstream Repo
2 parents 19bda61 + 648eb40 commit 9bd1949

File tree

100 files changed

+1886
-735
lines changed

Some content is hidden

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

100 files changed

+1886
-735
lines changed

‎.github/workflows/ci.yml

+15-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: CI
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
67
pull_request:
78
branches:
89
- master
@@ -21,6 +22,10 @@ jobs:
2122
run:
2223
shell: bash -l {0}
2324

25+
concurrency:
26+
group: ${{ github.ref }}-checks
27+
cancel-in-progress: true
28+
2429
steps:
2530
- name: Checkout
2631
uses: actions/checkout@v2
@@ -94,8 +99,12 @@ jobs:
9499
web_and_docs:
95100
name: Web and docs
96101
runs-on: ubuntu-latest
97-
steps:
98102

103+
concurrency:
104+
group: ${{ github.ref }}-web-docs
105+
cancel-in-progress: true
106+
107+
steps:
99108
- name: Checkout
100109
uses: actions/checkout@v2
101110
with:
@@ -149,8 +158,11 @@ jobs:
149158
strategy:
150159
matrix:
151160
pattern: ["not slow and not network and not clipboard", "slow"]
152-
steps:
161+
concurrency:
162+
group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
163+
cancel-in-progress: true
153164

165+
steps:
154166
- name: Checkout
155167
uses: actions/checkout@v2
156168
with:

‎.github/workflows/database.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: Database
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
67
pull_request:
78
branches:
89
- master
@@ -29,6 +30,10 @@ jobs:
2930
ENV_FILE: [ci/deps/actions-37-db-min.yaml, ci/deps/actions-37-db.yaml]
3031
fail-fast: false
3132

33+
concurrency:
34+
group: ${{ github.ref }}-${{ matrix.ENV_FILE }}
35+
cancel-in-progress: true
36+
3237
services:
3338
mysql:
3439
image: mysql

‎.github/workflows/posix.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: Posix
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
67
pull_request:
78
branches:
89
- master
@@ -44,6 +45,9 @@ jobs:
4445
LC_ALL: ${{ matrix.settings[4] }}
4546
PANDAS_TESTING_MODE: ${{ matrix.settings[5] }}
4647
TEST_ARGS: ${{ matrix.settings[6] }}
48+
concurrency:
49+
group: ${{ github.ref }}-${{ matrix.settings[0] }}
50+
cancel-in-progress: true
4751

4852
steps:
4953
- name: Checkout

‎.github/workflows/pre-commit.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ name: pre-commit
33
on:
44
pull_request:
55
push:
6-
branches: [master]
6+
branches:
7+
- master
78

89
jobs:
910
pre-commit:
1011
runs-on: ubuntu-latest
12+
concurrency:
13+
group: ${{ github.ref }}-pre-commit
14+
cancel-in-progress: true
1115
steps:
1216
- uses: actions/checkout@v2
1317
- uses: actions/setup-python@v2

‎.github/workflows/python-dev.yml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ jobs:
1616
name: actions-310-dev
1717
timeout-minutes: 60
1818

19+
concurrency:
20+
group: ${{ github.ref }}-dev
21+
cancel-in-progress: true
22+
1923
steps:
2024
- uses: actions/checkout@v2
2125
with:

‎ci/deps/actions-37-db.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- botocore>=1.11
1717
- dask
1818
- fastparquet>=0.4.0
19-
- fsspec>=0.7.4
19+
- fsspec>=0.7.4, <2021.6.0
2020
- gcsfs>=0.6.0
2121
- geopandas
2222
- html5lib

‎ci/deps/actions-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414

1515
# pandas dependencies
1616
- botocore>=1.11
17-
- fsspec>=0.7.4
17+
- fsspec>=0.7.4, <2021.6.0
1818
- numpy=1.19
1919
- python-dateutil
2020
- nomkl

‎ci/deps/azure-windows-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
# pandas dependencies
1616
- beautifulsoup4
1717
- bottleneck
18-
- fsspec>=0.8.0
18+
- fsspec>=0.8.0, <2021.6.0
1919
- gcsfs>=0.6.0
2020
- html5lib
2121
- jinja2

‎doc/source/reference/io.rst

+47-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Pickling
1313
:toctree: api/
1414

1515
read_pickle
16+
DataFrame.to_pickle
1617

1718
Flat file
1819
~~~~~~~~~
@@ -21,6 +22,7 @@ Flat file
2122

2223
read_table
2324
read_csv
25+
DataFrame.to_csv
2426
read_fwf
2527

2628
Clipboard
@@ -29,30 +31,41 @@ Clipboard
2931
:toctree: api/
3032

3133
read_clipboard
34+
DataFrame.to_clipboard
3235

3336
Excel
3437
~~~~~
3538
.. autosummary::
3639
:toctree: api/
3740

3841
read_excel
42+
DataFrame.to_excel
3943
ExcelFile.parse
4044

45+
.. currentmodule:: pandas.io.formats.style
46+
47+
.. autosummary::
48+
:toctree: api/
49+
50+
Styler.to_excel
51+
52+
.. currentmodule:: pandas
53+
4154
.. autosummary::
4255
:toctree: api/
4356
:template: autosummary/class_without_autosummary.rst
4457

4558
ExcelWriter
4659

60+
.. currentmodule:: pandas.io.json
61+
4762
JSON
4863
~~~~
4964
.. autosummary::
5065
:toctree: api/
5166

5267
read_json
53-
json_normalize
54-
55-
.. currentmodule:: pandas.io.json
68+
to_json
5669

5770
.. autosummary::
5871
:toctree: api/
@@ -67,13 +80,40 @@ HTML
6780
:toctree: api/
6881

6982
read_html
83+
DataFrame.to_html
84+
85+
.. currentmodule:: pandas.io.formats.style
86+
87+
.. autosummary::
88+
:toctree: api/
89+
90+
Styler.to_html
91+
92+
.. currentmodule:: pandas
7093

7194
XML
7295
~~~~
7396
.. autosummary::
7497
:toctree: api/
7598

7699
read_xml
100+
DataFrame.to_xml
101+
102+
Latex
103+
~~~~~
104+
.. autosummary::
105+
:toctree: api/
106+
107+
DataFrame.to_latex
108+
109+
.. currentmodule:: pandas.io.formats.style
110+
111+
.. autosummary::
112+
:toctree: api/
113+
114+
Styler.to_latex
115+
116+
.. currentmodule:: pandas
77117

78118
HDFStore: PyTables (HDF5)
79119
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -101,13 +141,15 @@ Feather
101141
:toctree: api/
102142

103143
read_feather
144+
DataFrame.to_feather
104145

105146
Parquet
106147
~~~~~~~
107148
.. autosummary::
108149
:toctree: api/
109150

110151
read_parquet
152+
DataFrame.to_parquet
111153

112154
ORC
113155
~~~
@@ -138,6 +180,7 @@ SQL
138180
read_sql_table
139181
read_sql_query
140182
read_sql
183+
DataFrame.to_sql
141184

142185
Google BigQuery
143186
~~~~~~~~~~~~~~~
@@ -152,6 +195,7 @@ STATA
152195
:toctree: api/
153196

154197
read_stata
198+
DataFrame.to_stata
155199

156200
.. currentmodule:: pandas.io.stata
157201

‎doc/source/reference/style.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ Style application
3434

3535
Styler.apply
3636
Styler.applymap
37-
Styler.where
3837
Styler.format
38+
Styler.hide_index
39+
Styler.hide_columns
3940
Styler.set_td_classes
4041
Styler.set_table_styles
4142
Styler.set_table_attributes
4243
Styler.set_tooltips
4344
Styler.set_caption
45+
Styler.set_sticky
4446
Styler.set_properties
4547
Styler.set_uuid
4648
Styler.clear

‎doc/source/user_guide/indexing.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ Having a duplicated index will raise for a ``.reindex()``:
701701
.. code-block:: ipython
702702
703703
In [17]: s.reindex(labels)
704-
ValueError: cannot reindex from a duplicate axis
704+
ValueError: cannot reindex on an axis with duplicate labels
705705
706706
Generally, you can intersect the desired labels with the current
707707
axis, and then reindex.
@@ -717,7 +717,7 @@ However, this would *still* raise if your resulting index is duplicated.
717717
In [41]: labels = ['a', 'd']
718718
719719
In [42]: s.loc[s.index.intersection(labels)].reindex(labels)
720-
ValueError: cannot reindex from a duplicate axis
720+
ValueError: cannot reindex on an axis with duplicate labels
721721
722722
723723
.. _indexing.basics.partial_setting:

0 commit comments

Comments
 (0)