Skip to content

Commit 592eded

Browse files
committed
Use a different approach to get a different xfails file for numpy 1.21
1 parent e414cf4 commit 592eded

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.github/workflows/array-api-tests-numpy-1-21.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
with:
99
package-name: numpy
1010
package-version: '== 1.21.*'
11-
pytest-extra-args: '--xfails-file ${GITHUB_WORKSPACE}/array-api-compat/numpy-1-21-xfails.txt'
11+
xfails-file-extra: '-1-21'

.github/workflows/array-api-tests.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ on:
1313
pytest-extra-args:
1414
required: false
1515
type: string
16+
# This is not how I would prefer to implement this but it's the only way
17+
# that seems possible with GitHub Actions' limited expressions syntax
18+
xfails-file-extra:
19+
required: false
20+
type: string
21+
skips-file-extra:
22+
required: false
23+
type: string
24+
1625

1726
env:
1827
PYTEST_ARGS: "--max-examples 200 -v -rxXfE --ci ${{ inputs.pytest-extra-args }}"
@@ -57,4 +66,4 @@ jobs:
5766
run: |
5867
export PYTHONPATH="${GITHUB_WORKSPACE}/array-api-compat"
5968
cd ${GITHUB_WORKSPACE}/array-api-tests
60-
pytest array_api_tests/ --xfails-file ${GITHUB_WORKSPACE}/array-api-compat/${{ inputs.package-name }}-xfails.txt --skips-file ${GITHUB_WORKSPACE}/array-api-compat/${{ inputs.package-name }}-skips.txt ${PYTEST_ARGS}
69+
pytest array_api_tests/ --xfails-file ${GITHUB_WORKSPACE}/array-api-compat/${{ inputs.package-name }}${{ xfails-file-extra }}-xfails.txt --skips-file ${GITHUB_WORKSPACE}/array-api-compat/${{ inputs.package-name }}${{ inputs.skips-file-extra}}-skips.txt ${PYTEST_ARGS}

0 commit comments

Comments
 (0)