Merge pull request #110 from mattip/v7.3.13

V7.3.13

recipe/bld.bat

@@ -71,12 +71,7 @@ del %PREFIX%\pypy%PY_VERSION%.exe
 del %PREFIX%\python.exe
 del %PREFIX%\python3.exe
 del %PREFIX%\python%PY_VERSION%.exe
-if "%PY_VERSION%" == "3.8" (
-  set "DLL_VER=3"
-) else (
-  set "DLL_VER=%PY_VERSION%"
-)
-cl /O2 %RECIPE_DIR%\pypy_win.c /Fe%PREFIX%\pypy.exe "/DPY_VER=\"%DLL_VER%\""
+cl /O2 %RECIPE_DIR%\pypy_win.c /Fe%PREFIX%\pypy.exe "/DPY_VER=\"%PY_VERSION%\""
 copy %PREFIX%\pypy.exe %PREFIX%\pypy3.exe
 copy %PREFIX%\pypy.exe %PREFIX%\pypy%PY_VERSION%.exe
 copy %PREFIX%\pypy.exe %PREFIX%\python.exe
@@ -101,20 +96,6 @@ REM take 4 hours. Using --timeout=100 does not work, the kill makes the
 REM process hang
 REM timeout 60m pypy3 -m test --pgo -j%CPU_COUNT% || true;
 
-REM Build the cache for the standard library
-pypy -c "import _testcapi"
-IF %ERRORLEVEL% NEQ 0 (Echo ERROR while building &exit /b 11)
-if "%PY_VERSION%" == "3.8" (
-    pypy -c "import _ctypes_test"
-    IF %ERRORLEVEL% NEQ 0 (Echo ERROR while building &exit /b 11)
-    pypy -c "import _testmultiphase"
-) else (
-    pypy -c "import _ctypes_test_build"
-    IF %ERRORLEVEL% NEQ 0 (Echo ERROR while building &exit /b 11)
-    pypy -c "import _testmultiphase_build"
-)
-IF %ERRORLEVEL% NEQ 0 (Echo ERROR while building &exit /b 11)
-
 REM Include a %PREFIX%\Scripts directory in the package. This ensures
 REM that entry_points are able to be created by downstream packages.
 if not exist "%PREFIX%\Scripts" mkdir "%PREFIX%\Scripts"

recipe/build.sh

@@ -121,20 +121,6 @@ echo INCLUDEPY $(pypy -c "from distutils import sysconfig; print(sysconfig.get_c
 ls $(pypy -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
 
 _PYTHON_SYSCONFIGDATA_NAME=$sysconfigdata_name pypy -c "from distutils import sysconfig; assert sysconfig.get_config_var('HOST_GNU_TYPE') != None"
-# Build the test c-extension modules
-# PyPy uses a wrapper for _ctypes_test to trick the import system into getting
-# the c-extension from `/tmp`, so we need to copy it into LIB 
-pypy -c "import _testcapi"
-cp $(pypy -c "import _testcapi; print(_testcapi.__file__)") $PREFIX/lib/pypy${PY_VERSION}
-if [[ "${PY_VERSION}" == "3.8" ]]; then
-    pypy -c "import _ctypes_test, _testmultiphase"
-    cp $(pypy -c "import _ctypes_test; print(_ctypes_test.__file__)") $PREFIX/lib/pypy${PY_VERSION}
-else
-    pypy -c "import _ctypes_test_build, _testmultiphase_build"
-    # Need to import the *build module to properly import the built module from `/tmp`
-    cp $(pypy -c "import _ctypes_test_build, _ctypes_test; print(_ctypes_test.__file__)") $PREFIX/lib/pypy${PY_VERSION}
-fi
-
 # Run the python stdlib tests
 # no timeout on darwin
 # timeout 60m pypy3 -m test --pgo -j${CPU_COUNT} || true;

recipe/conda_build_config.yaml

@@ -1,3 +1,2 @@
 name_suffix:
-  - 3.8
   - 3.9