Skip to content

Commit f41a8a1

Browse files
authored
Merge branch 'main' into reduction_dtypes_II
2 parents 7b8f437 + f80436d commit f41a8a1

File tree

104 files changed

+1299
-382
lines changed

Some content is hidden

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

104 files changed

+1299
-382
lines changed

.circleci/setup_env.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ if pip list | grep -q ^pandas; then
5454
pip uninstall -y pandas || true
5555
fi
5656

57-
echo "Build extensions"
58-
python setup.py build_ext -q -j4
59-
6057
echo "Install pandas"
61-
python -m pip install --no-build-isolation --no-use-pep517 -e .
58+
python -m pip install --no-build-isolation -ve .
6259

6360
echo "done"

.github/actions/build_pandas/action.yml

+9-5
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:
@@ -12,9 +16,9 @@ runs:
1216

1317
- name: Build Pandas
1418
run: |
15-
python setup.py build_ext -j $N_JOBS
16-
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
19+
if [[ ${{ inputs.editable }} == "true" ]]; then
20+
pip install -e . --no-build-isolation -v
21+
else
22+
pip install . --no-build-isolation -v
23+
fi
1724
shell: bash -el {0}
18-
env:
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

+3-12
Original file line numberDiff line numberDiff line change
@@ -3,23 +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
126
runs:
137
using: composite
148
steps:
159
- name: Install ${{ inputs.environment-file }}
16-
uses: mamba-org/provision-with-micromamba@v15
10+
uses: mamba-org/setup-micromamba@v1
1711
with:
1812
environment-file: ${{ inputs.environment-file }}
19-
environment-name: ${{ inputs.environment-name }}
20-
extra-specs: ${{ inputs.extra-specs }}
21-
channels: conda-forge
22-
channel-priority: 'strict'
13+
environment-name: test
2314
condarc-file: ci/condarc.yml
24-
cache-env: true
15+
cache-environment: true
2516
cache-downloads: true

.github/workflows/code-checks.yml

+16-4
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,24 @@ jobs:
6363
- name: Build Pandas
6464
id: build
6565
uses: ./.github/actions/build_pandas
66+
with:
67+
editable: false
6668

6769
# The following checks are independent of each other and should still be run if one fails
70+
71+
# TODO: The doctests have to be run first right now, since the Cython doctests only work
72+
# with pandas installed in non-editable mode
73+
# This can be removed once pytest-cython doesn't require C extensions to be installed inplace
74+
- name: Run doctests
75+
run: cd ci && ./code_checks.sh doctests
76+
if: ${{ steps.build.outcome == 'success' && always() }}
77+
78+
- name: Install pandas in editable mode
79+
id: build-editable
80+
uses: ./.github/actions/build_pandas
81+
with:
82+
editable: true
83+
6884
- name: Check for no warnings when building single-page docs
6985
run: ci/code_checks.sh single-docs
7086
if: ${{ steps.build.outcome == 'success' && always() }}
@@ -73,10 +89,6 @@ jobs:
7389
run: ci/code_checks.sh code
7490
if: ${{ steps.build.outcome == 'success' && always() }}
7591

76-
- name: Run doctests
77-
run: ci/code_checks.sh doctests
78-
if: ${{ steps.build.outcome == 'success' && always() }}
79-
8092
- name: Run docstring validation
8193
run: ci/code_checks.sh docstrings
8294
if: ${{ steps.build.outcome == 'success' && always() }}

.github/workflows/codeql.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
actions: read
1919
contents: read
2020
security-events: write
21+
if: github.repository_owner == 'pandas-dev'
2122

2223
strategy:
2324
fail-fast: false

.github/workflows/package-checks.yml

+36-7
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ on:
1414
permissions:
1515
contents: read
1616

17+
defaults:
18+
run:
19+
shell: bash -el {0}
20+
1721
jobs:
1822
pip:
1923
if: ${{ github.event.label.name == 'Build' || contains(github.event.pull_request.labels.*.name, 'Build') || github.event_name == 'push'}}
@@ -40,13 +44,38 @@ jobs:
4044
with:
4145
python-version: '3.10'
4246

