Try building on windows-2022

.github/workflows/buildwheel.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-13, macos-14]
+        os: [ubuntu-22.04, ubuntu-22.04-arm, windows-2022, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
@@ -29,17 +29,17 @@ jobs:
           # problematic in some situations. Maybe there is a better way to do
           # this.
           path-type: inherit
-        if: ${{ matrix.os == 'windows-2019' }}
+        if: ${{ startsWith( matrix.os , 'windows' ) }}
 
         # Install pkgconfig on Windows from choco rather than from msys and
         # avoid using the Strawberry one.
       - run: choco install -y --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
-        if: ${{ matrix.os == 'windows-2019' }}
+        if: ${{ startsWith( matrix.os , 'windows' ) }}
 
         # We have to set this here rather than in the cibuildwheel config
         # This is probably something to do with \ vs / in paths...
       - run: echo "PKG_CONFIG_PATH=${{ github.workspace }}/.local/lib/pkgconfig" >> $env:GITHUB_ENV
-        if: ${{ matrix.os == 'windows-2019' }}
+        if: ${{ startsWith( matrix.os , 'windows' ) }}
 
       - name: Build wheels
         uses: pypa/cibuildwheel@90a0ddeff0f23eebc21630e65d66d0f4955e9b94 # v3.0.0b1

bin/all_rst_to_pxd.sh

@@ -11,7 +11,7 @@ fi
 FLINT_DOC_DIR=$1
 
 modules=(
-    # "flint"
+    "flint"
     "mpoly"
     # "thread_pool"
     # "machine_vectors"

bin/build_variables.sh

@@ -21,4 +21,4 @@ MPIRVER=3.0.0 # MPIR build no longer works (not clear where to download from)
 # These are the actual dependencies used (at least by default):
 GMPVER=6.3.0
 MPFRVER=4.2.2
-FLINTVER='3.3.0'
+FLINTVER='3.3.1'

pyproject.toml

@@ -88,7 +88,6 @@ enable = ["cpython-freethreading", "pypy"]
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux_2_28"
 manylinux-i686-image = "manylinux2014"
-test-command = "python -c \"import flint; print(str(flint.fmpz(2)))\""
 
 [tool.cibuildwheel.linux.environment]
 # LD_LIBRARY_PATH is needed by auditwheel

src/flint/flintlib/functions/flint.pxd

@@ -0,0 +1,48 @@
+from flint.flintlib.types.flint cimport flint_rand_t, slong
+
+# unknown type ...
+# unknown type FILE
+# unknown type flint_err_t
+# unknown type int ( cmp) ( void
+# unknown type size_t
+# unknown type va_list
+# unknown type va_list)
+# unknown type void (
+
+# .. macro:: __FLINT_VERSION
+# .. macro:: __FLINT_RELEASE
+# .. macro:: FLINT_VERSION
+# .. macro:: FLINT_BITS
+# .. macro:: FLINT_D_BITS
+# .. macro:: FLINT_ABS(x)
+# .. macro:: FLINT_UABS(x)
+# .. macro:: FLINT_MIN(x, y)
+# .. macro:: FLINT_SWAP(T, x, y)
+# .. macro:: FLINT_SGN(x)
+# .. macro:: UWORD_MIN
+
+cdef extern from "flint/flint.h":
+    # void * flint_malloc(size_t size)
+    # void * flint_realloc(void * ptr, size_t size)
+    # void * flint_calloc(size_t num, size_t size)
+    void flint_free(void * ptr)
+    void flint_rand_init(flint_rand_t state)
+    void flint_rand_clear(flint_rand_t state)
+    void flint_set_num_threads(int num_threads)
+    # int flint_get_num_threads(void)
+    int flint_set_num_workers(int num_workers)
+    void flint_reset_num_workers(int num_workers)
+    # int flint_printf(const char * format, ...)
+    # int flint_fprintf(FILE * fs, const char * format, ...)
+    # int flint_vprintf(const char * format, va_list vlist)
+    # int flint_vfprintf(FILE * fs, const char * format, va_list vlist)
+    # int flint_sprintf(char * s, const char * str, ...)
+    # int flint_scanf(const char * str, ...)
+    # int flint_fscanf(FILE * f, const char * str, ...)
+    # int flint_sscanf(const char * s, const char * str, ...)
+    # void flint_abort(void)
+    # void flint_throw(flint_err_t exc, const char * msg, ...)
+    # void flint_set_abort(void (* func)(void))
+    # void flint_set_throw(void (* func)(flint_err_t, const char *, va_list))
+    # void flint_merge_sort(void * buf, slong len, slong size, int (* cmp) (const void *, const void *, void *), void * data)
+    # void flint_sort(void * buf, slong len, slong size, int (* cmp) (const void *, const void *, void *), void * data)

src/flint/flintlib/functions/fmpz_mod_mat.pxd

@@ -1,6 +1,7 @@
 from flint.flintlib.types.flint cimport flint_rand_t, fmpz_struct, fmpz_t, slong, ulong
 from flint.flintlib.types.fmpz cimport fmpz_mat_t
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_mat_t, fmpz_mod_poly_t
+from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_mat_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
 
 # unknown type thread_pool_handle
 

src/flint/flintlib/functions/fmpz_mod_poly.pxd

@@ -1,7 +1,7 @@
 from flint.flintlib.types.flint cimport flint_rand_t, fmpz_struct, fmpz_t, slong, ulong
 from flint.flintlib.types.fmpz cimport fmpz_mat_t, fmpz_poly_struct, fmpz_poly_t
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_poly_struct, fmpz_mod_poly_t
-from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_berlekamp_massey_t, fmpz_mod_poly_frobenius_powers_2exp_t, fmpz_mod_poly_frobenius_powers_t, fmpz_mod_poly_radix_t
+from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_berlekamp_massey_t, fmpz_mod_poly_frobenius_powers_2exp_t, fmpz_mod_poly_frobenius_powers_t, fmpz_mod_poly_radix_t, fmpz_mod_poly_struct, fmpz_mod_poly_t
 from flint.flintlib.types.nmod cimport nmod_poly_t
 
 # unknown type FILE

src/flint/flintlib/functions/fmpz_mod_poly_factor.pxd

@@ -1,6 +1,7 @@
 from flint.flintlib.types.flint cimport flint_rand_t, fmpz_struct, fmpz_t, slong
 from flint.flintlib.types.fmpz cimport fmpz_factor_t
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_poly_factor_t, fmpz_mod_poly_t
+from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_poly_factor_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
 
 
 

src/flint/flintlib/functions/fq.pxd

@@ -1,6 +1,7 @@
 from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, slong, ulong
 from flint.flintlib.types.fmpz cimport fmpz_poly_t
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_mat_t, fmpz_mod_poly_t
+from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_mat_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
 from flint.flintlib.types.fq cimport fq_ctx_t, fq_t
 
 # unknown type 

src/flint/flintlib/functions/fq_default.pxd

@@ -1,6 +1,7 @@
 from flint.flintlib.types.flint cimport flint_rand_t, fmpz_t, slong, ulong
 from flint.flintlib.types.fmpz cimport fmpz_poly_t
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_poly_t
+from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
 from flint.flintlib.types.fq_default cimport fq_default_ctx_t, fq_default_t
 from flint.flintlib.types.nmod cimport nmod_poly_t
 

src/flint/flintlib/functions/fq_default_poly.pxd

@@ -1,6 +1,6 @@
 from flint.flintlib.types.flint cimport flint_rand_t, fmpz_t, slong, ulong
 from flint.flintlib.types.fmpz cimport fmpz_poly_t
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_poly_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
 from flint.flintlib.types.fq_default cimport fq_default_ctx_t, fq_default_poly_t, fq_default_t
 from flint.flintlib.types.nmod cimport nmod_poly_t
 

src/flint/flintlib/functions/fq_nmod_poly.pxd

@@ -1,5 +1,5 @@
 from flint.flintlib.types.flint cimport flint_rand_t, fmpz_t, slong, ulong
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_poly_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
 from flint.flintlib.types.fq_nmod cimport fq_nmod_ctx_t, fq_nmod_mat_t, fq_nmod_poly_t, fq_nmod_struct, fq_nmod_t
 from flint.flintlib.types.nmod cimport nmod_poly_t
 

src/flint/flintlib/functions/fq_poly.pxd

@@ -1,5 +1,5 @@
 from flint.flintlib.types.flint cimport flint_rand_t, fmpz_t, slong, ulong
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_poly_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
 from flint.flintlib.types.fq cimport fq_ctx_t, fq_mat_t, fq_poly_t, fq_struct, fq_t
 from flint.flintlib.types.nmod cimport nmod_poly_t
 

src/flint/flintlib/functions/fq_zech_poly.pxd

@@ -1,5 +1,5 @@
 from flint.flintlib.types.flint cimport flint_rand_t, fmpz_t, slong, ulong
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_poly_t
+from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
 from flint.flintlib.types.fq_zech cimport fq_zech_ctx_t, fq_zech_mat_t, fq_zech_poly_t, fq_zech_struct, fq_zech_t
 from flint.flintlib.types.nmod cimport nmod_poly_t
 

src/flint/test/__main__.py

@@ -56,7 +56,7 @@ def run_doctests(tests, verbose=False):
             print(f"{module}...", end="" if not verbose else "\n", flush=True)
             for test in test_set:
                 if verbose:
-                    print("\tTesting:", test.name)
+                    print("\tTesting:", test.name, flush=True)
                 runner.run(test)
             print("OK")
 

src/flint/types/arb.pyx

@@ -12,6 +12,7 @@ from flint.types.fmpq cimport fmpq
 from flint.types.fmpz cimport fmpz
 
 from flint.flintlib.types.flint cimport FMPZ_UNKNOWN, FMPZ_TMP, FMPZ_REF
+from flint.flintlib.functions.flint cimport flint_free
 from flint.flintlib.functions.mag cimport *
 from flint.flintlib.functions.fmpz cimport fmpz_init, fmpz_clear
 from flint.flintlib.functions.arf cimport *
@@ -474,7 +475,7 @@ cdef class arb(flint_scalar):
         try:
             res = str_from_chars(s)
         finally:
-            libc.stdlib.free(s)
+            flint_free(s)
         if ctx.unicode:
             res = res.replace("+/-", "±")
         return res

src/flint/types/fmpz.pyx

@@ -5,6 +5,7 @@ from flint.utils.conversion cimport str_from_chars, _str_trunc
 cimport libc.stdlib
 
 from flint.flintlib.types.flint cimport FMPZ_REF, FMPZ_TMP, FMPZ_UNKNOWN, COEFF_IS_MPZ
+from flint.flintlib.functions.flint cimport flint_free
 from flint.flintlib.functions.fmpz cimport *
 from flint.flintlib.types.fmpz cimport fmpz_factor_expand
 from flint.flintlib.functions.fmpz_factor cimport *
@@ -22,7 +23,7 @@ cdef fmpz_get_intlong(fmpz_t x):
     if COEFF_IS_MPZ(x[0]):
         s = fmpz_get_str(NULL, 16, x)
         v = int(str_from_chars(s), 16)
-        libc.stdlib.free(s)
+        flint_free(s)
         return v
     else:
         return <slong>x[0]
@@ -165,7 +166,7 @@ cdef class fmpz(flint_scalar):
         try:
             res = str_from_chars(s)
         finally:
-            libc.stdlib.free(s)
+            flint_free(s)
         if condense > 0:
             res = _str_trunc(res, condense)
         return res