Merge pull request #35 from oscarbenjamin/pr_cython3

Add `__radd__` etc methods for Cython 3.x

Author: oscarbenjamin

.github/workflows/buildwheel.yml

@@ -43,7 +43,7 @@ jobs:
           CIBW_BEFORE_ALL_MACOS: bin/cibw_before_all_macosx_x86_64.sh
           CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh
           CIBW_BEFORE_BUILD_WINDOWS: msys2 -c bin/cibw_before_build_windows.sh
-          CIBW_BEFORE_BUILD: pip install numpy cython delvewheel
+          CIBW_BEFORE_BUILD: pip install numpy cython==3.0.0b2 delvewheel
           CIBW_ENVIRONMENT: >
             C_INCLUDE_PATH=$(pwd)/.local/include/
             LIBRARY_PATH=$(pwd)/.local/lib/

.gitignore

@@ -15,3 +15,4 @@ MANIFEST
 *.egg-info
 .coverage
 *.swp
+.python-version

bin/build_dependencies_unix.sh

@@ -48,6 +48,10 @@ do
       PATCH_GMP_ARM64=yes
       shift
     ;;
+    --use-gmp-github-mirror)
+      USE_GMP_GITHUB_MIRROR=yes
+      shift
+    ;;
   *)
     2>&1 echo "unrecognised argument:" $key
     exit 1
@@ -82,17 +86,22 @@ if [ $USE_GMP = "gmp" ]; then
   #                                                                         #
   # ----------------------------------------------------------------------- #
 
-  curl -O https://gmplib.org/download/gmp/gmp-$GMPVER.tar.xz
+  if [ $USE_GMP_GITHUB_MIRROR = "yes" ]; then
+    # Needed in GitHub Actions because it is blocked from gmplib.org
+    git clone https://github.com/oscarbenjamin/gmp_mirror.git
+    cp gmp_mirror/gmp-$GMPVER.tar.xz .
+  else
+    curl -O https://gmplib.org/download/gmp/gmp-$GMPVER.tar.xz
+  fi
+
   tar xf gmp-$GMPVER.tar.xz
   cd gmp-$GMPVER
 
     #
     # See https://github.com/aleaxit/gmpy/issues/350
     #
-    # We need to patch GMP for OSX arm64 (Apple M1) hardware. This patch is
-    # from the GMP repo but was applied after the release of GMP 6.2.1.
-    # Hopefully when a newer version of GMP is released we will not need to
-    # apply this patch any more.
+    # We need to patch GMP for OSX arm64 (Apple M1) hardware for GMP 6.2.1.
+    # Now with GMP 6.3.0 this should not be needed any more.
     #
     if [ $PATCH_GMP_ARM64 = "yes" ]; then
       echo
@@ -103,6 +112,7 @@ if [ $USE_GMP = "gmp" ]; then
     fi
 
     # Show the output of configfsf.guess
+    chmod +x configfsf.guess
     ./configfsf.guess
     ./configure --prefix=$PREFIX\
       --enable-fat\

bin/build_variables.sh

@@ -13,7 +13,7 @@
 PREFIX=$(pwd)/.local
 mkdir -p $PREFIX
 
-GMPVER=6.2.1
+GMPVER=6.3.0
 YASMVER=1.3.0
 MPIRVER=3.0.0
 MPFRVER=4.1.0

bin/cibw_before_all_linux.sh

@@ -3,4 +3,5 @@
 yum install -y xz
 bin/build_dependencies_unix.sh\
   --gmp gmp\
-  --host x86_64-pc-linux-gnu
+  --host x86_64-pc-linux-gnu\
+  --use-gmp-github-mirror

bin/cibw_before_all_macosx_arm64.sh

@@ -6,4 +6,4 @@ export LDFLAGS=" -arch arm64"
 bin/build_dependencies_unix.sh\
   --gmp gmp\
   --host aarch64-apple-darwin\
-  --patch-gmp-arm64
+  --use-gmp-github-mirror

bin/cibw_before_all_macosx_x86_64.sh

@@ -2,4 +2,5 @@
 
 bin/build_dependencies_unix.sh\
   --gmp gmp\
-  --host x86_64-apple-darwin
+  --host x86_64-apple-darwin\
+  --use-gmp-github-mirror

bin/cibw_before_all_windows.sh

@@ -17,4 +17,4 @@ cat setup.cfg
 pacman -S --noconfirm mingw-w64-x86_64-gcc m4 make mingw-w64-x86_64-tools-git
 
 # This takes ~30mins
-bin/build_dependencies_unix.sh
+bin/build_dependencies_unix.sh --use-gmp-github-mirror

bin/cibw_before_build_windows.sh

@@ -40,4 +40,4 @@ mv libpython${VER}.a libs
 #  Install build dependencies                     #
 ###################################################
 
-pip install Cython numpy delvewheel
+pip install cython numpy delvewheel

setup.py

@@ -45,7 +45,10 @@
 
 
 define_macros = []
-compiler_directives = {'language_level':3}
+compiler_directives = {
+    'language_level': 3,
+    'binding': False,
+}
 
 
 # Enable coverage tracing