Merge remote-tracking branch 'upstream/master' into pr_nmod_ctx

Author: oscarbenjamin

.github/workflows/buildwheel.yml

@@ -46,7 +46,10 @@ jobs:
         env:
           # override setting in pyproject.toml to use msys2 instead of msys64 bash
           CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh
-          CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel && msys2 -c bin/cibw_before_build_windows.sh
+          #
+          # Don't need to create pythonXX.a under meson. Not needed any more:
+          #   CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel && msys2 -c bin/cibw_before_build_windows.sh
+          #
 
       - uses: actions/upload-artifact@v4
         with:
@@ -109,7 +112,7 @@ jobs:
         os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
         # This list to be kept in sync with cibuildwheel config
         # and python-requires in pyproject.toml.
-        python-version: ['3.10', '3.11', '3.12', '3.13-dev']
+        python-version: ['3.10', '3.11', '3.12', '3.13-dev', 'pypy3.10']
 
     steps:
       - uses: actions/setup-python@v5
@@ -205,9 +208,9 @@ jobs:
           python-version: '3.12'
       - run: sudo apt-get update
       - run: sudo apt-get install libflint-dev
-      # This is branch is for a Cython PR:
+      # Need Cython's master branch until 3.1 is released because of:
       # https://github.com/cython/cython/pull/6341
-      - run: pip install git+https://github.com/oscarbenjamin/cython.git@pr_relative_paths
+      - run: pip install git+https://github.com/cython/cython.git@master
       - run: pip install -r requirements-dev.txt
       - run: bin/coverage.sh
 

bin/cibw_before_build_windows.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+#
+# This script was previously needed to make libpythonXX.a on Windows when using
+# MinGW and setuptools. This is no longer needed now that we use meson.
+#
+
 set -o errexit
 
 # Uncomment this to run cibuildwheel locally on Windows:

bin/cibw_repair_wheel_command_windows.sh

@@ -4,6 +4,12 @@
 #
 # https://github.com/scipy/scipy/blob/main/tools/wheels/repair_windows.sh
 
+#
+# This was previously needed because delvewheel would reject wheels with
+# binaries generated by MinGW unless they had been stripped. This is not needed
+# any more with newer versions of delvewheel.
+#
+
 set -o errexit
 
 # Uncomment this to run cibuildwheel locally on Windows:

pyproject.toml

@@ -58,7 +58,7 @@ package = "flint"
 [tool.cibuildwheel]
 # requires-python needs to keep in sync with this and also the list of Python
 # versions the wheels are tested against in CI.
-build = "cp310-* cp311-* cp312-* cp313-*"
+build = "cp310-* cp311-* cp312-* cp313-* pp310-*"
 skip = "*-win32 *-manylinux_i686 *-musllinux_*"
 
 # This is needed for free-threaded wheels:
@@ -90,5 +90,18 @@ before-all = "bin/cibw_before_all_macosx_$(uname -m).sh"
 
 [tool.cibuildwheel.windows]
 before-all = "C:\\msys64\\usr\\bin\\bash bin/cibw_before_all_windows.sh"
-before-build = "pip install delvewheel && C:\\msys64\\usr\\bin\\bash bin/cibw_before_build_windows.sh"
-repair-wheel-command = "bin\\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}"
+before-build = "pip install delvewheel"
+repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel} --add-path .local/bin"
+
+# Previously with setuptools and MinGW it was necessary to run
+# bin/cibw_before_build_windows.sh before building the wheel to create the
+# libpython*.a files. This is no longer necessary now meson is used:
+#
+#   before-build = "pip install delvewheel && C:\\msys64\\usr\\bin\\bash bin/cibw_before_build_windows.sh"
+#
+# Previously a custom delvewheel command was needed because delvewheel would
+# reject binaries created with MinGW unless they had been stripped. This is not
+# needed any more with newer versions of delvewheel:
+#
+#   repair-wheel-command = "bin\\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}"
+#

src/flint/flint_base/flint_base.pyx

@@ -258,8 +258,11 @@ cdef class flint_poly(flint_elem):
                     roots.append((v, m))
         return roots
 
+    def real_roots(self):
+        raise NotImplementedError("Real roots are not supported for this polynomial")
+
     def complex_roots(self):
