Skip to content

Commit 5d0fb84

Browse files
committed
Merge remote-tracking branch 'upstream/master' into GH38454-export-stata-value-labels
2 parents 831555e + 9c0a1eb commit 5d0fb84

File tree

8 files changed

+59
-82
lines changed

8 files changed

+59
-82
lines changed

azure-pipelines.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ trigger:
99
- 'doc/*'
1010

1111
pr:
12-
- master
13-
- 1.2.x
14-
- 1.3.x
12+
autoCancel: true
13+
branches:
14+
include:
15+
- master
16+
- 1.3.x
1517

1618
variables:
1719
PYTEST_WORKERS: auto

doc/source/user_guide/cookbook.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,7 @@ is closed.
13001300

13011301
.. ipython:: python
13021302
1303-
store = pd.HDFStore("test.h5", "w", diver="H5FD_CORE")
1303+
store = pd.HDFStore("test.h5", "w", driver="H5FD_CORE")
13041304
13051305
df = pd.DataFrame(np.random.randn(8, 3))
13061306
store["test"] = df

doc/source/user_guide/visualization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,7 @@ Starting in version 0.25, pandas can be extended with third-party plotting backe
17401740
main idea is letting users select a plotting backend different than the provided
17411741
one based on Matplotlib.
17421742

1743-
This can be done by passsing 'backend.module' as the argument ``backend`` in ``plot``
1743+
This can be done by passing 'backend.module' as the argument ``backend`` in ``plot``
17441744
function. For example:
17451745

17461746
.. code-block:: python

pandas/_typing.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
# and use a string literal forward reference to it in subsequent types
3838
# https://mypy.readthedocs.io/en/latest/common_issues.html#import-cycles
3939
if TYPE_CHECKING:
40-
from typing import TypedDict
41-
4240
import numpy.typing as npt
4341

