Skip to content

Commit 1af0928

Browse files
jrebackjreback
authored
Merge branch 'main' into 45224
2 parents 073013f + 579ec33 commit 1af0928

File tree

179 files changed

+2814
-1593
lines changed

Some content is hidden

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

179 files changed

+2814
-1593
lines changed

‎.github/workflows/assign.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ on:
44
types: created
55

66
jobs:
7-
one:
7+
issue_assign:
88
runs-on: ubuntu-latest
99
steps:
1010
- if: github.event.comment.body == 'take'
11-
name:
1211
run: |
1312
echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"
1413
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"assignees": ["${{ github.event.comment.user.login }}"]}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/assignees

‎.github/workflows/code-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Install pyright
7676
# note: keep version in sync with .pre-commit-config.yaml
77-
run: npm install -g [email protected].202
77+
run: npm install -g [email protected].212
7878

7979
- name: Build Pandas
8080
id: build

‎.github/workflows/datamanger.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
branches:
1010
- main
1111
- 1.4.x
12+
paths-ignore:
13+
- "doc/**"
1214

1315
env:
1416
ENV_FILE: environment.yml
@@ -26,12 +28,9 @@ jobs:
2628
AWS_SECRET_ACCESS_KEY: foobar_secret
2729
ports:
2830
- 5000:5000
29-
strategy:
30-
matrix:
31-
pattern: ["not slow and not network and not clipboard", "slow"]
3231
concurrency:
3332
# https://github.community/t/concurrecy-not-work-for-push/183068/7
34-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-data_manager-${{ matrix.pattern }}
33+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-data_manager
3534
cancel-in-progress: true
3635

3736
steps:
@@ -46,12 +45,9 @@ jobs:
4645
- name: Run tests
4746
env:
4847
PANDAS_DATA_MANAGER: array
49-
PATTERN: ${{ matrix.pattern }}
48+
PATTERN: "not network and not clipboard"
5049
PYTEST_WORKERS: "auto"
5150
PYTEST_TARGET: pandas
5251
run: |
5352
source activate pandas-dev
5453
ci/run_tests.sh
55-
56-
- name: Print skipped tests
57-
run: python ci/print_skipped.py

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,7 @@ jobs:
4040
- name: Build documentation
4141
run: |
4242
source activate pandas-dev
43-
doc/make.py --warnings-are-errors | tee sphinx.log ; exit ${PIPESTATUS[0]}
44-
45-
# This can be removed when the ipython directive fails when there are errors,
46-
# including the `tee sphinx.log` in te previous step (https://github.com/ipython/ipython/issues/11547)
47-
- name: Check ipython directive errors
48-
run: "! grep -B10 \"^<<<-------------------------------------------------------------------------$\" sphinx.log"
43+
doc/make.py --warnings-are-errors
4944
5045
- name: Install ssh key
5146
run: |

‎.github/workflows/posix.yml

