Upgrade PyPy build as main build