Update URLs for PyPy nightly; Remove pypy3.5 and pypy3.7 nightly (#3466)

pypy3.5-c-jit-latest and pypy3.7-c-jit-latest are no longer available

plugins/python-build/bin/python-build

@@ -2678,7 +2678,7 @@ if [ -z "${GET_PIP_URL}" ]; then
     2.6 | 2.6.* )
       GET_PIP_URL="https://bootstrap.pypa.io/pip/2.6/get-pip.py"
       ;;
-    2.7 | 2.7.* | pypy2.7 | pypy2.7-* )
+    2.7 | 2.7.* | pypy2.7 | pypy2.7-* | pypy-c-jit-* )
       GET_PIP_URL="https://bootstrap.pypa.io/pip/2.7/get-pip.py"
       ;;
     3.2 | 3.2.* )

plugins/python-build/share/python-build/pypy-c-jit-latest

@@ -1,30 +1,21 @@
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
-  install_nightly_package "pypy-c-jit-latest-linux" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux.tar.bz2" "pypy-c-jit-*-linux" "pypy" verify_py27 ensurepip
+  install_nightly_package "pypy-c-jit-latest-linux" "https://buildbot.pypy.org/nightly/main/pypy-c-jit-latest-linux.tar.bz2" "pypy-c-jit-*-linux" "pypy" verify_py27 ensurepip_lt21
   ;;
-"linux-armel" )
-  install_nightly_package "pypy-c-jit-latest-linux-armel" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux-armel.tar.bz2" "pypy-c-jit-*-linux-armel" "pypy" verify_py27 ensurepip
+"linux64" )
+  install_nightly_package "pypy-c-jit-latest-linux64" "https://buildbot.pypy.org/nightly/main/pypy-c-jit-latest-linux64.tar.bz2" "pypy-c-jit-*-linux64" "pypy" verify_py27 ensurepip_lt21
   ;;
-"linux-armhf" )
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
-    install_nightly_package "pypy-c-jit-latest-linux-armhf-raspbian" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux-armhf-raspbian.tar.bz2" "pypy-c-jit-*-linux-armhf-raspbian" "pypy" verify_py27 ensurepip
-  else
-    { echo
-      colorize 1 "ERROR"
-      echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-      echo
-    } >&2
-    exit 1
-  fi
+"linux-aarch64" )
+  install_nightly_package "pypy-c-jit-latest-aarch64" "https://buildbot.pypy.org/nightly/main/pypy-c-jit-latest-aarch64.tar.bz2" "pypy-c-jit-*-aarch64" "pypy" verify_py27 ensurepip_lt21
   ;;
-"linux64" )
-  install_nightly_package "pypy-c-jit-latest-linux64" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux64.tar.bz2" "pypy-c-jit-*-linux64" "pypy" verify_py27 ensurepip
+"osarm64" )
+  install_nightly_package "pypy-c-jit-latest-macos_arm64" "https://buildbot.pypy.org/nightly/main/pypy-c-jit-latest-macos_arm64.tar.bz2" "pypy-c-jit-*-macos_arm64" "pypy" verify_py27 ensurepip_lt21
   ;;
 "osx64" )
-  install_nightly_package "pypy-c-jit-latest-osx64" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-osx64.tar.bz2" "pypy-c-jit-*-osx64" "pypy" verify_py27 ensurepip
+  install_nightly_package "pypy-c-jit-latest-macos_x86_64" "https://buildbot.pypy.org/nightly/main/pypy-c-jit-latest-macos_x86_64.tar.bz2" "pypy-c-jit-*-macos_x86_64" "pypy" verify_py27 ensurepip_lt21
   ;;
 "win32" )
