Skip to content

Commit d4a3a4d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into examplesMay31
2 parents c7d3498 + a1f050a commit d4a3a4d

Some content is hidden

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

56 files changed

+581
-341
lines changed

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
image: ubuntu-2004:2022.04.1
2727
resource_class: arm.large
2828
environment:
29-
ENV_FILE: ci/deps/circle-38-arm64.yaml
3029
TRIGGER_SOURCE: << pipeline.trigger_source >>
3130
steps:
3231
- checkout

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
fetch-depth: 0
7474

7575
- name: Build wheels
76-
uses: pypa/cibuildwheel@v2.12.3
76+
uses: pypa/cibuildwheel@v2.13.0
7777
env:
7878
CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
7979

ci/code_checks.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -258,17 +258,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
258258
pandas.IntervalIndex.to_tuples \
259259
pandas.MultiIndex.dtypes \
260260
pandas.MultiIndex.drop \
261-
pandas.DatetimeIndex \
262-
pandas.DatetimeIndex.date \
263-
pandas.DatetimeIndex.time \
264-
pandas.DatetimeIndex.timetz \
265-
pandas.DatetimeIndex.dayofyear \
266-
pandas.DatetimeIndex.day_of_year \
267-
pandas.DatetimeIndex.quarter \
268-
pandas.DatetimeIndex.tz \
269-
pandas.DatetimeIndex.freqstr \
270-
pandas.DatetimeIndex.inferred_freq \
271-
pandas.DatetimeIndex.indexer_at_time \
272261
pandas.DatetimeIndex.indexer_between_time \
273262
pandas.DatetimeIndex.snap \
274263
pandas.DatetimeIndex.as_unit \
@@ -277,7 +266,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
277266
pandas.DatetimeIndex.mean \
278267
pandas.DatetimeIndex.std \
279268
pandas.TimedeltaIndex \
280-
pandas.TimedeltaIndex.days \
281269
pandas.TimedeltaIndex.seconds \
282270
pandas.TimedeltaIndex.microseconds \
283271
pandas.TimedeltaIndex.nanoseconds \

doc/source/development/contributing_codebase.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ install pandas) by typing::
770770
your installation is probably fine and you can start contributing!
771771

772772
Often it is worth running only a subset of tests first around your changes before running the
773-
entire suite (tip: you can use the [pandas-coverage app](https://pandas-coverage.herokuapp.com/)
773+
entire suite (tip: you can use the [pandas-coverage app](https://pandas-coverage.herokuapp.com/))
774774
to find out which tests hit the lines of code you've modified, and then run only those).
775775

776776
The easiest way to do this is with::

doc/source/getting_started/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Installation
2424

2525
.. code-block:: bash
2626
27-
conda install pandas
27+
conda install -c conda-forge pandas
2828
2929
.. grid-item-card:: Prefer pip?
3030
:class-card: install-card

doc/source/getting_started/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Installable with ``pip install "pandas[performance]"``
295295
===================================================== ================== ================== ===================================================================================================================================================================================
296296
Dependency Minimum Version pip extra Notes
297297
===================================================== ================== ================== ===================================================================================================================================================================================
298-
`numexpr <https://github.com/pydata/numexpr>`__ 2.8.0 performance Accelerates certain numerical operations by using uses multiple cores as well as smart chunking and caching to achieve large speedups
298+
`numexpr <https://github.com/pydata/numexpr>`__ 2.8.0 performance Accelerates certain numerical operations by using multiple cores as well as smart chunking and caching to achieve large speedups
299299
`bottleneck <https://github.com/pydata/bottleneck>`__ 1.3.4 performance Accelerates certain types of ``nan`` by using specialized cython routines to achieve large speedup.
300300
`numba <https://github.com/numba/numba>`__ 0.55.2 performance Alternative execution engine for operations that accept ``engine="numba"`` using a JIT compiler that translates Python functions to optimized machine code using the LLVM compiler.
301301
===================================================== ================== ================== ===================================================================================================================================================================================

doc/source/user_guide/basics.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2128,7 +2128,7 @@ different numeric dtypes will **NOT** be combined. The following example will gi
21282128
{
21292129
"A": pd.Series(np.random.randn(8), dtype="float16"),
21302130
"B": pd.Series(np.random.randn(8)),
2131-
"C": pd.Series(np.array(np.random.randn(8), dtype="uint8")),
2131+
"C": pd.Series(np.random.randint(0, 255, size=8), dtype="uint8"), # [0,255] (range of uint8)
21322132
}
21332133
)
21342134
df2

doc/source/whatsnew/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Version 2.0
2424
.. toctree::
2525
:maxdepth: 2
2626

27+
v2.0.3
2728
v2.0.2
2829
v2.0.1
2930
v2.0.0

doc/source/whatsnew/v2.0.0.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1413,4 +1413,4 @@ Other
14131413
Contributors
14141414
~~~~~~~~~~~~
14151415

1416-
.. contributors:: v1.5.0rc0..v2.0.0|HEAD
1416+
.. contributors:: v1.5.0rc0..v2.0.0

doc/source/whatsnew/v2.0.1.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ Other
6565
Contributors
6666
~~~~~~~~~~~~
6767

68-
.. contributors:: v2.0.0..v2.0.1|HEAD
68+
.. contributors:: v2.0.0..v2.0.1

0 commit comments

Comments
 (0)