Skip to content

Commit 9bdbf8e

Browse files
committed
Merge branch 'main' into enh-allow-for-insert-method-multi-with-oracle
2 parents 716862a + c866a4a commit 9bdbf8e

File tree

1,314 files changed

+77878
-47888
lines changed

Some content is hidden

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

1,314 files changed

+77878
-47888
lines changed

.circleci/config.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ version: 2.1
33
jobs:
44
test-arm:
55
machine:
6-
image: ubuntu-2004:202101-01
6+
image: ubuntu-2004:2022.04.1
77
resource_class: arm.large
88
environment:
9-
ENV_FILE: ci/deps/circle-38-arm64.yaml
9+
ENV_FILE: ci/deps/circle-310-arm64.yaml
1010
PYTEST_WORKERS: auto
1111
PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow and not db"
1212
PYTEST_TARGET: "pandas"
@@ -23,10 +23,9 @@ jobs:
2323
cibw-build:
2424
type: string
2525
machine:
26-
image: ubuntu-2004:202101-01
26+
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
@@ -47,17 +46,18 @@ jobs:
4746
fi
4847
- run:
4948
name: Build aarch64 wheels
49+
no_output_timeout: 30m # Sometimes the tests won't generate any output, make sure the job doesn't get killed by that
5050
command: |
51-
pip3 install cibuildwheel==2.9.0
52-
cibuildwheel --output-dir wheelhouse
51+
pip3 install cibuildwheel==2.14.1
52+
cibuildwheel --prerelease-pythons --output-dir wheelhouse
5353
environment:
5454
CIBW_BUILD: << parameters.cibw-build >>
5555

5656
- run:
5757
name: Install Anaconda Client & Upload Wheels
5858
command: |
5959
echo "Install Mambaforge"
60-
MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/4.14.0-0/Mambaforge-4.14.0-0-Linux-aarch64.sh"
60+
MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/23.1.0-0/Mambaforge-23.1.0-0-Linux-aarch64.sh"
6161
echo "Downloading $MAMBA_URL"
6262
wget -q $MAMBA_URL -O minimamba.sh
6363
chmod +x minimamba.sh
@@ -92,4 +92,5 @@ workflows:
9292
only: /^v.*/
9393
matrix:
9494
parameters:
95-
cibw-build: ["cp38-manylinux_aarch64", "cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64"]
95+
# TODO: Enable Python 3.12 wheels when numpy releases a version that supports Python 3.12
96+
cibw-build: ["cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64"]#, "cp312-manylinux_aarch64"]

.circleci/setup_env.sh

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash -e
22

33
echo "Install Mambaforge"
4-
MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/4.14.0-0/Mambaforge-4.14.0-0-Linux-aarch64.sh"
4+
MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/23.1.0-0/Mambaforge-23.1.0-0-Linux-aarch64.sh"
55
echo "Downloading $MAMBA_URL"
66
wget -q $MAMBA_URL -O minimamba.sh
77
chmod +x minimamba.sh
@@ -48,17 +48,13 @@ source activate pandas-dev
4848
# downstream CI jobs that may also build pandas from source.
4949
export PANDAS_CI=1
5050

51-
if pip list | grep -q ^pandas; then
51+
if pip show pandas 1>/dev/null; then
5252
echo
5353
echo "remove any installed pandas package w/o removing anything else"
54-
pip uninstall -y pandas || true
54+
pip uninstall -y pandas
5555
fi
5656

57-
echo "Build extensions"
58-
# GH 47305: Parallel build can causes flaky ImportError from pandas/_libs/tslibs
59-
python setup.py build_ext -q -j1
60-
6157
echo "Install pandas"
62-
python -m pip install --no-build-isolation --no-use-pep517 -e .
58+
python -m pip install --no-build-isolation -ve .
6359

6460
echo "done"

.gitattributes

+68
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,71 @@
1414
*.xls binary
1515
*.xlsx binary
1616
pandas/_version.py export-subst
17+
18+
19+
*.bz2 export-ignore
20+
*.csv export-ignore
21+
*.data export-ignore
22+
*.dta export-ignore
23+
*.feather export-ignore
24+
*.tar export-ignore
25+
*.gz export-ignore
26+
*.h5 export-ignore
27+
*.html export-ignore
28+
*.json export-ignore
29+
*.jsonl export-ignore
30+
*.kml export-ignore
31+
*.msgpack export-ignore
32+
*.pdf export-ignore
33+
*.parquet export-ignore
34+
*.pickle export-ignore
35+
*.pkl export-ignore
36+
*.png export-ignore
37+
*.pptx export-ignore
38+
*.ods export-ignore
39+
*.odt export-ignore
40+
*.orc export-ignore
41+
*.sas7bdat export-ignore
42+
*.sav export-ignore
43+
*.so export-ignore
44+
*.txt export-ignore
45+
*.xls export-ignore
46+
*.xlsb export-ignore
47+
*.xlsm export-ignore
48+
*.xlsx export-ignore
49+
*.xpt export-ignore
50+
*.cpt export-ignore
51+
*.xml export-ignore
52+
*.xsl export-ignore
53+
*.xz export-ignore
54+
*.zip export-ignore
55+
*.zst export-ignore
56+
*~ export-ignore
57+
.DS_Store export-ignore
58+
.git* export-ignore
59+
60+
*.py[ocd] export-ignore
61+
*.pxi export-ignore
62+
63+
# Ignoring stuff from the top level
64+
.circleci export-ignore
65+
.github export-ignore
66+
asv_bench export-ignore
67+
ci export-ignore
68+
doc export-ignore
69+
gitpod export-ignore
70+
MANIFEST.in export-ignore
71+
scripts export-ignore
72+
typings export-ignore
73+
web export-ignore
74+
CITATION.cff export-ignore
75+
codecov.yml export-ignore
76+
Dockerfile export-ignore
77+
environment.yml export-ignore
78+
setup.py export-ignore
79+
80+
81+
# GH 39321
82+
# csv_dir_path fixture checks the existence of the directory
83+
# exclude the whole directory to avoid running related tests in sdist
84+
pandas/tests/io/parser/data export-ignore