-  install_zip "pypy-c-jit-latest-win32" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-win32.zip" "pypy" verify_py27 ensurepip
+  install_zip "pypy-c-jit-latest-win32" "https://buildbot.pypy.org/nightly/main/pypy-c-jit-latest-win32.zip" "pypy" verify_py27 ensurepip_lt21
   ;;
 * )
   { echo

plugins/python-build/share/python-build/pypy3.5-c-jit-latest

@@ -1,49 +0,0 @@
-echo
-colorize 1 "WARNING"
-echo ": This may eat your kittens/ affect timespace in alternate dimensions/"
-echo "cause you to complain more. Nightly builds are meant for testing only."
-echo
-echo "To report bugs/regressions, please see:"
-echo
-echo "http://doc.pypy.org/en/latest/faq.html#how-should-i-report-a-bug"
-echo
-
-case "$(pypy_architecture 2>/dev/null || true)" in
-"linux" )
-  install_nightly_package "pypy-c-jit-latest-linux" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux.tar.bz2" "pypy-c-jit-*-linux" "pypy" verify_py27 ensurepip
-  ;;
-"linux-armel" )
-  install_nightly_package "pypy-c-jit-latest-linux-armel" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux-armel.tar.bz2" "pypy-c-jit-*-linux-armel" "pypy" verify_py27 ensurepip
-  ;;
-"linux-armhf" )
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
-    install_nightly_package "pypy-c-jit-latest-linux-armhf-raspbian" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux-armhf-raspbian.tar.bz2" "pypy-c-jit-*-linux-armhf-raspbian" "pypy" verify_py27 ensurepip
-  else
-    { echo
-      colorize 1 "ERROR"
-      echo ": The latest nightly build of PyPy 3.5 is not available for $(pypy_architecture 2>/dev/null || true),"
-      echo "Please check http://buildbot.pypy.org/nightly/py3.5/ for previous builds."
-      echo
-    } >&2
-    exit 1
-  fi
-  ;;
-"linux64" )
-  install_nightly_package "pypy3.5-c-jit-latest-linux64" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux64.tar.bz2" "pypy-c-jit-*-linux64" "pypy" verify_py35 ensurepip
-  ;;
-"osx64" )
-  install_nightly_package "pypy-c-jit-latest-osx64" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-osx64.tar.bz2" "pypy-c-jit-*-osx64" "pypy" verify_py27 ensurepip
-  ;;
-"win32" )
-  install_zip "pypy-c-jit-latest-win32" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-win32.zip" "pypy" verify_py27 ensurepip
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The latest nightly build of PyPy 3.5 is not available for $(pypy_architecture 2>/dev/null || true),"
-    echo "Please check http://buildbot.pypy.org/nightly/py3.5/ for previous builds."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac

plugins/python-build/share/python-build/pypy3.7-c-jit-latest

@@ -1,39 +0,0 @@
-echo
-colorize 1 "WARNING"
-echo ": This may eat your kittens/ affect timespace in alternate dimensions/"
-echo "cause you to complain more. Nightly builds are meant for testing only."
-echo "Current pypy py3.7 development status:"
-echo
-echo "https://foss.heptapod.net/pypy/pypy/-/wikis/py3.7%20status"
-echo
-echo "for the latest status updates. To report bugs/regressions, please see:"
-echo
-echo "https://doc.pypy.org/en/latest/faq.html#how-should-i-report-a-bug"
-echo
-
-case "$(pypy_architecture 2>/dev/null || true)" in
-"linux" )
-  install_nightly_package "pypy-c-jit-latest-linux" "https://buildbot.pypy.org/nightly/py3.7/pypy-c-jit-latest-linux.tar.bz2" "pypy-c-jit-*-linux" "pypy" verify_py27 ensurepip
-  ;;
-"linux64" )
-  install_nightly_package "pypy3.7-c-jit-latest-linux64" "https://buildbot.pypy.org/nightly/py3.7/pypy-c-jit-latest-linux64.tar.bz2" "pypy-c-jit-*-linux64" "pypy" verify_py35 ensurepip
-  ;;
-"linux-aarch64" )
-  install_nightly_package "pypy3.7-c-jit-latest-aarch64" "https://buildbot.pypy.org/nightly/py3.7/pypy-c-jit-latest-aarch64.tar.bz2" "pypy-c-jit-*-aarch64" "pypy" verify_py35 ensurepip
-  ;;
-"osx64" )
-  install_nightly_package "pypy-c-jit-latest-osx64" "https://buildbot.pypy.org/nightly/py3.7/pypy-c-jit-latest-osx64.tar.bz2" "pypy-c-jit-*-osx64" "pypy" verify_py27 ensurepip
-  ;;
-"win32" )
-  install_zip "pypy-c-jit-latest-win32" "https://buildbot.pypy.org/nightly/py3.7/pypy-c-jit-latest-win32.zip" "pypy" verify_py27 ensurepip
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The latest nightly build of PyPy 3.7 is not available for $(pypy_architecture 2>/dev/null || true),"
-    echo "Please check https://buildbot.pypy.org/nightly/py3.7/ for previous builds."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac

plugins/python-build/test/pyenv_ext.bats

@@ -403,6 +403,7 @@ OUT
   3.9
 
   "pypy2.7-7.3.12   2.7"
+  "pypy-c-jit-latest-linux    2.7"
   "pypy3.5-7.0.0    3.5"
   "pypy3.6-7.3.3    3.6"
   "pypy3.7-7.3.3    3.7"