Skip to content

Commit d760d11

Browse files
dannyi96dannyi96
authored
Merge branch 'main' into suffix_prefix_axis
2 parents 4ac6741 + 5224545 commit d760d11

File tree

13 files changed

+89
-22
lines changed

13 files changed

+89
-22
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test-arm:
55
machine:
66
image: ubuntu-2004:202101-01
7-
resource_class: arm.medium
7+
resource_class: arm.large
88
environment:
99
ENV_FILE: ci/deps/circle-38-arm64.yaml
1010
PYTEST_WORKERS: auto

‎.github/workflows/32-bit-linux.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214
paths-ignore:
1315
- "doc/**"

‎.github/workflows/code-checks.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214

1315
env:

‎.github/workflows/docbuild-and-upload.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
tags:
910
- '*'
1011
pull_request:
1112
branches:
1213
- main
14+
- 1.5.x
1315
- 1.4.x
1416

1517
env:

‎.github/workflows/macos-windows.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214
paths-ignore:
1315
- "doc/**"

‎.github/workflows/python-dev.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ on:
2424
push:
2525
branches:
2626
- main
27+
- 1.5.x
2728
- 1.4.x
2829
pull_request:
2930
branches:
3031
- main
32+
- 1.5.x
3133
- 1.4.x
3234
paths-ignore:
3335
- "doc/**"

‎.github/workflows/sdist.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214
types: [labeled, opened, synchronize, reopened]
1315
paths-ignore:

‎.github/workflows/ubuntu.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214
paths-ignore:
1315
- "doc/**"

‎doc/source/index.rst.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pandas documentation
1010

1111
**Date**: |today| **Version**: |version|
1212

13-
**Download documentation**: `PDF Version <pandas.pdf>`__ | `Zipped HTML <pandas.zip>`__
13+
**Download documentation**: `Zipped HTML <pandas.zip>`__
1414

1515
**Previous versions**: Documentation of previous pandas versions is available at
1616
`pandas.pydata.org <https://pandas.pydata.org/>`__.

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

Lines changed: 71 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ from_dummies
154154

155155
Added new function :func:`~pandas.from_dummies` to convert a dummy coded :class:`DataFrame` into a categorical :class:`DataFrame`.
156156

