Skip to content

Commit 7b8e782

Browse files
committed
bump CI meson installs
1 parent 83104a4 commit 7b8e782

12 files changed

+14
-15
lines changed

.github/workflows/unit-tests.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ jobs:
233233
run: |
234234
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
235235
. ~/virtualenvs/pandas-dev/bin/activate
236-
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
236+
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.3.2 meson-python==0.13.1
237237
python -m pip install numpy -Csetup-args="-Dallow-noblas=true"
238238
python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
239239
python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror"
@@ -272,7 +272,7 @@ jobs:
272272
run: |
273273
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
274274
. ~/virtualenvs/pandas-dev/bin/activate
275-
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
275+
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.3.2
276276
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
277277
python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror"
278278
python -m pip list --no-cache-dir
@@ -344,7 +344,7 @@ jobs:
344344
- name: Build Environment
345345
run: |
346346
python --version
347-
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
347+
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.3.2 meson-python==0.13.1
348348
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
349349
python -m pip install versioneer[toml]
350350
python -m pip install python-dateutil tzdata cython hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
@@ -389,7 +389,7 @@ jobs:
389389
# Tests segfault with numpy 2.2.0: https://github.com/numpy/numpy/pull/27955
390390
run: |
391391
python --version
392-
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
392+
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.3.2 meson-python==0.13.1
393393
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython numpy
394394
python -m pip install versioneer[toml]
395395
python -m pip install python-dateutil pytz tzdata hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov

ci/deps/actions-310-minimum_versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
# build dependencies
1010
- versioneer
1111
- cython>=0.29.33
12-
- meson=1.2.1
12+
- meson=1.3.2
1313
- meson-python=0.13.1
1414

1515
# test dependencies

ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
# build dependencies
88
- versioneer
99
- cython>=0.29.33
10-
- meson=1.2.1
10+
- meson=1.3.2
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-311-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
# build dependencies
99
- versioneer
1010
- cython>=0.29.33
11-
- meson=1.2.1
11+
- meson=1.3.2
1212
- meson-python=0.13.1
1313

1414
# test dependencies

ci/deps/actions-311-numpydev.yaml

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

77
# build dependencies
88
- versioneer
9-
- meson=1.2.1
9+
- meson=1.3.2
1010
- meson-python=0.13.1
1111
- cython>=0.29.33
1212

ci/deps/actions-311-pyarrownightly.yaml

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

77
# build dependencies
88
- versioneer
9-
- meson=1.2.1
9+
- meson=1.3.2
1010
- cython>=0.29.33
1111
- meson-python=0.13.1
1212

ci/deps/actions-311.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
# build dependencies
88
- versioneer
99
- cython>=0.29.33
10-
- meson=1.2.1
10+
- meson=1.3.2
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-312.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
# build dependencies
88
- versioneer
99
- cython>=0.29.33
10-
- meson=1.2.1
10+
- meson=1.3.2
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-pypy-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
# build dependencies
1111
- versioneer
1212
- cython>=0.29.33
13-
- meson=1.2.1
13+
- meson=1.3.2
1414
- meson-python=0.13.1
1515

1616
# test dependencies

ci/deps/circle-311-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
# build dependencies
88
- versioneer
99
- cython>=0.29.33
10-
- meson=1.2.1
10+
- meson=1.3.2
1111
- meson-python=0.13.1
1212

1313
# test dependencies

pandas/core/arrays/arrow/array.py

-1
Original file line numberDiff line numberDiff line change
@@ -1671,7 +1671,6 @@ def _str_accumulate(
16711671
msg = f"operation '{name}' not supported for dtype '{self.dtype}'"
16721672
raise TypeError(msg)
16731673

1674-
# TODO: we can use arrow_c_stream instead of arrow_c_array
16751674
pa_result = pa.array(sa.ArrowStringAccumulation(self._pa_array, name, skipna))
16761675
result = type(self)(pa_result)
16771676
return result

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
44
requires = [
55
"meson-python>=0.13.1",
6-
"meson>=1.2.1,<2",
6+
"meson>=1.3.0,<2",
77
"wheel",
88
"Cython~=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json
99
# Force numpy higher than 2.0rc1, so that built wheels are compatible

0 commit comments

Comments
 (0)