Run Cython tests for binary wheels

Closes aleaxit#447
skirpichev · Dec 21, 2023 · 6977c03 · 6977c03
1 parent 8a39f52
commit 6977c03
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -18,9 +18,12 @@ jobs:
         env:
           CIBW_PRERELEASE_PYTHONS: True
           CIBW_SKIP: pp*
-          CIBW_BEFORE_BUILD: bash scripts/before_ci_build.sh
+          CIBW_BEFORE_BUILD: bash scripts/before_ci_build.sh {package}
           CIBW_TEST_EXTRAS: tests
           CIBW_TEST_COMMAND: pytest {package}/test/
+          CIBW_TEST_COMMAND_LINUX: >
+            pytest {package}/test/ &&
+            python {package}/test_cython/runtests.py
 
       - uses: actions/upload-artifact@v3
         with:

diff --git a/scripts/before_ci_build.sh b/scripts/before_ci_build.sh
@@ -1,8 +1,11 @@
+#!/bin/bash
+
 set -e -x
 
 GMP_VERSION=6.3.0
 MPFR_VERSION=4.2.1
 MPC_VERSION=1.3.1
+PACKAGE=$1
 if [ ! -f finish_before_ci_build ]; then
   if [[ "$OSTYPE" == "linux-gnu" || "$OSTYPE" == "linux-musl" || "$OSTYPE" == "darwin"* ]]; then
     curl -s -O https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz
@@ -19,6 +22,7 @@ if [ ! -f finish_before_ci_build ]; then
     curl -s -O https://ftp.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz
     tar -xf mpc-${MPC_VERSION}.tar.gz
     cd mpc-${MPC_VERSION} && ./configure && make -j4 && make install && cd ../
+    cp /usr/local/include/{gmp,mpfr,mpc}.h $PACKAGE/gmpy2/
   fi
   touch finish_before_ci_build
 else

diff --git a/test_cython/setup_cython.py b/test_cython/setup_cython.py
@@ -1,19 +1,26 @@
 from setuptools import Extension, setup
 from Cython.Build import cythonize
-import platform
 import sys
 import os
+import platform
 import gmpy2
 
-ON_WINDOWS = platform.system() == 'Windows'
+gmpy2_packagedir = os.path.dirname(gmpy2.__file__)
+library_dirs = sys.path + [gmpy2_packagedir]
+libnames = ['mpc','mpfr','gmp']
+
+if platform.system() == 'Linux':
+    bundled_libs = gmpy2_packagedir+'/../gmpy2.libs/'
+    if os.path.isdir(bundled_libs):
+        library_dirs += [bundled_libs]
+        libnames = [':' + d for d in os.listdir(bundled_libs)]
+
 
 extensions = [
     Extension("test_cython", ["test_cython.pyx"],
-                include_dirs=sys.path + ([os.path.dirname(gmpy2.__file__)] if ON_WINDOWS else []),
-                library_dirs=sys.path + ([os.path.dirname(gmpy2.__file__)] if ON_WINDOWS else []),
-                libraries=['mpc','mpfr','gmp']
-            )
-]
+              include_dirs=sys.path + [gmpy2_packagedir],
+              library_dirs=library_dirs,
+              libraries=libnames)]
 
 setup(
     name="cython_gmpy_test",

diff --git a/test_cython/test_cython.pyx b/test_cython/test_cython.pyx
@@ -1,4 +1,3 @@
-# distutils: libraries = gmp mpfr mpc
 from gmpy2 cimport *
 
 import_gmpy2()