chore: fix kokoro and mypy presubmits (#305)

This PR fixes the failing presubmits to build this package in different
environments.

Note that the presubmits have been failing for a while. A better long
term solution is to switch the approach by building and testing against
the supported Python versions within a nox session.

Author: ohmayr

packages/google-crc32c/.kokoro/build-manylinux.sh

@@ -27,4 +27,3 @@ cd github/python-crc32c
 
 # Before running nox and such, build the extension.
 ./scripts/manylinux/build.sh
-./scripts/manylinux/check.sh

packages/google-crc32c/.kokoro/build-osx.sh

@@ -26,4 +26,3 @@ cd github/python-crc32c
 
 # Before running nox and such, build the extension.
 ./scripts/osx/build.sh
-./scripts/osx/check.sh

packages/google-crc32c/noxfile.py

@@ -52,10 +52,10 @@ def check(session):
 @nox.session(python="3.13")
 def mypy(session):
     """Verify type hints are mypy compatible."""
-    session.install("-e", ".")
     session.install(
         "mypy",
         "types-mock",
         "types-setuptools",
     )
-    session.run("mypy", "src/google_crc32c/", "tests/")
+    session.env["MYPYPATH"] = "src"
+    session.run("mypy", "src/google_crc32c/", "tests/")

packages/google-crc32c/scripts/manylinux/build.sh

@@ -21,23 +21,18 @@ MANYLINUX_DIR=$(echo $(cd $(dirname ${0}); pwd))
 SCRIPTS_DIR=$(dirname ${MANYLINUX_DIR})
 REPO_ROOT=$(dirname ${SCRIPTS_DIR})
 
+sudo apt-get install -y software-properties-common
+sudo add-apt-repository -y ppa:deadsnakes/ppa
 sudo apt-get update
-sudo apt-get install -y python3.9
+sudo apt-get install -y python3.12
 
 cd $REPO_ROOT
 # Add directory as safe to avoid "detected dubious ownership" fatal issue1
 git config --global --add safe.directory $REPO_ROOT
 git config --global --add safe.directory $REPO_ROOT/google_crc32c
 git submodule update --init --recursive
 
-docker pull quay.io/pypa/manylinux2010_x86_64
-docker run \
-    --rm \
-    --interactive \
-    --volume ${REPO_ROOT}:/var/code/python-crc32c/ \
-    --env BUILD_PYTHON=${BUILD_PYTHON} \
-    quay.io/pypa/manylinux2010_x86_64 \
-    /var/code/python-crc32c/scripts/manylinux/build_on_centos.sh
+
 
 docker pull quay.io/pypa/manylinux2014_x86_64
 docker run \

packages/google-crc32c/scripts/manylinux/build_on_centos.sh

@@ -18,6 +18,9 @@ MAIN_PYTHON_BIN="/opt/python/cp39-cp39/bin/"
 echo "BUILD_PYTHON: ${BUILD_PYTHON}"
 REPO_ROOT=/var/code/python-crc32c/
 
+# Install `openssl-devel` so that `cmake` can be built.
+yum install -y openssl-devel
+
 # Upgrade `pip` before using it.
 ${MAIN_PYTHON_BIN}/python -m pip install --upgrade pip
 # Install `cmake` (i.e. non-Python build dependency).
@@ -31,11 +34,12 @@ cd ${REPO_ROOT}/google_crc32c/
 rm -rf build
 mkdir build
 cd build/
-${MAIN_PYTHON_BIN}/cmake \
+cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCRC32C_BUILD_TESTS=no \
     -DCRC32C_BUILD_BENCHMARKS=no \
     -DBUILD_SHARED_LIBS=yes \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.12 \
     ..
 make all install
 
@@ -56,7 +60,7 @@ if [[ -z ${BUILD_PYTHON} ]]; then
         elif [[ "${PYTHON_BIN}" == *"312"* ]]; then
             PYTHON_VERSIONS="${PYTHON_VERSIONS} ${PYTHON_BIN}"
             continue
-        elif [[ "${PYTHON_BIN}" == *"313"* ]]; then
+        elif [[ "${PYTHON_BIN}" == *"313"* && "${PYTHON_BIN}" != *"313t"* ]]; then
             PYTHON_VERSIONS="${PYTHON_VERSIONS} ${PYTHON_BIN}"
             continue
         else
@@ -84,7 +88,27 @@ done
 
 # Bundle external shared libraries into the wheels
 for whl in dist_wheels/google_crc32c*.whl; do
-    ${MAIN_PYTHON_BIN}/auditwheel repair "${whl}" --wheel-dir wheels/
+    "${MAIN_PYTHON_BIN}/auditwheel" repair "${whl}" --wheel-dir wheels/
+done
+
+# Install and test wheels
+for PYTHON_BIN in ${PYTHON_VERSIONS}; do
+    # Identify the short python version e.g. "39", "310"
+                    # Get the ABI tag from the Python binary's path, e.g., "cp310-cp310"
+                    ABI_TAG=$(basename $(dirname ${PYTHON_BIN}))
+                    ARCH=$(uname -m)
+                    # Create a virtual environment to install and test the wheel
+                    ${PYTHON_BIN}/python -m venv /tmp/venv
+                    
+                    # Find the correct wheel file using the precise ABI tag and architecture.
+                    WHEEL_FILE=$(ls ${REPO_ROOT}/wheels/google_crc32c-*-${ABI_TAG}-*manylinux*${ARCH}*.whl)    # Install the wheel
+    /tmp/venv/bin/pip install "${WHEEL_FILE}"
+
+    # Verify that the module is installed and peek at contents.
+    /tmp/venv/bin/python ${REPO_ROOT}/scripts/check_crc32c_extension.py
+    
+    # Clean up the virtual environment
+    rm -rf /tmp/venv
 done
 
 # Clean up.

packages/google-crc32c/scripts/manylinux/check.sh

@@ -21,21 +21,13 @@ export MACOSX_DEPLOYMENT_TARGET=12
 
 # ``readlink -f`` is not our friend on OS X. This relies on **some**
 # ``python`` being installed.
-SCRIPT_FI=$(python -c "import os; print(os.path.realpath('${0}'))")
+SCRIPT_FI=$(python3 -c "import os; print(os.path.realpath('${0}'))")
 OSX_DIR=$(dirname ${SCRIPT_FI})
 SCRIPTS_DIR=$(dirname ${OSX_DIR})
 export REPO_ROOT=$(dirname ${SCRIPTS_DIR})
 
-# install required packages for pyenv
-# https://github.com/pyenv/pyenv/wiki#suggested-build-environment
-brew install openssl readline sqlite3 xz zlib tcl-tk
-
-# Replace the old version of pyenv with the latest version.
-rm -rf /Users/kbuilder/.pyenv
-git clone https://github.com/pyenv/pyenv.git /Users/kbuilder/.pyenv
-
 # Build and install `libcrc32c`
-export PY_BIN="${PY_BIN:-python3}"
+export PY_BIN="python3"
 export CRC32C_INSTALL_PREFIX="${REPO_ROOT}/usr"
 
 cd ${REPO_ROOT}
@@ -46,14 +38,17 @@ git submodule update --init --recursive
 
 ${OSX_DIR}/build_c_lib.sh
 
-SUPPORTED_PYTHON_VERSIONS=("3.9" "3.10" "3.11" "3.12" "3.13")
-
-for PYTHON_VERSION in ${SUPPORTED_PYTHON_VERSIONS[@]}; do
-    echo "Build wheel for Python ${PYTHON_VERSION}"
-    export PY_BIN=$PYTHON_VERSION
-    export PY_TAG="cp${PYTHON_VERSION//.}-cp${PYTHON_VERSION//.}"
-    . /${OSX_DIR}/build_python_wheel.sh
-done
+# Build the wheel for the system Python.
+. /${OSX_DIR}/build_python_wheel.sh
+
+# Install the wheel in a virtualenv and test it.
+VENV=${REPO_ROOT}/venv
+"python3" -m venv ${VENV}
+${VENV}/bin/pip install --no-index --find-links=${REPO_ROOT}/wheels google-crc32c --force-reinstall
+${VENV}/bin/pip install pytest
+${VENV}/bin/py.test ${REPO_ROOT}/tests
+${VENV}/bin/python ${REPO_ROOT}/scripts/check_crc32c_extension.py
+rm -fr ${VENV}
 
 # Clean up.
 rm -fr ${CRC32C_INSTALL_PREFIX}

packages/google-crc32c/scripts/osx/build.sh

@@ -65,6 +65,7 @@ ${VENV}/bin/cmake \
     -DBUILD_SHARED_LIBS=yes \
     -DCMAKE_INSTALL_PREFIX:PATH=${CRC32C_INSTALL_PREFIX} \
     -DCMAKE_INSTALL_NAME_DIR:PATH=${CRC32C_INSTALL_PREFIX}/lib \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.12 \
     ..
 
 # Install `libcrc32c` into CRC32C_INSTALL_PREFIX.

packages/google-crc32c/scripts/osx/build_c_lib.sh

@@ -13,47 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Build a **single** Python wheel for a specified version. The version and
-# associated paths should be set as environment variables; the expected
-# environment variables will be verified below.
-
-set -e -x
-
-# Check that the REPO_ROOT, PY_BIN and PY_TAG environment variables are set.
-if [[ -z "${REPO_ROOT}" ]]; then
-    echo "REPO_ROOT environment variable should be set by the caller."
-    exit 1
-fi
-if [[ -z "${PY_BIN}" ]]; then
-    echo "PY_BIN environment variable should be set by the caller."
-    exit 1
-fi
-if [[ -z "${PY_TAG}" ]]; then
-    echo "PY_TAG environment variable should be set by the caller."
-    exit 1
-fi
-
-# set up pyenv & shell environment for switching across python versions
-eval "$(pyenv init -)"
-eval "$(pyenv init --path)"
-
-install_python_pyenv() {
-    version=$1
-
-    if [ -z "$(pyenv versions --bare | grep $version)" ]; then
-        echo "Python $version is not installed. Installing..."
-        pyenv install $version
-        echo "Python $version installed."
-    else
-        echo "Python $version is already installed."
-    fi
-    pyenv shell $version
-}
-install_python_pyenv ${PY_BIN}
+# ``readlink -f`` is not our friend on OS X. This relies on **some**
+# ``python`` being installed.
+SCRIPT_FI=$(python3 -c "import os; print(os.path.realpath('${0}'))")
+OSX_DIR=$(dirname ${SCRIPT_FI})
+SCRIPTS_DIR=$(dirname ${OSX_DIR})
+export REPO_ROOT=$(dirname ${SCRIPTS_DIR})
 
 # Create a virtualenv where we can install Python build dependencies.
-VENV=${REPO_ROOT}/venv${PY_BIN}
-"python${PY_BIN}" -m venv ${VENV}
+VENV=${REPO_ROOT}/venv_build
+"python3" -m venv ${VENV}
 
 curl https://bootstrap.pypa.io/get-pip.py | ${VENV}/bin/python
 ${VENV}/bin/python -m pip install \
@@ -76,11 +45,7 @@ ${VENV}/bin/delocate-wheel \
     --wheel-dir ${FIXED_WHEELS} \
     --verbose \
     --check-archs \
-    ${DIST_WHEELS}/google_crc32c*${PY_TAG}*.whl
-
-if [[ "${PUBLISH_WHEELS}" == "true" ]]; then
-    . /${OSX_DIR}/publish_python_wheel.sh
-fi
+    ${DIST_WHEELS}/google_crc32c*.whl
 
 # Clean up.
 rm -fr ${DIST_WHEELS}