4442
from pandas._libs import (
@@ -73,8 +71,6 @@
7371
from pandas.tseries.offsets import DateOffset
7472
else:
7573
npt: Any = None
76-
# typing.TypedDict does not exist until py38
77-
TypedDict = dict
7874

7975

8076
# array-like

pandas/core/generic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2988,15 +2988,15 @@ def to_clipboard(
29882988
--------
29892989
DataFrame.to_csv : Write a DataFrame to a comma-separated values
29902990
(csv) file.
2991-
read_clipboard : Read text from clipboard and pass to read_table.
2991+
read_clipboard : Read text from clipboard and pass to read_csv.
29922992
29932993
Notes
29942994
-----
29952995
Requirements for your platform.
29962996
29972997
- Linux : `xclip`, or `xsel` (with `PyQt4` modules)
29982998
- Windows : none
2999-
- OS X : none
2999+
- macOS : none
30003000
30013001
Examples
30023002
--------

pandas/io/formats/style_render.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
Optional,
1313
Sequence,
1414
Tuple,
15+
TypedDict,
1516
Union,
1617
)
1718
from uuid import uuid4
@@ -21,7 +22,6 @@
2122
from pandas._config import get_option
2223

2324
from pandas._libs import lib
24-
from pandas._typing import TypedDict
2525
from pandas.compat._optional import import_optional_dependency
2626

2727
from pandas.core.dtypes.generic import ABCSeries

pyproject.toml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,52 @@ markers = [
6767
"arm_slow: mark a test as slow for arm64 architecture",
6868
"arraymanager: mark a test to run with ArrayManager enabled",
6969
]
70+
71+
[tool.mypy]
72+
platform = "linux-64"
73+
ignore_missing_imports = true
74+
no_implicit_optional = true
75+
check_untyped_defs = true
76+
strict_equality = true
77+
warn_redundant_casts = true
78+
warn_unused_ignores = true
79+
show_error_codes = true
80+
81+
[[tool.mypy.overrides]]
82+
module = [
83+
"pandas.tests.*",
84+
"pandas._version",
85+
"pandas.io.clipboard",
86+
]
87+
check_untyped_defs = false
88+
89+
[[tool.mypy.overrides]]
90+
module = [
91+
"pandas.tests.apply.test_series_apply",
92+
"pandas.tests.arithmetic.conftest",
93+
"pandas.tests.arrays.sparse.test_combine_concat",
94+
"pandas.tests.dtypes.test_common",
95+
"pandas.tests.frame.methods.test_to_records",
96+
"pandas.tests.groupby.test_rank",
97+
"pandas.tests.groupby.transform.test_transform",
98+
"pandas.tests.indexes.interval.test_interval",
99+
"pandas.tests.indexing.test_categorical",
100+
"pandas.tests.io.excel.test_writers",
101+
"pandas.tests.reductions.test_reductions",
102+
"pandas.tests.test_expressions",
103+
]
104+
ignore_errors = true
105+
106+
# To be kept consistent with "Import Formatting" section in contributing.rst
107+
[tool.isort]
108+
known_pre_libs = "pandas._config"
109+
known_pre_core = ["pandas._libs", "pandas._typing", "pandas.util._*", "pandas.compat", "pandas.errors"]
110+
known_dtypes = "pandas.core.dtypes"
111+
known_post_core = ["pandas.tseries", "pandas.io", "pandas.plotting"]
112+
sections = ["FUTURE", "STDLIB", "THIRDPARTY" ,"PRE_LIBS" , "PRE_CORE", "DTYPES", "FIRSTPARTY", "POST_CORE", "LOCALFOLDER"]
113+
profile = "black"
114+
combine_as_imports = true
115+
force_grid_wrap = 2
116+
force_sort_within_sections = true
117+
skip_glob = "env"
118+
skip = "pandas/__init__.py"

setup.cfg

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -190,73 +190,3 @@ exclude_lines =
190190

191191
[coverage:html]
192192
directory = coverage_html_report
193-
194-
# To be kept consistent with "Import Formatting" section in contributing.rst
195-
[isort]
196-
known_pre_libs = pandas._config
197-
known_pre_core = pandas._libs,pandas._typing,pandas.util._*,pandas.compat,pandas.errors
198-
known_dtypes = pandas.core.dtypes
199-
known_post_core = pandas.tseries,pandas.io,pandas.plotting
200-
sections = FUTURE,STDLIB,THIRDPARTY,PRE_LIBS,PRE_CORE,DTYPES,FIRSTPARTY,POST_CORE,LOCALFOLDER
201-
profile = black
202-
combine_as_imports = True
203-
line_length = 88
204-
force_grid_wrap = True
205-
force_sort_within_sections = True
206-
skip_glob = env,
207-
skip = pandas/__init__.py
208-
209-
[mypy]
210-
platform = linux-64
211-
ignore_missing_imports = True
212-
no_implicit_optional = True
213-
check_untyped_defs = True
214-
strict_equality = True
215-
warn_redundant_casts = True
216-
warn_unused_ignores = True
217-
show_error_codes = True
218-
219-
[mypy-pandas.tests.*]
220-
check_untyped_defs = False
221-
222-
[mypy-pandas._version]
223-
check_untyped_defs = False
224-
225-
[mypy-pandas.io.clipboard]
226-
check_untyped_defs = False
227-
228-
[mypy-pandas.tests.apply.test_series_apply]
229-
ignore_errors = True
230-
231-
[mypy-pandas.tests.arithmetic.conftest]
232-
ignore_errors = True
233-
234-
[mypy-pandas.tests.arrays.sparse.test_combine_concat]
235-
ignore_errors = True
236-
237-
[mypy-pandas.tests.dtypes.test_common]
238-
ignore_errors = True
239-
240-
[mypy-pandas.tests.frame.methods.test_to_records]
241-
ignore_errors = True
242-
243-
[mypy-pandas.tests.groupby.test_rank]
244-
ignore_errors = True
245-
246-
[mypy-pandas.tests.groupby.transform.test_transform]
247-
ignore_errors = True
248-
249-
[mypy-pandas.tests.indexes.interval.test_interval]
250-
ignore_errors = True
251-
252-
[mypy-pandas.tests.indexing.test_categorical]
253-
ignore_errors = True
254-
255-
[mypy-pandas.tests.io.excel.test_writers]
256-
ignore_errors = True
257-
258-
[mypy-pandas.tests.reductions.test_reductions]
259-
ignore_errors = True
260-
261-
[mypy-pandas.tests.test_expressions]
262-
ignore_errors = True

0 commit comments

Comments
 (0)