Skip to content

Commit a5fee24

Browse files
authored
Merge branch 'master' into single_level
2 parents 65acb21 + 18ab444 commit a5fee24

File tree

129 files changed

+1937
-2014
lines changed

Some content is hidden

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

129 files changed

+1937
-2014
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ repos:
33
rev: 19.10b0
44
hooks:
55
- id: black
6-
language_version: python3.7
6+
language_version: python3
77
- repo: https://gitlab.com/pycqa/flake8
88
rev: 3.7.7
99
hooks:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
## What is it?
2222

23-
**pandas** is a Python package providing fast, flexible, and expressive data
23+
**pandas** is a Python package that provides fast, flexible, and expressive data
2424
structures designed to make working with "relational" or "labeled" data both
2525
easy and intuitive. It aims to be the fundamental high-level building block for
2626
doing practical, **real world** data analysis in Python. Additionally, it has
@@ -154,11 +154,11 @@ For usage questions, the best place to go to is [StackOverflow](https://stackove
154154
Further, general questions and discussions can also take place on the [pydata mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata).
155155

156156
## Discussion and Development
157-
Most development discussion is taking place on github in this repo. Further, the [pandas-dev mailing list](https://mail.python.org/mailman/listinfo/pandas-dev) can also be used for specialized discussions or design issues, and a [Gitter channel](https://gitter.im/pydata/pandas) is available for quick development related questions.
157+
Most development discussions take place on github in this repo. Further, the [pandas-dev mailing list](https://mail.python.org/mailman/listinfo/pandas-dev) can also be used for specialized discussions or design issues, and a [Gitter channel](https://gitter.im/pydata/pandas) is available for quick development related questions.
158158

159159
## Contributing to pandas [![Open Source Helpers](https://www.codetriage.com/pandas-dev/pandas/badges/users.svg)](https://www.codetriage.com/pandas-dev/pandas)
160160

161-
All contributions, bug reports, bug fixes, documentation improvements, enhancements and ideas are welcome.
161+
All contributions, bug reports, bug fixes, documentation improvements, enhancements, and ideas are welcome.
162162

163163
A detailed overview on how to contribute can be found in the **[contributing guide](https://pandas.pydata.org/docs/dev/development/contributing.html)**. There is also an [overview](.github/CONTRIBUTING.md) on GitHub.
164164

ci/azure/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
CONDA_PY: "36"
1414
PATTERN: "not slow and not network"
1515

16-
py37_np141:
16+
py37_np18:
1717
ENV_FILE: ci/deps/azure-windows-37.yaml
1818
CONDA_PY: "37"
1919
PATTERN: "not slow and not network"

ci/deps/azure-windows-37.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
- matplotlib=2.2.*
2323
- moto
2424
- numexpr
25-
- numpy=1.14.*
25+
- numpy=1.18.*
2626
- openpyxl
2727
- pyarrow=0.14
2828
- pytables

doc/source/development/contributing.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ want to clone your fork to your machine::
136136
This creates the directory `pandas-yourname` and connects your repository to
137137
the upstream (main project) *pandas* repository.
138138

139+
Note that performing a shallow clone (with ``--depth==N``, for some ``N`` greater
140+
or equal to 1) might break some tests and features as ``pd.show_versions()``
141+
as the version number cannot be computed anymore.
142+
139143
.. _contributing.dev_env:
140144

141145
Creating a development environment

doc/source/ecosystem.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,20 @@ provide a pandas-like and pandas-compatible toolkit for analytics on multi-
320320
dimensional arrays, rather than the tabular data for which pandas excels.
321321

322322

323+
.. _ecosystem.io:
324+
325+
IO
326+
--
327+
328+
`BCPandas <https://github.com/yehoshuadimarsky/bcpandas>`__
329+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
330+
331+
BCPandas provides high performance writes from pandas to Microsoft SQL Server,
332+
far exceeding the performance of the native ``df.to_sql`` method. Internally, it uses
333+
Microsoft's BCP utility, but the complexity is fully abstracted away from the end user.
334+
Rigorously tested, it is a complete replacement for ``df.to_sql``.
335+
336+
323337
.. _ecosystem.out-of-core:
324338

325339
Out-of-core

doc/source/getting_started/intro_tutorials/01_table_oriented.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ I want to store passenger data of the Titanic. For a number of passengers, I kno
5151
df
5252
5353
To manually store data in a table, create a ``DataFrame``. When using a Python dictionary of lists, the dictionary keys will be used as column headers and
54-
the values in each list as rows of the ``DataFrame``.
54+
the values in each list as columns of the ``DataFrame``.
5555

5656
.. raw:: html
5757

@@ -215,4 +215,4 @@ A more extended explanation to ``DataFrame`` and ``Series`` is provided in the :
215215

216216
.. raw:: html
217217

218-
</div>
218+
</div>

doc/source/getting_started/intro_tutorials/07_reshape_table_layout.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ I want the values for the three stations as separate columns next to each other
196196
197197
no2_subset.pivot(columns="location", values="value")
198198
199-
The :meth:`~pandas.pivot_table` function is purely reshaping of the data: a single value
199+
The :meth:`~pandas.pivot` function is purely reshaping of the data: a single value
200200
for each index/column combination is required.
201201

202202
.. raw:: html

doc/source/reference/general_utility_functions.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ Exceptions and warnings
3838
errors.AccessorRegistrationWarning
3939
errors.DtypeWarning
4040
errors.EmptyDataError
41-
errors.OutOfBoundsDatetime
41+
errors.InvalidIndexError
4242
errors.MergeError
4343
errors.NullFrequencyError
4444
errors.NumbaUtilError
45+
errors.OutOfBoundsDatetime
4546
errors.ParserError
4647
errors.ParserWarning
4748
errors.PerformanceWarning

doc/source/reference/groupby.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ application to columns of a specific data type.
116116
DataFrameGroupBy.quantile
117117
DataFrameGroupBy.rank
118118
DataFrameGroupBy.resample
119+
DataFrameGroupBy.sample
119120
DataFrameGroupBy.shift
120121
DataFrameGroupBy.size
121122
DataFrameGroupBy.skew

doc/source/themes/nature_with_gtoc/layout.html

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)