43-
- name: Install required dependencies
44-
run: |
45-
python -m pip install --upgrade pip setuptools wheel python-dateutil pytz numpy cython
46-
python -m pip install versioneer[toml]
47-
shell: bash -el {0}
48-
4947
- name: Pip install with extra
5048
run: |
51-
python -m pip install -e .[${{ matrix.extra }}] --no-build-isolation
49+
python -m pip install .[${{ matrix.extra }}] -v
5250
shell: bash -el {0}
51+
conda_forge_recipe:
52+
if: ${{ github.event.label.name == 'Build' || contains(github.event.pull_request.labels.*.name, 'Build') || github.event_name == 'push'}}
53+
runs-on: ubuntu-22.04
54+
strategy:
55+
matrix:
56+
python-version: ['3.9', '3.10', '3.11']
57+
fail-fast: false
58+
name: Test Conda Forge Recipe - Python ${{ matrix.python-version }}
59+
concurrency:
60+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
61+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-conda-forge-recipe-${{ matrix.python-version }}
62+
cancel-in-progress: true
63+
steps:
64+
- name: Checkout
65+
uses: actions/checkout@v3
66+
with:
67+
fetch-depth: 0
68+
69+
- name: Set up Python
70+
uses: mamba-org/setup-micromamba@v1
71+
with:
72+
environment-name: recipe-test
73+
create-args: >-
74+
python=${{ matrix.python-version }}
75+
boa
76+
conda-verify
77+
cache-downloads: true
78+
cache-environment: true
79+
80+
- name: Build conda package
81+
run: conda mambabuild ci --no-anaconda-upload --verify --strict-verify --output --output-folder .

.github/workflows/stale-pr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
stale:
1212
permissions:
1313
pull-requests: write
14+
if: github.repository_owner == 'pandas-dev'
1415
runs-on: ubuntu-22.04
1516
steps:
1617
- uses: actions/stale@v8

.github/workflows/unit-tests.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,10 @@ jobs:
229229
run: |
230230
/opt/python/cp39-cp39/bin/python -m venv ~/virtualenvs/pandas-dev
231231
. ~/virtualenvs/pandas-dev/bin/activate
232-
python -m pip install --no-cache-dir --no-deps -U pip wheel setuptools
232+
python -m pip install -U pip wheel setuptools meson[ninja]==1.0.1 meson-python==0.13.1
233233
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
234-
python setup.py build_ext -q -j$(nproc)
235-
python -m pip install --no-cache-dir --no-build-isolation --no-use-pep517 -e .
236-
python -m pip list
234+
python -m pip install --no-cache-dir --no-build-isolation -e .
235+
python -m pip list --no-cache-dir
237236
export PANDAS_CI=1
238237
python -m pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml
239238
concurrency:
@@ -268,10 +267,9 @@ jobs:
268267
run: |
269268
/opt/python/cp39-cp39/bin/python -m venv ~/virtualenvs/pandas-dev
270269
. ~/virtualenvs/pandas-dev/bin/activate
271-
python -m pip install --no-cache-dir --no-deps -U pip wheel setuptools
270+
python -m pip install -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.0.1
272271
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
273-
python setup.py build_ext -q -j$(nproc)
274-
python -m pip install --no-cache-dir --no-build-isolation --no-use-pep517 -e .
272+
python -m pip install --no-cache-dir --no-build-isolation -e .
275273
python -m pip list --no-cache-dir
276274
277275
- name: Run Tests
@@ -347,8 +345,7 @@ jobs:
347345
348346
- name: Build Pandas
349347
run: |
350-
python setup.py build_ext -q -j4
351-
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
348+
python -m pip install -e . --no-build-isolation --no-index
352349
353350
- name: Build Version
354351
run: |

.github/workflows/wheels.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
build_wheels:
4141
name: Build wheel for ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
4242
if: >-
43-
github.event_name == 'schedule' ||
43+
(github.event_name == 'schedule' && github.repository_owner == 'pandas-dev') ||
4444
github.event_name == 'workflow_dispatch' ||
4545
(github.event_name == 'pull_request' &&
4646
contains(github.event.pull_request.labels.*.name, 'Build')) ||
@@ -56,7 +56,6 @@ jobs:
5656
- [ubuntu-20.04, manylinux_x86_64]
5757
- [macos-11, macosx_*]
5858
- [windows-2019, win_amd64]
59-
- [windows-2019, win32]
6059
# TODO: support PyPy?
6160
python: [["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"]]# "pp39"]
6261
env:

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
*.py[ocd]
3737
*.so
3838
.build_cache_dir
39+
.mesonpy-native-file.ini
3940
MANIFEST
4041

4142
# Python files #
@@ -76,6 +77,8 @@ coverage_html_report
7677
__pycache__
7778
# pytest-monkeytype
7879
monkeytype.sqlite3
80+
# meson editable install folder
81+
.mesonpy
7982

8083

8184
# OS generated files #

.pre-commit-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ repos:
8383
hooks:
8484
- id: pylint
8585
stages: [manual]
86+
args: [--load-plugins=pylint.extensions.redefined_loop_name]
8687
- id: pylint
8788
alias: redefined-outer-name
8889
name: Redefining name from outer scope