+6-13
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,14 @@ jobs:
2626
matrix:
2727
settings: [
2828
[actions-38-downstream_compat.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
29-
[actions-38-minimum_versions.yaml, "slow", "", "", "", "", ""],
30-
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
29+
[actions-38-minimum_versions.yaml, "not clipboard", "", "", "", "", ""],
3130
[actions-38.yaml, "not slow and not network", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
3231
[actions-38.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
33-
[actions-38.yaml, "not slow and not clipboard", "", "", "", "", ""],
34-
[actions-38.yaml, "slow", "", "", "", "", ""],
32+
[actions-38.yaml, "not clipboard", "", "", "", "", ""],
3533
[actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", "--max-worker-restart 0"],
36-
[actions-39.yaml, "slow", "", "", "", "", ""],
37-
[actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""],
38-
[actions-310-numpydev.yaml, "not slow and not network", "xclip", "", "", "deprecate", "-W error"],
39-
[actions-310.yaml, "not slow and not clipboard", "", "", "", "", ""],
40-
[actions-310.yaml, "slow", "", "", "", "", ""],
34+
[actions-39.yaml, "not clipboard", "", "", "", "", ""],
35+
[actions-310-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
36+
[actions-310.yaml, "not clipboard", "", "", "", "", ""],
4137
]
4238
fail-fast: false
4339
env:
@@ -54,7 +50,7 @@ jobs:
5450
COVERAGE: ${{ !contains(matrix.settings[0], 'pypy') }}
5551
concurrency:
5652
# https://github.community/t/concurrecy-not-work-for-push/183068/7
57-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}-${{ matrix.settings[1] }}
53+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}-${{ matrix.settings[1] }}-${{ matrix.settings[2] }}
5854
cancel-in-progress: true
5955

6056
services:
@@ -154,9 +150,6 @@ jobs:
154150
path: test-data.xml
155151
if: failure()
156152

157-
- name: Print skipped tests
158-
run: python ci/print_skipped.py
159-
160153
- name: Upload coverage to Codecov
161154
uses: codecov/codecov-action@v2
162155
with:

‎.github/workflows/python-dev.yml

-4
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ jobs:
8585
path: test-data.xml
8686
if: failure()
8787

88-
- name: Print skipped tests
89-
run: |
90-
python ci/print_skipped.py
91-
9288
- name: Report Coverage
9389
run: |
9490
coverage report -m

‎.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ repos:
8484
pass_filenames: false
8585
types: [python]
8686
stages: [manual]
87-
# note: keep version in sync with .github/workflows/ci.yml
88-
additional_dependencies: ['[email protected].202']
87+
# note: keep version in sync with .github/workflows/code-checks.yml
88+
additional_dependencies: ['[email protected].212']
8989
- repo: local
9090
hooks:
9191
- id: flake8-rst

‎asv_bench/benchmarks/frame_methods.py

+3
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,9 @@ def time_frame_duplicated(self):
611611
def time_frame_duplicated_wide(self):
612612
self.df2.duplicated()
613613

614+
def time_frame_duplicated_subset(self):
615+
self.df.duplicated(subset=["a"])
616+
614617

615618
class XS:
616619

‎asv_bench/benchmarks/groupby.py

+9
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,12 @@ def setup(self):
735735
data = DataFrame(arr, index=index, columns=["col1", "col20", "col3"])
736736
self.df = data
737737

738+
n = 1000
739+
self.df_wide = DataFrame(
740+
np.random.randn(n, n),
741+
index=np.random.choice(range(10), n),
742+
)
743+
738744
n = 20000
739745
self.df1 = DataFrame(
740746
np.random.randint(1, n, (n, 3)), columns=["jim", "joe", "jolie"]
@@ -754,6 +760,9 @@ def time_transform_lambda_max(self):
754760
def time_transform_ufunc_max(self):
755761
self.df.groupby(level="lev1").transform(np.max)
756762

763+
def time_transform_lambda_max_wide(self):
764+
self.df_wide.groupby(level=0).transform(lambda x: np.max(x, axis=0))
765+
757766
def time_transform_multi_key1(self):
758767
self.df1.groupby(["jim", "joe"])["jolie"].transform("max")
759768

‎asv_bench/benchmarks/index_cached_properties.py

-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ def time_values(self, index_type):
5656
def time_shape(self, index_type):
5757
self.idx.shape
5858

59-
def time_is_monotonic(self, index_type):
60-
self.idx.is_monotonic
61-
6259
def time_is_monotonic_decreasing(self, index_type):
6360
self.idx.is_monotonic_decreasing
6461

‎asv_bench/benchmarks/multiindex_object.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def time_get_indexer_and_pad(self):
112112
self.mi_int.get_indexer(self.other_mi_many_mismatches, method="pad")
113113

114114
def time_is_monotonic(self):
115-
self.mi_int.is_monotonic
115+
self.mi_int.is_monotonic_increasing
116116

117117

118118
class Duplicated:

‎asv_bench/benchmarks/series_methods.py

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import numpy as np
44

55
from pandas import (
6+
Index,
67
NaT,
78
Series,
89
date_range,
@@ -12,20 +13,23 @@
1213

1314

1415
class SeriesConstructor:
15-
16-
params = [None, "dict"]
17-
param_names = ["data"]
18-
19-
def setup(self, data):
16+
def setup(self):
2017
self.idx = date_range(
2118
start=datetime(2015, 10, 26), end=datetime(2016, 1, 1), freq="50s"
2219
)
23-
dict_data = dict(zip(self.idx, range(len(self.idx))))
24-
self.data = None if data is None else dict_data
20+
self.data = dict(zip(self.idx, range(len(self.idx))))
21+
self.array = np.array([1, 2, 3])
22+
self.idx2 = Index(["a", "b", "c"])
2523

26-
def time_constructor(self, data):
24+
def time_constructor_dict(self):
2725
Series(data=self.data, index=self.idx)
2826

27+
def time_constructor_no_data(self):
28+
Series(data=None, index=self.idx)
29+
30+
def time_constructor_fastpath(self):
31+
Series(self.array, index=self.idx2, name="name", fastpath=True)
32+
2933

3034
class ToFrame:
3135
params = [["int64", "datetime64[ns]", "category", "Int64"], [None, "foo"]]

‎azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trigger:
66
- 1.4.x
77
paths:
88
exclude:
9-
- 'doc/*'
9+
- 'doc/**'
1010

1111
pr:
1212
autoCancel: true

‎ci/azure/posix.yml

-5
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,3 @@ jobs:
6161
testResultsFiles: 'test-data.xml'
6262
testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
6363
displayName: 'Publish test results'
64-
65-
- script: |
66-
source activate pandas-dev
67-
python ci/print_skipped.py
68-
displayName: 'Print skipped tests'

‎ci/azure/windows.yml

-5
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,3 @@ jobs:
7979
testResultsFiles: 'test-data.xml'
8080
testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
8181
displayName: 'Publish test results'
82-
83-
- bash: |
84-
source activate pandas-dev
85-
python ci/print_skipped.py
86-
displayName: 'Print skipped tests'

‎ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pandas-dev
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.9
5+
- python=3.10
66

77
# test dependencies
88
- cython=0.29.24

‎ci/print_skipped.py

-38
This file was deleted.

‎ci/run_tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
2424
XVFB="xvfb-run "
2525
fi
2626

27-
PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"
27+
PYTEST_CMD="${XVFB}pytest -r fEs -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"
2828

2929
if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then
3030
PYTEST_CMD="$PYTEST_CMD --ignore=pandas/tests/plotting/"

‎doc/source/development/contributing_environment.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ Consult the docs for setting up pyenv `here <https://github.com/pyenv/pyenv>`__.
222222
pyenv virtualenv <version> <name-to-give-it>
223223
224224
# For instance:
225-
pyenv virtualenv 3.7.6 pandas-dev
225+
pyenv virtualenv 3.9.10 pandas-dev
226226
227227
# Activate the virtualenv
228228
pyenv activate pandas-dev

‎doc/source/ecosystem.rst

+11
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,15 @@ Geopandas extends pandas data objects to include geographic information which su
363363
geometric operations. If your work entails maps and geographical coordinates, and
364364
you love pandas, you should take a close look at Geopandas.
365365

366+
`staircase <https://github.com/staircase-dev/staircase>`__
367+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
368+
369+
staircase is a data analysis package, built upon pandas and numpy, for modelling and
370+
manipulation of mathematical step functions. It provides a rich variety of arithmetic
371+
operations, relational operations, logical operations, statistical operations and
372+
aggregations for step functions defined over real numbers, datetime and timedelta domains.
373+
374+
366375
`xarray <https://github.com/pydata/xarray>`__
367376
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
368377

@@ -564,6 +573,7 @@ Library Accessor Classes Description
564573
`composeml`_ ``slice`` ``DataFrame`` Provides a generator for enhanced data slicing.
565574
`datatest`_ ``validate`` ``Series``, ``DataFrame``, ``Index`` Provides validation, differences, and acceptance managers.
566575
`woodwork`_ ``ww`` ``Series``, ``DataFrame`` Provides physical, logical, and semantic data typing information for Series and DataFrames.
576+
`staircase`_ ``sc`` ``Series`` Provides methods for querying, aggregating and plotting step functions
567577
================== ============ ==================================== ===============================================================================
568578

569579
.. _cyberpandas: https://cyberpandas.readthedocs.io/en/latest
@@ -576,6 +586,7 @@ Library Accessor Classes Description
576586
.. _composeml: https://github.com/alteryx/compose
577587
.. _datatest: https://datatest.readthedocs.io/en/stable/
578588
.. _woodwork: https://github.com/alteryx/woodwork
589+
.. _staircase: https://www.staircase.dev/
579590

580591
Development tools
581592
-----------------

‎doc/source/getting_started/comparison/comparison_with_sql.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ structure.
1818
1919
url = (
2020
"https://raw.github.com/pandas-dev"
21-
"/pandas/master/pandas/tests/io/data/csv/tips.csv"
21+
"/pandas/main/pandas/tests/io/data/csv/tips.csv"
2222
)
2323
tips = pd.read_csv(url)
2424
tips

0 commit comments

Comments
 (0)