Skip to content

Commit 4ad9481

Browse files
More fixing
1 parent d1f2691 commit 4ad9481

1 file changed

Lines changed: 15 additions & 27 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ jobs:
5454
run: |
5555
PY_INC=$(python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
5656
echo "PY_INC=$PY_INC" >> $GITHUB_ENV
57-
echo "MESON_SETUP_ARGS=-Dc_args=-I${PY_INC} -Dc_link_args=-L${CONDA_PREFIX}/lib" >> $GITHUB_ENV
57+
echo "PIP_CONFIG_SETTINGS=--config-settings=setup-args=-Dc_args=['-I${PY_INC}'] --config-settings=setup-args=-Dc_link_args=['-L${CONDA_PREFIX}/lib']" >> $GITHUB_ENV
5858
5959
- name: Install numcodecs
6060
run: |
6161
if [[ "${{ startsWith(matrix.platform, 'ubuntu') }}" == "true" ]]; then
6262
# TODO: Remove this conditional when pcodec supports Python 3.14
6363
if [[ "${{ matrix.python-version }}" == "3.14" ]]; then
6464
python -m pip install -v \
65-
--config-settings="setup-args=${MESON_SETUP_ARGS}" \
65+
${PIP_CONFIG_SETTINGS} \
6666
".[test,test_extras,msgpack,google_crc32c,crc32c,zfpy]" \
6767
pytest
6868
else
6969
python -m pip install -v \
70-
--config-settings="setup-args=${MESON_SETUP_ARGS}" \
70+
${PIP_CONFIG_SETTINGS} \
7171
".[test,test_extras,msgpack,google_crc32c,crc32c,pcodec,zfpy]" \
7272
pytest
7373
fi
@@ -137,26 +137,18 @@ jobs:
137137
run: |
138138
PY_INC=$(python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
139139
echo "PY_INC=$PY_INC" >> $GITHUB_ENV
140-
echo "MESON_SETUP_ARGS=-Dc_args=-I${PY_INC} -Dc_link_args=-L${CONDA_PREFIX}/lib" >> $GITHUB_ENV
140+
echo "PIP_CONFIG_SETTINGS=--config-settings=setup-args=-Dc_args=['-I${PY_INC}'] --config-settings=setup-args=-Dc_link_args=['-L${CONDA_PREFIX}/lib']" >> $GITHUB_ENV
141141
142142
- name: Install numcodecs
143143
run: |
144-
if [[ "${{ startsWith(matrix.platform, 'ubuntu') }}" == "true" ]]; then
145-
if [[ -n "${{ matrix.extras }}" ]]; then
146-
python -m pip install -v \
147-
--config-settings="setup-args=${MESON_SETUP_ARGS}" \
148-
".[${{ matrix.extras }},test]"
149-
else
150-
python -m pip install -v \
151-
--config-settings="setup-args=${MESON_SETUP_ARGS}" \
152-
".[test]"
153-
fi
144+
if [[ -n "${{ matrix.extras }}" ]]; then
145+
python -m pip install -v \
146+
${PIP_CONFIG_SETTINGS} \
147+
".[${{ matrix.extras }},test]"
154148
else
155-
if [[ -n "${{ matrix.extras }}" ]]; then
156-
python -m pip install -v ".[${{ matrix.extras }},test]"
157-
else
158-
python -m pip install -v ".[test]"
159-
fi
149+
python -m pip install -v \
150+
${PIP_CONFIG_SETTINGS} \
151+
".[test]"
160152
fi
161153
162154
- name: List installed packages
@@ -212,17 +204,13 @@ jobs:
212204
run: |
213205
PY_INC=$(python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
214206
echo "PY_INC=$PY_INC" >> $GITHUB_ENV
215-
echo "MESON_SETUP_ARGS=-Dc_args=-I${PY_INC} -Dc_link_args=-L${CONDA_PREFIX}/lib" >> $GITHUB_ENV
207+
echo "PIP_CONFIG_SETTINGS=--config-settings=setup-args=-Dc_args=['-I${PY_INC}'] --config-settings=setup-args=-Dc_link_args=['-L${CONDA_PREFIX}/lib']" >> $GITHUB_ENV
216208
217209
- name: Install numcodecs and Zarr
218210
run: |
219-
if [[ "${{ startsWith(matrix.platform, 'ubuntu') }}" == "true" ]]; then
220-
python -m pip install -v \
221-
--config-settings="setup-args=${MESON_SETUP_ARGS}" \
222-
".[test,test_extras]" "${{ matrix.zarr-pkg }}" crc32c
223-
else
224-
python -m pip install -v ".[test,test_extras]" "${{ matrix.zarr-pkg }}" crc32c
225-
fi
211+
python -m pip install -v \
212+
${PIP_CONFIG_SETTINGS} \
213+
".[test,test_extras]" "${{ matrix.zarr-pkg }}" crc32c
226214
- name: List installed packages
227215
run: python -m pip list
228216

0 commit comments

Comments
 (0)