Merge pull request #20026 from mattip/pypy-7.3.6

MAINT: Test PyPy3.8

6 files changed, 25 insertions, 20 deletions

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 1c062d73c..b88a41da4 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -202,18 +202,18 @@ jobs:
         python-version: ${{ env.PYTHON_VERSION }}
     - uses: ./.github/actions
 
-  #pypy37:
-    #needs: [smoke_test]
-    #runs-on: ubuntu-latest
-    #steps:
-    #- uses: actions/checkout@v2
-      #with:
-        #submodules: recursive
-        #fetch-depth: 0
-    #- uses: actions/setup-python@v2
-      #with:
-        #python-version: pypy-3.7-v7.3.4
-    #- uses: ./.github/actions
+  pypy38:
+    needs: [smoke_test]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - uses: actions/setup-python@v2
+      with:
+        python-version: pypy-3.8-v7.3.6rc1
+    - uses: ./.github/actions
 
   sdist:
     needs: [smoke_test]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 714f62912..3255b0758 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -249,6 +249,12 @@ stages:
             TEST_MODE: full
             BITS: 64
             NPY_USE_BLAS_ILP64: '1'
+          PyPy38-64bit-fast:
+            PYTHON_VERSION: 'PyPy'
+            PYTHON_ARCH: 'x64'
+            TEST_MODE: fast
+            BITS: 64
+            NPY_USE_BLAS_ILP64: '1'
 
     steps:
     - template: azure-steps-windows.yml
diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
index 9a5f9bb70..34f9797de 100644
--- a/azure-steps-windows.yml
+++ b/azure-steps-windows.yml
@@ -6,7 +6,7 @@ steps:
     architecture: $(PYTHON_ARCH)
   condition: not(contains(variables['PYTHON_VERSION'], 'PyPy'))
 - powershell: |
-    $url = "http://buildbot.pypy.org/nightly/py3.7/pypy-c-jit-latest-win64.zip"
+    $url = "http://buildbot.pypy.org/nightly/py3.8/pypy-c-jit-latest-win64.zip"
     $output = "pypy.zip"
     $wc = New-Object System.Net.WebClient
     $wc.DownloadFile($url, $output)
diff --git a/numpy/testing/_private/utils.py b/numpy/testing/_private/utils.py
index 77ca4ef85..3d52f74b2 100644
--- a/numpy/testing/_private/utils.py
+++ b/numpy/testing/_private/utils.py
@@ -2402,9 +2402,9 @@ def break_cycles():
 
     gc.collect()
     if IS_PYPY:
-        # interpreter runs now, to call deleted objects' __del__ methods
+        # a few more, just to make sure all the finalizers are called
+        gc.collect()
         gc.collect()
-        # two more, just to make sure
         gc.collect()
         gc.collect()
 
diff --git a/tools/travis-before-install.sh b/tools/travis-before-install.sh
index 65aa4ad13..056e97472 100755
--- a/tools/travis-before-install.sh
+++ b/tools/travis-before-install.sh
@@ -22,13 +22,12 @@ pushd builds
 
 # Build into own virtualenv
 # We therefore control our own environment, avoid travis' numpy
-pip install -U virtualenv
 
 if [ -n "$USE_DEBUG" ]
 then
-  virtualenv --python=$(which python3-dbg) venv
+  python3-dbg -m venv venv
 else
-  virtualenv --python=python venv
+  python -m venv venv
 fi
 
 source venv/bin/activate
diff --git a/tools/travis-test.sh b/tools/travis-test.sh
index 4667db991..b395942fb 100755
--- a/tools/travis-test.sh
+++ b/tools/travis-test.sh
@@ -165,7 +165,7 @@ if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then
   fi
   $PYTHON setup.py build --warn-error build_src --verbose-cfg bdist_wheel
   # Make another virtualenv to install into
-  virtualenv --python=`which $PYTHON` venv-for-wheel
+  $PYTHON -m venv venv-for-wheel
   . venv-for-wheel/bin/activate
   # Move out of source directory to avoid finding local numpy
   pushd dist
@@ -181,7 +181,7 @@ elif [ -n "$USE_SDIST" ] && [ $# -eq 0 ]; then
   export CFLAGS=$CFLAGS" -Wno-sign-compare -Wno-unused-result"
   $PYTHON setup.py sdist
   # Make another virtualenv to install into
-  virtualenv --python=`which $PYTHON` venv-for-wheel
+  $PYTHON -m venv venv-for-wheel
   . venv-for-wheel/bin/activate
   # Move out of source directory to avoid finding local numpy
   pushd dist