Skip to content

Commit 6a92f07

Browse files
mroeschkemroeschke
committed
Merge remote-tracking branch 'upstream/master' into enh/on_bad_lines_callable
2 parents e04124a + eef0222 commit 6a92f07

File tree

4 files changed

+232
-11
lines changed

4 files changed

+232
-11
lines changed

‎doc/source/whatsnew/index.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ This is the list of changes to pandas between each release. For full details,
1010
see the `commit logs <https://github.com/pandas-dev/pandas/commits/>`_. For install and
1111
upgrade instructions, see :ref:`install`.
1212

13+
Version 1.5
14+
-----------
15+
16+
.. toctree::
17+
:maxdepth: 2
18+
19+
v1.5.0
20+
1321
Version 1.4
1422
-----------
1523

‎doc/source/whatsnew/v1.4.0.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ Performance improvements
661661
- Performance improvement in indexing with a :class:`Float64Index` (:issue:`43705`)
662662
- Performance improvement in indexing with a non-unique Index (:issue:`43792`)
663663
- Performance improvement in indexing with a listlike indexer on a :class:`MultiIndex` (:issue:`43370`)
664-
- Performance improvement in indexing with a :class:`MultiIndex` indexer on another :class:`MultiIndex` (:issue:43370`)
664+
- Performance improvement in indexing with a :class:`MultiIndex` indexer on another :class:`MultiIndex` (:issue:`43370`)
665665
- Performance improvement in :meth:`GroupBy.quantile` (:issue:`43469`, :issue:`43725`)
666666
- Performance improvement in :meth:`GroupBy.count` (:issue:`43730`, :issue:`43694`)
667667
- Performance improvement in :meth:`GroupBy.any` and :meth:`GroupBy.all` (:issue:`43675`, :issue:`42841`)

‎doc/source/whatsnew/v1.5.0.rst‎

Lines changed: 219 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
1+
.. _whatsnew_150:
2+
3+
What's new in 1.5.0 (??)
4+
------------------------
5+
6+
These are the changes in pandas 1.5.0. See :ref:`release` for a full changelog
7+
including other versions of pandas.
8+
9+
{{ header }}
10+
11+
.. ---------------------------------------------------------------------------
12+
.. _whatsnew_150.enhancements:
13+
14+
Enhancements
15+
~~~~~~~~~~~~
16+
17+
.. _whatsnew_150.enhancements.enhancement1:
18+
19+
enhancement1
20+
^^^^^^^^^^^^
21+
22+
.. _whatsnew_150.enhancements.enhancement2:
23+
24+
enhancement2
25+
^^^^^^^^^^^^
26+
27+
.. _whatsnew_150.enhancements.other:
28+
29+
Other enhancements
30+
^^^^^^^^^^^^^^^^^^
31+
-
32+
-
33+
34+
.. ---------------------------------------------------------------------------
35+
.. _whatsnew_150.notable_bug_fixes:
36+
37+
Notable bug fixes
38+
~~~~~~~~~~~~~~~~~
39+
40+
These are bug fixes that might have notable behavior changes.
41+
42+
.. _whatsnew_150.notable_bug_fixes.notable_bug_fix1:
43+
44+
notable_bug_fix1
45+
^^^^^^^^^^^^^^^^
46+
47+
.. _whatsnew_150.notable_bug_fixes.notable_bug_fix2:
48+
49+
notable_bug_fix2
50+
^^^^^^^^^^^^^^^^
51+
52+
.. ---------------------------------------------------------------------------
53+
.. _whatsnew_150.api_breaking:
54+
55+
Backwards incompatible API changes
56+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
57+
58+
.. _whatsnew_150.api_breaking.deps:
59+
60+
Increased minimum versions for dependencies
61+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
62+
Some minimum supported versions of dependencies were updated.
63+
If installed, we now require:
64+
65+
+-----------------+-----------------+----------+---------+
66+
| Package | Minimum Version | Required | Changed |
67+
+=================+=================+==========+=========+
68+
| | | X | X |
69+
+-----------------+-----------------+----------+---------+
70+
71+
For `optional libraries <https://pandas.pydata.org/docs/getting_started/install.html>`_ the general recommendation is to use the latest version.
72+
The following table lists the lowest version per library that is currently being tested throughout the development of pandas.
73+
Optional libraries below the lowest tested version may still work, but are not considered supported.
74+
75+
+-----------------+-----------------+---------+
76+
| Package | Minimum Version | Changed |
77+
+=================+=================+=========+
78+
| | | X |
79+
+-----------------+-----------------+---------+
80+
81+
See :ref:`install.dependencies` and :ref:`install.optional_dependencies` for more.
82+
83+
.. _whatsnew_150.api_breaking.other:
84+
85+
Other API changes
86+
^^^^^^^^^^^^^^^^^
87+
-
88+
-
89+
90+
.. ---------------------------------------------------------------------------
91+
.. _whatsnew_150.deprecations:
92+
93+
Deprecations
94+
~~~~~~~~~~~~
95+
-
96+
-
97+
98+
.. ---------------------------------------------------------------------------
99+
.. _whatsnew_150.performance:
100+
101+
Performance improvements
102+
~~~~~~~~~~~~~~~~~~~~~~~~
103+
-
104+
-
105+
106+
.. ---------------------------------------------------------------------------
107+
.. _whatsnew_150.bug_fixes:
108+
109+
Bug fixes
110+
~~~~~~~~~
111+
112+
Categorical
113+
^^^^^^^^^^^
114+
-
115+
-
116+
117+
Datetimelike
118+
^^^^^^^^^^^^
119+
-
120+
-
121+
122+
Timedelta
123+
^^^^^^^^^
124+
-
125+
-
126+
127+
Timezones
128+
^^^^^^^^^
129+
-
130+
-
131+
132+
Numeric
133+
^^^^^^^
134+
-
135+
-
136+
137+
Conversion
138+
^^^^^^^^^^
139+
-
140+
-
141+
142+
Strings
143+
^^^^^^^
144+
-
145+
-
146+
147+
Interval
148+
^^^^^^^^
149+
-
150+
-
151+
152+
Indexing
153+
^^^^^^^^
154+
-
155+
-
156+
157+
Missing
158+
^^^^^^^
159+
-
160+
-
161+
162+
MultiIndex
163+
^^^^^^^^^^
164+
-
165+
-
166+
167+
I/O
168+
^^^
169+
-
170+
-
171+
172+
Period
173+
^^^^^^
174+
-
175+
-
176+
177+
Plotting
178+
^^^^^^^^
179+
-
180+
-
181+
182+
Groupby/resample/rolling
183+
^^^^^^^^^^^^^^^^^^^^^^^^
184+
-
185+
-
186+
187+
Reshaping
188+
^^^^^^^^^
189+
-
190+
-
191+
192+
Sparse
193+
^^^^^^
194+
-
195+
-
196+
197+
ExtensionArray
198+
^^^^^^^^^^^^^^
199+
-
200+
-
201+
202+
Styler
203+
^^^^^^
204+
-
205+
-
206+
207+
Other
208+
^^^^^
209+
210+
.. ***DO NOT USE THIS SECTION***
211+
212+
-
213+
-
214+
215+
.. ---------------------------------------------------------------------------
216+
.. _whatsnew_150.contributors:
217+
218+
Contributors
219+
~~~~~~~~~~~~

‎pandas/_testing/_warnings.py‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from contextlib import contextmanager
44
import re
5-
import subprocess
5+
import sys
66
from typing import (
77
Sequence,
88
Type,
@@ -159,15 +159,9 @@ def _assert_caught_no_extra_warnings(
159159
if any(msg in str(actual_warning.message) for msg in unclosed_ssl):
160160
continue
161161
# GH 44844: Matplotlib leaves font files open during the entire process
162-
# Don't make CI flaky if ResourceWarning raised due to these open files.
163-
try:
164-
lsof = subprocess.check_output(
165-
["lsof", "-d", "0-25", "-F", "n"]
166-
).decode("utf-8")
167-
except (subprocess.CalledProcessError, FileNotFoundError):
168-
# FileNotFoundError for Windows
169-
lsof = ""
170-
if re.search(r"\.ttf|\.ttc|\.otf", lsof):
162+
# upon import. Don't make CI flaky if ResourceWarning raised
163+
# due to these open files.
164+
if any("matplotlib" in mod for mod in sys.modules):
171165
continue
172166

173167
extra_warnings.append(

0 commit comments

Comments
 (0)