diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2021-02-05 09:50:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 09:50:28 -0700 |
| commit | 2b7be2005f3d74141f9f8e83be603be0ddbe7046 (patch) | |
| tree | 216358d49e72daf17cf5316da4b2db107c1c0fb4 | |
| parent | 2f466b31820b6af40c3bc1ca3957682b6f20365a (diff) | |
| parent | de766c8768e87843b601adfc709613e8ff27f957 (diff) | |
| download | numpy-2b7be2005f3d74141f9f8e83be603be0ddbe7046.tar.gz | |
Merge pull request #18334 from mattip/disable-pypy-win64
TST: use setup-python action for pypy, disable win64 pypy
| -rw-r--r-- | .github/workflows/build_test.yml | 18 | ||||
| -rw-r--r-- | azure-pipelines.yml | 10 |
2 files changed, 8 insertions, 20 deletions
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 1363d9327..91a4a7260 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -191,21 +191,9 @@ jobs: with: submodules: recursive fetch-depth: 0 - - name: get_pypy - run: | - wget -q https://downloads.python.org/pypy/pypy3.7-v7.3.3-linux64.tar.bz2 -O pypy.tar.bz2 - mkdir -p pypy3 - (cd pypy3; tar --strip-components=1 -xf ../pypy.tar.bz2) - pypy3/bin/pypy3 -mensurepip - pypy3/bin/pypy3 -m pip install --upgrade pip wheel - if [ ! -e pypy3/bin/python ] - then - pushd pypy3/bin - ln -s pypy3 python - popd - fi - echo $PWD/pypy3/bin >> $GITHUB_PATH - + - uses: actions/setup-python@v2 + with: + python-version: pypy-3.7 - uses: ./.github/actions sdist: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 71728734c..d55bb6cef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -230,11 +230,11 @@ stages: PYTHON_ARCH: 'x64' TEST_MODE: full BITS: 64 - PyPy37-64bit-full: - PYTHON_VERSION: 'PyPy3.7' - PYTHON_ARCH: 'x64' - TEST_MODE: fast - BITS: 64 + #PyPy37-64bit-full: + # PYTHON_VERSION: 'PyPy3.7' + # PYTHON_ARCH: 'x64' + # TEST_MODE: fast + # BITS: 64 Python38-32bit-fast: PYTHON_VERSION: '3.8' PYTHON_ARCH: 'x86' |