157-
Example::
158-
159157
.. ipython:: python
160158
161159
import pandas as pd
@@ -308,7 +306,7 @@ Other enhancements
308306
- :meth:`DataFrame.rolling` and :meth:`Series.rolling` now support a ``step`` parameter with fixed-length windows (:issue:`15354`)
309307
- Implemented a ``bool``-dtype :class:`Index`, passing a bool-dtype array-like to ``pd.Index`` will now retain ``bool`` dtype instead of casting to ``object`` (:issue:`45061`)
310308
- Implemented a complex-dtype :class:`Index`, passing a complex-dtype array-like to ``pd.Index`` will now retain complex dtype instead of casting to ``object`` (:issue:`45845`)
311-
- :class:`Series` and :class:`DataFrame` with ``IntegerDtype`` now supports bitwise operations (:issue:`34463`)
309+
- :class:`Series` and :class:`DataFrame` with :class:`IntegerDtype` now supports bitwise operations (:issue:`34463`)
312310
- Add ``milliseconds`` field support for :class:`.DateOffset` (:issue:`43371`)
313311
- :meth:`DataFrame.reset_index` now accepts a ``names`` argument which renames the index names (:issue:`6878`)
314312
- :func:`concat` now raises when ``levels`` is given but ``keys`` is None (:issue:`46653`)
@@ -319,7 +317,7 @@ Other enhancements
319317
- A :class:`errors.PerformanceWarning` is now thrown when using ``string[pyarrow]`` dtype with methods that don't dispatch to ``pyarrow.compute`` methods (:issue:`42613`)
320318
- Added ``numeric_only`` argument to :meth:`Resampler.sum`, :meth:`Resampler.prod`, :meth:`Resampler.min`, :meth:`Resampler.max`, :meth:`Resampler.first`, and :meth:`Resampler.last` (:issue:`46442`)
321319
- ``times`` argument in :class:`.ExponentialMovingWindow` now accepts ``np.timedelta64`` (:issue:`47003`)
322-
- :class:`.DataError`, :class:`.SpecificationError`, :class:`.SettingWithCopyError`, :class:`.SettingWithCopyWarning`, :class:`.NumExprClobberingError`, :class:`.UndefinedVariableError`, :class:`.IndexingError`, :class:`.PyperclipException`, :class:`.PyperclipWindowsException`, :class:`.CSSWarning`, :class:`.PossibleDataLossError`, :class:`.ClosedFileError`, :class:`.IncompatibilityWarning`, :class:`.AttributeConflictWarning`, :class:`.DatabaseError, :class:`.PossiblePrecisionLoss, :class:`.ValueLabelTypeMismatch, :class:`.InvalidColumnName, and :class:`.CategoricalConversionWarning` are now exposed in ``pandas.errors`` (:issue:`27656`)
320+
- :class:`.DataError`, :class:`.SpecificationError`, :class:`.SettingWithCopyError`, :class:`.SettingWithCopyWarning`, :class:`.NumExprClobberingError`, :class:`.UndefinedVariableError`, :class:`.IndexingError`, :class:`.PyperclipException`, :class:`.PyperclipWindowsException`, :class:`.CSSWarning`, :class:`.PossibleDataLossError`, :class:`.ClosedFileError`, :class:`.IncompatibilityWarning`, :class:`.AttributeConflictWarning`, :class:`.DatabaseError`, :class:`.PossiblePrecisionLoss`, :class:`.ValueLabelTypeMismatch`, :class:`.InvalidColumnName`, and :class:`.CategoricalConversionWarning` are now exposed in ``pandas.errors`` (:issue:`27656`)
323321
- Added ``check_like`` argument to :func:`testing.assert_series_equal` (:issue:`47247`)
324322
- Add support for :meth:`.GroupBy.ohlc` for extension array dtypes (:issue:`37493`)
325323
- Allow reading compressed SAS files with :func:`read_sas` (e.g., ``.sas7bdat.gz`` files)
@@ -492,16 +490,6 @@ Calling :meth:`.DataFrameGroupBy.value_counts` with ``observed=True`` would inco
492490
Backwards incompatible API changes
493491
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
494492

495-
.. _whatsnew_150.api_breaking.api_breaking1:
496-
497-
api_breaking_change1
498-
^^^^^^^^^^^^^^^^^^^^
499-
500-
.. _whatsnew_150.api_breaking.api_breaking2:
501-
502-
api_breaking_change2
503-
^^^^^^^^^^^^^^^^^^^^
504-
505493
.. _whatsnew_150.api_breaking.deps:
506494