asv_bench/asv.conf.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
// pip (with all the conda available packages installed first,
4242
// followed by the pip installed packages).
4343
"matrix": {
44-
"numpy": [],
4544
"Cython": ["0.29.33"],
4645
"matplotlib": [],
4746
"sqlalchemy": [],
@@ -56,6 +55,9 @@
5655
"xlrd": [],
5756
"odfpy": [],
5857
"jinja2": [],
58+
"meson": [],
59+
"meson-python": [],
60+
"python-build": [],
5961
},
6062
"conda_channels": ["conda-forge"],
6163
// Combinations of libraries/python versions can be excluded/included
@@ -125,7 +127,5 @@
125127
"regression_thresholds": {
126128
},
127129
"build_command":
128-
["python -m pip install versioneer[toml]",
129-
"python setup.py build -j4",
130-
"PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}"],
130+
["python -m build -Cbuilddir=builddir --wheel --outdir {build_cache_dir} {build_dir}"]
131131
}

ci/code_checks.sh

+2-7
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,8 @@ fi
6565
### DOCTESTS ###
6666
if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
6767

68-
MSG='Doctests' ; echo $MSG
69-
# Ignore test_*.py files or else the unit tests will run
70-
python -m pytest --doctest-modules --ignore-glob="**/test_*.py" pandas
71-
RET=$(($RET + $?)) ; echo $MSG "DONE"
72-
73-
MSG='Cython Doctests' ; echo $MSG
74-
python -m pytest --doctest-cython pandas/_libs
68+
MSG='Python and Cython Doctests' ; echo $MSG
69+
python -c 'import pandas as pd; pd.test(run_doctests=True)'
7570
RET=$(($RET + $?)) ; echo $MSG "DONE"
7671

7772
fi

ci/condarc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ always_yes: true
1111
# The number seconds conda will wait for your client to establish a
1212
# connection to a remote url resource.
1313
#
14-
remote_connect_timeout_secs: 30.0
14+
remote_connect_timeout_secs: 30
1515

1616
# remote_max_retries (int)
1717
# The maximum number of retries each HTTP connection should attempt.

ci/deps/actions-310-numpydev.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ dependencies:
66

77
# build dependencies
88
- versioneer[toml]
9+
- meson[ninja]=1.0.1
10+
- meson-python=0.13.1
911

1012
# test dependencies
1113
- pytest>=7.0.0
1214
- pytest-cov
13-
- pytest-xdist>=2.2.0
15+
# Once pytest-cov > 4 comes out, unpin this
16+
# Right now, a DeprecationWarning related to rsyncdir
17+
# causes an InternalError within pytest
18+
- pytest-xdist>=2.2.0, <3
1419
- hypothesis>=6.46.1
1520
- pytest-asyncio>=0.17.0
1621

ci/deps/actions-310.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ dependencies:
77
# build dependencies
88
- versioneer[toml]
99
- cython>=0.29.33
10+
- meson[ninja]=1.0.1
11+
- meson-python=0.13.1
1012

1113
# test dependencies
1214
- pytest>=7.0.0

ci/deps/actions-311-pyarrownightly.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ dependencies:
66

77
# build dependencies
88
- versioneer[toml]
9+
- meson[ninja]=1.0.1
910
- cython>=0.29.33
11+
- meson-python=0.13.1
1012

1113
# test dependencies
1214
- pytest>=7.0.0

ci/deps/actions-311.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ dependencies:
77
# build dependencies
88
- versioneer[toml]
99
- cython>=0.29.33
10+
- meson[ninja]=1.0.1
11+
- meson-python=0.13.1
1012

1113
# test dependencies
1214
- pytest>=7.0.0

ci/deps/actions-39-downstream_compat.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ dependencies:
88
# build dependencies
99
- versioneer[toml]
1010
- cython>=0.29.33
11+
- meson[ninja]=1.0.1
12+
- meson-python=0.13.1
1113

1214
# test dependencies
1315
- pytest>=7.0.0
@@ -69,7 +71,6 @@ dependencies:
6971
- pandas-datareader
7072
- pyyaml
7173
- py
72-
7374
- pip:
7475
- pyqt5>=5.15.6
7576
- tzdata>=2022.1

ci/deps/actions-39-minimum_versions.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ dependencies:
99
# build dependencies
1010
- versioneer[toml]
1111
- cython>=0.29.33
12+
- meson[ninja]=1.0.1
13+
- meson-python=0.13.1
1214

1315
# test dependencies
1416
- pytest>=7.0.0

ci/deps/actions-39.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ dependencies:
77
# build dependencies
88
- versioneer[toml]
99
- cython>=0.29.33
10+
- meson[ninja]=1.0.1
11+
- meson-python=0.13.1
1012

1113
# test dependencies
1214
- pytest>=7.0.0

0 commit comments

Comments
 (0)