diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32063a80617ae0a8d19f82cbe2cdc92356ab7308..10027314690a95ce49096590dbf673c47fa1d126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,9 +165,9 @@ Python 3 Conda Apple: reports: junit: test/pytest.xml -PyPy POCL: +PyPy3 POCL: script: - - export PY_EXE=pypy + - export PY_EXE=pypy3 - export PYOPENCL_TEST=portable:pthread # On pypy, this seems to install old versions from the package index @@ -179,6 +179,8 @@ PyPy POCL: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" + allow_failure: true + tags: - pypy - pocl diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 422597e61b9d7eb1f725e58338dc1106ddd2bff4..709f5f9d319b2155b09b721a43fe40edc234ad84 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -37,6 +37,8 @@ for PYBIN in /opt/python/*/bin; do NUMPY_VERSION="1.9.3" elif [[ "${PYBIN}" == *cp38* ]]; then NUMPY_VERSION="1.17.3" + elif [[ "${PYBIN}" == *cp39* ]]; then + continue else NUMPY_VERSION="1.8.2" fi