507495
Increased minimum versions for dependencies
@@ -568,7 +556,73 @@ Optional libraries below the lowest tested version may still work, but are not c
568556
+-----------------+-----------------+---------+
569557
| Package | Minimum Version | Changed |
570558
+=================+=================+=========+
571-
| | | X |
559+
| beautifulsoup4 |4.9.3 | X |
560+
+-----------------+-----------------+---------+
561+
| blosc |1.21.0 | X |
562+
+-----------------+-----------------+---------+
563+
| bottleneck |1.3.2 | X |
564+
+-----------------+-----------------+---------+
565+
| brotlipy |0.7.0 | |
566+
+-----------------+-----------------+---------+
567+
| fastparquet |0.4.0 | |
568+
+-----------------+-----------------+---------+
569+
| fsspec |2021.05.0 | X |
570+
+-----------------+-----------------+---------+
571+
| html5lib |1.1 | |
572+
+-----------------+-----------------+---------+
573+
| hypothesis |6.13.0 | X |
574+
+-----------------+-----------------+---------+
575+
| gcsfs |2021.05.0 | X |
576+
+-----------------+-----------------+---------+
577+
| jinja2 |3.0.0 | X |
578+
+-----------------+-----------------+---------+
579+
| lxml |4.6.3 | X |
580+
+-----------------+-----------------+---------+
581+
| matplotlib |3.3.2 | |
582+
+-----------------+-----------------+---------+
583+
| numba |0.53.1 | X |
584+
+-----------------+-----------------+---------+
585+
| numexpr |2.7.3 | X |
586+
+-----------------+-----------------+---------+
587+
| odfpy |1.4.1 | |
588+
+-----------------+-----------------+---------+
589+
| openpyxl |3.0.7 | X |
590+
+-----------------+-----------------+---------+
591+
| pandas-gbq |0.15.0 | X |
592+
+-----------------+-----------------+---------+
593+
| psycopg2 |2.8.6 | X |
594+
+-----------------+-----------------+---------+
595+
| pyarrow |1.0.1 | |
596+
+-----------------+-----------------+---------+
597+
| pymysql |1.0.2 | X |
598+
+-----------------+-----------------+---------+
599+
| pyreadstat |1.1.2 | X |
600+
+-----------------+-----------------+---------+
601+
| pytables |3.6.1 | |
602+
+-----------------+-----------------+---------+
603+
| python-snappy |0.6.0 | |
604+
+-----------------+-----------------+---------+
605+
| pyxlsb |1.0.8 | X |
606+
+-----------------+-----------------+---------+
607+
| s3fs |2021.05.0 | X |
608+
+-----------------+-----------------+---------+
609+
| scipy |1.7.1 | X |
610+
+-----------------+-----------------+---------+
611+
| sqlalchemy |1.4.16 | X |
612+
+-----------------+-----------------+---------+
613+
| tabulate |0.8.9 | X |
614+
+-----------------+-----------------+---------+
615+
| tzdata |2022a | |
616+
+-----------------+-----------------+---------+
617+
| xarray |0.19.0 | X |
618+
+-----------------+-----------------+---------+
619+
| xlrd |2.0.1 | |
620+
+-----------------+-----------------+---------+
621+
| xlsxwriter |1.4.3 | X |
622+
+-----------------+-----------------+---------+
623+
| xlwt |1.3.0 | |
624+
+-----------------+-----------------+---------+
625+
| zstandard |0.15.2 | |
572626
+-----------------+-----------------+---------+
573627

574628
See :ref:`install.dependencies` and :ref:`install.optional_dependencies` for more.
@@ -704,7 +758,7 @@ retained by specifying ``group_keys=False``.
704758

705759
Inplace operation when setting values with ``loc`` and ``iloc``
706760
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
707-
Most of the time setting values with ``frame.iloc`` attempts to set values
761+
Most of the time setting values with :meth:`DataFrame.iloc` attempts to set values
708762
inplace, only falling back to inserting a new array if necessary. There are
709763
some cases where this rule is not followed, for example when setting an entire
710764
column from an array with different dtype:
@@ -925,7 +979,7 @@ Categorical
925979
^^^^^^^^^^^
926980
- Bug in :meth:`.Categorical.view` not accepting integer dtypes (:issue:`25464`)
927981
- Bug in :meth:`.CategoricalIndex.union` when the index's categories are integer-dtype and the index contains ``NaN`` values incorrectly raising instead of casting to ``float64`` (:issue:`45362`)
928-
- Bug in :meth:`DataFrame.concat` when concatenating two (or more) unordered ``CategoricalIndex`` variables, whose categories are permutations, yields incorrect index values (:issue:`24845`)
982+
- Bug in :meth:`concat` when concatenating two (or more) unordered :class:`CategoricalIndex` variables, whose categories are permutations, yields incorrect index values (:issue:`24845`)
929983

930984
Datetimelike
931985
^^^^^^^^^^^^

0 commit comments

Comments
 (0)