Skip to content

Commit c6f21c5

Browse files
committed
Merge remote-tracking branch 'upstream/main' into dtype_backend_validation
# Conflicts: # doc/source/user_guide/io.rst # pandas/core/generic.py # pandas/core/tools/numeric.py # pandas/io/clipboards.py # pandas/io/excel/_base.py # pandas/io/feather_format.py # pandas/io/html.py # pandas/io/json/_json.py # pandas/io/orc.py # pandas/io/parquet.py # pandas/io/parsers/readers.py # pandas/io/spss.py # pandas/io/sql.py # pandas/io/xml.py # pandas/tests/io/parser/test_read_fwf.py # pandas/tests/io/test_clipboard.py # pandas/tests/io/test_sql.py # pandas/tests/io/xml/test_xml.py
2 parents 200757a + ab76540 commit c6f21c5

File tree

181 files changed

+3788
-2135
lines changed

Some content is hidden

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

181 files changed

+3788
-2135
lines changed

.circleci/setup_env.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ if pip list | grep -q ^pandas; then
5555
fi
5656

5757
echo "Build extensions"
58-
# GH 47305: Parallel build can causes flaky ImportError from pandas/_libs/tslibs
59-
python setup.py build_ext -q -j1
58+
python setup.py build_ext -q -j4
6059

6160
echo "Install pandas"
6261
python -m pip install --no-build-isolation --no-use-pep517 -e .

.github/actions/build_pandas/action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ runs:
1616
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
1717
shell: bash -el {0}
1818
env:
19-
# Cannot use parallel compilation on Windows, see https://github.com/pandas-dev/pandas/issues/30873
20-
# GH 47305: Parallel build causes flaky ImportError: /home/runner/work/pandas/pandas/pandas/_libs/tslibs/timestamps.cpython-38-x86_64-linux-gnu.so: undefined symbol: pandas_datetime_to_datetimestruct
21-
N_JOBS: 1
22-
#N_JOBS: ${{ runner.os == 'Windows' && 1 || 2 }}
19+
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
20+
N_JOBS: ${{ runner.os == 'macOS' && 3 || 2 }}

.github/actions/setup-conda/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
environment-name: ${{ inputs.environment-name }}
3131
extra-specs: ${{ inputs.extra-specs }}
3232
channels: conda-forge
33-
channel-priority: ${{ runner.os == 'macOS' && 'flexible' || 'strict' }}
33+
channel-priority: 'strict'
3434
condarc-file: ci/condarc.yml
3535
cache-env: true
3636
cache-downloads: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
4343
python -m pip install versioneer[toml] && \
4444
python -m pip install cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.34.2 && \
45-
python setup.py build_ext -q -j1 && \
45+
python setup.py build_ext -q -j$(nproc) && \
4646
python -m pip install --no-build-isolation --no-use-pep517 -e . && \
4747
python -m pip list && \
4848
export PANDAS_CI=1 && \

.github/workflows/python-dev.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,9 @@ jobs:
8282
python -m pip install python-dateutil pytz cython hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17
8383
python -m pip list
8484
85-
# GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs
8685
- name: Build Pandas
8786
run: |
88-
python setup.py build_ext -q -j1
87+
python setup.py build_ext -q -j4
8988
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
9089
9190
- name: Build Version

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
- 5432:5432
143143

144144
moto:
145-
image: motoserver/moto
145+
image: motoserver/moto:4.1.4
146146
env:
147147
AWS_ACCESS_KEY_ID: foobar_key
148148
AWS_SECRET_ACCESS_KEY: foobar_secret

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ repos:
3131
rev: v0.0.253
3232
hooks:
3333
- id: ruff
34+
args: [--exit-non-zero-on-fix]
3435
- repo: https://github.com/jendrikseipp/vulture
3536
rev: 'v2.7'
3637
hooks:

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,5 @@ prune pandas/tests/io/parser/data
5858
# Selectively re-add *.cxx files that were excluded above
5959
graft pandas/_libs/src
6060
graft pandas/_libs/tslibs/src
61+
include pandas/_libs/pd_parser.h
62+
include pandas/_libs/pd_parser.c

asv_bench/benchmarks/algorithms.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class Factorize:
2323
"uint",
2424
"float",
2525
"object",
26+
"object_str",
2627
"datetime64[ns]",
2728
"datetime64[ns, tz]",
2829
"Int64",
@@ -46,7 +47,8 @@ def setup(self, unique, sort, dtype):
4647
"int": pd.Index(np.arange(N), dtype="int64"),
4748
"uint": pd.Index(np.arange(N), dtype="uint64"),
4849
"float": pd.Index(np.random.randn(N), dtype="float64"),
49-
"object": string_index,
50+
"object_str": string_index,
51+
"object": pd.Index(np.arange(N), dtype="object"),
5052
"datetime64[ns]": pd.date_range("2011-01-01", freq="H", periods=N),
5153
"datetime64[ns, tz]": pd.date_range(
5254
"2011-01-01", freq="H", periods=N, tz="Asia/Tokyo"
@@ -62,6 +64,9 @@ def setup(self, unique, sort, dtype):
6264
def time_factorize(self, unique, sort, dtype):
6365
pd.factorize(self.data, sort=sort)
6466

67+
def peakmem_factorize(self, unique, sort, dtype):
68+
pd.factorize(self.data, sort=sort)
69+
6570

6671
class Duplicated:
6772
params = [

doc/source/_static/css/getting_started.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ ul.task-bullet > li > p:first-child {
236236

237237
.tutorial-card .card-header {
238238
cursor: pointer;
239-
background-color: white;
239+
background-color: transparent;
240240
}
241241

242242
.tutorial-card .card-body {
243-
background-color: #F0F0F0;
243+
background-color: transparent;
244244
}
245245

246246
.tutorial-card .badge {

doc/source/_static/legacy_0.10.h5

-233 KB
Binary file not shown.

doc/source/_static/stub

Whitespace-only changes.

doc/source/development/contributing_environment.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ locally before pushing your changes. It's recommended to also install the :ref:`
2121
Step 1: install a C compiler
2222
----------------------------
2323

24-
How to do this will depend on your platform. If you choose to user ``Docker``
24+
How to do this will depend on your platform. If you choose to use ``Docker``
2525
in the next step, then you can skip this step.
2626

2727
**Windows**

doc/source/ecosystem.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ aggregations for step functions defined over real numbers, datetime and timedelt
377377

378378
xarray brings the labeled data power of pandas to the physical sciences by
379379
providing N-dimensional variants of the core pandas data structures. It aims to
380-
provide a pandas-like and pandas-compatible toolkit for analytics on multi-
381-
dimensional arrays, rather than the tabular data for which pandas excels.
380+
provide a pandas-like and pandas-compatible toolkit for analytics on
381+
multi-dimensional arrays, rather than the tabular data for which pandas excels.
382382

383383

384384
.. _ecosystem.io:

doc/source/styled.xlsx

-5.55 KB
Binary file not shown.

0 commit comments

Comments
 (0)