-        raise AttributeError("Complex roots are not supported for this polynomial")
+        raise NotImplementedError("Complex roots are not supported for this polynomial")
 
 
 cdef class flint_mpoly_context(flint_elem):

src/flint/test/test_all.py

@@ -1469,6 +1469,9 @@ def set_bad2():
     assert P([1], 11).roots() == []
     assert P([1, 2, 3], 11).roots() == [(8, 1), (6, 1)]
     assert P([1, 6, 1, 8], 11).roots() == [(5, 3)]
+    assert raises(lambda: P([1, 2, 3], 11).real_roots(), DomainError)
+    assert raises(lambda: P([1, 2, 3], 11).complex_roots(), DomainError)
+
 
 def test_nmod_mat():
     M = flint.nmod_mat
@@ -2230,12 +2233,15 @@ def test_fmpz_mod_poly():
         assert set(ff.factor()[1]) == set(ff.factor(algorithm="kaltofen_shoup")[1])
         assert set(ff.factor()[1]) == set(ff.factor(algorithm="berlekamp")[1])
         assert raises(lambda: R_test([0,0,1]).factor(algorithm="AAA"), ValueError)
+        assert raises(lambda: R_test([0,0,1]).real_roots(), DomainError)
         assert raises(lambda: R_test([0,0,1]).complex_roots(), DomainError)
 
+
         # composite moduli not supported
         assert raises(lambda: R_cmp([0,0,1]).factor(), DomainError)
         assert raises(lambda: R_cmp([0,0,1]).factor_squarefree(), DomainError)
         assert raises(lambda: R_cmp([0,0,1]).roots(), NotImplementedError)
+        assert raises(lambda: R_cmp([0,0,1]).real_roots(), DomainError)
         assert raises(lambda: R_cmp([0,0,1]).complex_roots(), DomainError)
 
         # minpoly
@@ -4396,7 +4402,6 @@ def test_fq_default_poly():
         assert raises(lambda: f / "AAA", TypeError)
         assert raises(lambda: "AAA" / f, TypeError)
 
-
         # ZeroDivisionError
         assert raises(lambda: f / 0, ZeroDivisionError)
         assert raises(lambda: f // 0, ZeroDivisionError)
@@ -4429,6 +4434,9 @@ def test_fq_default_poly():
         # pow_mod
         assert f.pow_mod(2, g) == (f*f) % g
         assert raises(lambda: f.pow_mod(2, "AAA"), TypeError)
+
+        # roots
+        assert raises(lambda: f.real_roots(), DomainError)
         assert raises(lambda: f.complex_roots(), DomainError)
 
         # compose errors

src/flint/types/fmpz_mod_poly.pyx

@@ -1884,6 +1884,13 @@ cdef class fmpz_mod_poly(flint_poly):
                 res[i] = root
         return res
 
+    def real_roots(self):
+        """
+        This method is not implemented for polynomials in
+        :math:`(\mathbb{Z}/N\mathbb{Z})[X]`
+        """
+        raise DomainError("Cannot compute real roots for polynomials over integers modulo N")
+
     def complex_roots(self):
         """
         This method is not implemented for polynomials in

src/flint/types/fq_default_poly.pyx

@@ -1588,6 +1588,12 @@ cdef class fq_default_poly(flint_poly):
                 res[i] = root
         return res
 
+    def real_roots(self):
+        """
+        This method is not implemented for polynomials in finite fields
+        """
+        raise DomainError("Cannot compute real roots for polynomials over finite fields")
+
     def complex_roots(self):
         """
         This method is not implemented for polynomials in finite fields

src/flint/types/nmod_poly.pyx

@@ -863,3 +863,17 @@ cdef class nmod_poly(flint_poly):
             v = self.ctx.new_nmod_poly()
             nmod_poly_deflate(v.val, self.val, n)
             return v, int(n)
+
+    def real_roots(self):
+        """
+        This method is not implemented for polynomials in
+        :math:`(\mathbb{Z}/N\mathbb{Z})[X]`
+        """
+        raise DomainError("Cannot compute real roots for polynomials over integers modulo N")
+
+    def complex_roots(self):
+        """
+        This method is not implemented for polynomials in
+        :math:`(\mathbb{Z}/N\mathbb{Z})[X]`
+        """
+        raise DomainError("Cannot compute complex roots for polynomials over integers modulo N")