.github/CODEOWNERS

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# github
2+
.github/ @mroeschke
3+
4+
# ci
5+
ci/ @mroeschke
6+
7+
# web
8+
web/ @datapythonista
9+
10+
# docs
11+
doc/cheatsheet @Dr-Irv
12+
doc/source/development @noatamir
13+
14+
# pandas
15+
pandas/_libs/ @WillAyd
16+
pandas/_libs/tslibs/* @MarcoGorelli
17+
pandas/_typing.py @Dr-Irv
18+
pandas/core/groupby/* @rhshadrach
19+
pandas/core/tools/datetimes.py @MarcoGorelli
20+
pandas/io/excel/* @rhshadrach
21+
pandas/io/formats/style.py @attack68
22+
pandas/io/formats/style_render.py @attack68
23+
pandas/io/formats/templates @attack68

.github/actions/build_pandas/action.yml

+17-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: Build pandas
22
description: Rebuilds the C extensions and installs pandas
3+
inputs:
4+
editable:
5+
description: Whether to build pandas in editable mode (default true)
6+
default: true
37
runs:
48
using: composite
59
steps:
@@ -8,15 +12,21 @@ runs:
812
run: |
913
micromamba info
1014
micromamba list
15+
pip list --pre
16+
shell: bash -el {0}
17+
18+
- name: Uninstall existing Pandas installation
19+
run: |
20+
if pip show pandas 1>/dev/null; then
21+
pip uninstall -y pandas
22+
fi
1123
shell: bash -el {0}
1224

1325
- name: Build Pandas
1426
run: |
15-
python setup.py build_ext -j $N_JOBS
16-
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
27+
if [[ ${{ inputs.editable }} == "true" ]]; then
28+
pip install -e . --no-build-isolation -v
29+
else
30+
pip install . --no-build-isolation -v
31+
fi
1732
shell: bash -el {0}
18-
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 }}

.github/actions/run-tests/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runs:
77
shell: bash -el {0}
88

99
- name: Publish test results
10-
uses: actions/upload-artifact@v2
10+
uses: actions/upload-artifact@v3
1111
with:
1212
name: Test results
1313
path: test-data.xml
@@ -19,7 +19,7 @@ runs:
1919
if: failure()
2020

2121
- name: Upload coverage to Codecov
22-
uses: codecov/codecov-action@v2
22+
uses: codecov/codecov-action@v3
2323
with:
2424
flags: unittests
2525
name: codecov-pandas

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

+3-23
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,14 @@ inputs:
33
environment-file:
44
description: Conda environment file to use.
55
default: environment.yml
6-
environment-name:
7-
description: Name to use for the Conda environment
8-
default: test
9-
extra-specs:
10-
description: Extra packages to install
11-
required: false
12-
pyarrow-version:
13-
description: If set, overrides the PyArrow version in the Conda environment to the given string.
14-
required: false
156
runs:
167
using: composite
178
steps:
18-
- name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }}
19-
run: |
20-
grep -q ' - pyarrow' ${{ inputs.environment-file }}
21-
sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
22-
cat ${{ inputs.environment-file }}
23-
shell: bash
24-
if: ${{ inputs.pyarrow-version }}
25-
269
- name: Install ${{ inputs.environment-file }}
27-
uses: mamba-org/provision-with-micromamba@v12
10+
uses: mamba-org/setup-micromamba@v1
2811
with:
2912
environment-file: ${{ inputs.environment-file }}
30-
environment-name: ${{ inputs.environment-name }}
31-
extra-specs: ${{ inputs.extra-specs }}
32-
channels: conda-forge
33-
channel-priority: ${{ runner.os == 'macOS' && 'flexible' || 'strict' }}
13+
environment-name: test
3414
condarc-file: ci/condarc.yml
35-
cache-env: true
15+
cache-environment: true
3616
cache-downloads: true

.github/dependabot.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
labels:
8+
- "CI"
9+
- "Dependencies"

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

-60
This file was deleted.

.github/workflows/assign.yml

-19
This file was deleted.

0 commit comments

Comments
 (0)