Skip to content

Commit 7304396

Browse files
authored
BLD: Setup meson builds (#49115)
1 parent 574f241 commit 7304396

Some content is hidden

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

43 files changed

+603
-115
lines changed

.circleci/setup_env.sh

Lines changed: 1 addition & 4 deletions
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

Lines changed: 9 additions & 5 deletions
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/workflows/code-checks.yml

Lines changed: 16 additions & 4 deletions
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/package-checks.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,10 @@ jobs:
4444
with:
4545
python-version: '3.10'
4646

47-
- name: Install required dependencies
48-
run: |
49-
python -m pip install --upgrade pip setuptools wheel python-dateutil pytz numpy cython
50-
python -m pip install versioneer[toml]
51-
5247
- name: Pip install with extra
53-
run: python -m pip install -e .[${{ matrix.extra }}] --no-build-isolation
48+
run: |
49+
python -m pip install .[${{ matrix.extra }}] -v
50+
shell: bash -el {0}
5451
conda_forge_recipe:
5552
if: ${{ github.event.label.name == 'Build' || contains(github.event.pull_request.labels.*.name, 'Build') || github.event_name == 'push'}}
5653
runs-on: ubuntu-22.04

.github/workflows/unit-tests.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,9 @@ 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 .
234+
python -m pip install --no-cache-dir --no-build-isolation -e .
236235
python -m pip list
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
@@ -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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 3 additions & 0 deletions
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 #

asv_bench/asv.conf.json

Lines changed: 4 additions & 4 deletions
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

Lines changed: 2 additions & 7 deletions
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/deps/actions-310-numpydev.yaml

Lines changed: 6 additions & 1 deletion
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

0 commit comments

Comments
 (0)