Merge pull request #22 from oscarbenjamin/tmp_flint_290

maint: update versions for built wheels (flint 2.9.0, arb 2.23.0)

Author: oscarbenjamin

.github/workflows/buildwheel.yml

@@ -14,12 +14,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v2
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.11.2
         env:
-          CIBW_BUILD: cp37-* cp38-* cp39-* cp310-*
+          CIBW_BUILD: cp39-* cp310-* cp311-*
           CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux_*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_BEFORE_ALL_LINUX: bin/cibw_before_build_linux.sh
@@ -31,7 +34,7 @@ jobs:
             LD_LIBRARY_PATH=$(pwd)/.local/lib:$LD_LIBRARY_PATH
           CIBW_TEST_COMMAND: python -c 'import flint; print(str(flint.fmpz(2)))'
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: wheelhouse/*.whl
 
@@ -43,11 +46,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, macOS-10.15]
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.9', '3.10', '3.11']
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - uses: actions/download-artifact@v3

bin/build_dependencies_unix.sh

@@ -149,7 +149,7 @@ cd ..
 #                                                                           #
 # ------------------------------------------------------------------------- #
 
-curl -O https://www.flintlib.org/flint-$FLINTVER.tar.gz
+curl -O -L https://www.flintlib.org/flint-$FLINTVER.tar.gz
 tar xf flint-$FLINTVER.tar.gz
 cd flint-$FLINTVER
   ./configure --prefix=$PREFIX\

bin/build_variables.sh

@@ -17,5 +17,5 @@ GMPVER=6.2.1
 YASMVER=1.3.0
 MPIRVER=3.0.0
 MPFRVER=4.1.0
-FLINTVER=2.8.4
-ARBVER=2.22.0
+FLINTVER=2.9.0
+ARBVER=2.23.0

src/flint/_flint.pxd

@@ -532,9 +532,9 @@ cdef extern from "flint/fmpq.h":
 cdef extern from "flint/fmpq_poly.h":
     ctypedef struct fmpq_poly_struct:
         fmpz_struct * coeffs
-        fmpz_t den
         long alloc
         long length
+        fmpz_t den
     ctypedef fmpq_poly_struct fmpq_poly_t[1]
     void fmpq_poly_init(fmpq_poly_t poly)
     void fmpq_poly_init2(fmpq_poly_t poly, long alloc)
@@ -703,7 +703,7 @@ cdef extern from "flint/fmpq_mat.h":
 cdef extern from "flint/arith.h":
     void arith_number_of_partitions(fmpz_t res, ulong n)
     int arith_moebius_mu(fmpz_t n)
-    void arith_divisor_sigma(fmpz_t v, fmpz_t n, ulong k)
+    void arith_divisor_sigma(fmpz_t v, ulong k, fmpz_t n)
     void arith_euler_phi(fmpz_t v, fmpz_t n)
     void arith_bell_number(fmpz_t v, ulong n)
     void arith_euler_number(fmpz_t v, ulong n)

src/flint/fmpz.pyx

@@ -559,7 +559,7 @@ cdef class fmpz(flint_scalar):
             605263138639095300
         """
         cdef fmpz v = fmpz()
-        arith_divisor_sigma(v.val, n.val, k)
+        arith_divisor_sigma(v.val, k, n.val)
         return v
 
     def euler_phi(n):