Merge branch 'master' into pr_lerch_phi

Author: oscarbenjamin

README.md

@@ -132,8 +132,12 @@ CHANGELOG
 -------------
 
 Next release:
+
 - [gh-161](https://github.com/flintlib/python-flint/pull/161)
   Add `acb.lerch_phi` to compute the Lerch transcendent.
+- [gh-132](https://github.com/flintlib/python-flint/pull/132)
+  Add `fmpz_mpoly` and `fmpq_mpoly` types for multivariate polynomials with
+  integer or rational coefficients.
 - [gh-160](https://github.com/flintlib/python-flint/pull/160)
   Add `bits` to `arb` and `acb`, add `log_base` to `arb`.
 - [gh-149](https://github.com/flintlib/python-flint/pull/149)
@@ -145,8 +149,8 @@ Next release:
   Add `rel_one_ccuracy_bits` to `arb` and `acb`.
 - [gh-142](https://github.com/flintlib/python-flint/pull/142)
   Add `acb_theta` module for the numerical evaluation of [theta
-  functions](https://flintlib.org/doc/acb_theta.html) (only available for Flint
-  >= 3.1).
+  functions](https://flintlib.org/doc/acb_theta.html) (only available for
+  `Flint >= 3.1`).
 - [gh-137](https://github.com/flintlib/python-flint/pull/137)
   Add `erfinv` and `erfcinv` for `arb`.
 - [gh-129](https://github.com/flintlib/python-flint/pull/129)

bin/bump_version.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+filenames_default = [
+    "pyproject.toml",
+    "src/flint/__init__.py",
+    "doc/source/conf.py",
+    "src/flint/test/test_all.py",
+]
+
+def main(version2=None, *filenames):
+    """Bump version number in files.
+
+        $ bin/bump_version.py
+        Current version: 0.1.0
+
+        $ bin/bump_version.py 0.1.0 0.1.1
+        Set version 0.1.0 to 0.1.1 in:
+        pyproject.toml
+        src/flint/__init__.py
+        doc/source/conf.py
+        src/flint/test/test_all.py
+
+    """
+    with open("pyproject.toml", "r") as f:
+        text = f.read()
+    version1 = text.split("version = \"")[1].split("\"")[0]
+
+    if not version2:
+        print(f"Current version: {version1}")
+        return
+
+    if not filenames:
+        filenames = filenames_default
+
+    print(f"Set version {version1} to {version2} in:")
+    for filename in filenames:
+        print(filename)
+        with open(filename, "r") as f:
+            text = f.read()
+        with open(filename, "w") as f:
+            f.write(text.replace(version1, version2))
+
+if __name__ == "__main__":
+    import sys
+    main(*sys.argv[1:])

doc/source/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.0a2'
+version = '0.7.0a3'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.0a2'
+release = '0.7.0a3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

meson.build

@@ -9,6 +9,17 @@ gmp_dep = dependency('gmp')
 mpfr_dep = dependency('mpfr')
 flint_dep = dependency('flint')
 
+add_project_arguments(
+    '-X', 'embedsignature=True',
+    '-X', 'emit_code_comments=True',
+    language : 'cython'
+)
+
+if get_option('coverage')
+   add_project_arguments('-X', 'linetrace=True', language : 'cython')
+   add_project_arguments('-DCYTHON_TRACE=1', language : 'c')
+endif
+
 # Add rpaths for a local build of flint found via pkgconfig
 #   https://github.com/mesonbuild/meson/issues/13046
 if get_option('add_flint_rpath')

meson.options

@@ -1 +1,2 @@
+option('coverage', type : 'boolean', value : false, description : 'enable coverage build')
 option('add_flint_rpath', type : 'boolean', value : false)

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "mesonpy"
 [project]
 name = "python-flint"
 description = "Bindings for FLINT and Arb"
-version = "0.7.0a2"
+version = "0.7.0a3"
 urls = {Homepage = "https://github.com/flintlib/python-flint"}
 authors = [
     {name = "Fredrik Johansson", email = "fredrik.johansson@gmail.com"},

setup.py

@@ -81,12 +81,14 @@
     ("flint.flint_base.flint_context", ["src/flint/flint_base/flint_context.pyx"]),
 
     ("flint.types.fmpz", ["src/flint/types/fmpz.pyx"]),
+    ("flint.types.fmpz_vec", ["src/flint/types/fmpz_vec.pyx"]),
     ("flint.types.fmpz_poly", ["src/flint/types/fmpz_poly.pyx"]),
     ("flint.types.fmpz_mpoly", ["src/flint/types/fmpz_mpoly.pyx"]),
     ("flint.types.fmpz_mat", ["src/flint/types/fmpz_mat.pyx"]),
     ("flint.types.fmpz_series", ["src/flint/types/fmpz_series.pyx"]),
 
     ("flint.types.fmpq", ["src/flint/types/fmpq.pyx"]),
+    ("flint.types.fmpq_vec", ["src/flint/types/fmpq_vec.pyx"]),
     ("flint.types.fmpq_poly", ["src/flint/types/fmpq_poly.pyx"]),
     ("flint.types.fmpq_mat", ["src/flint/types/fmpq_mat.pyx"]),
     ("flint.types.fmpq_series", ["src/flint/types/fmpq_series.pyx"]),
@@ -100,6 +102,9 @@
     ("flint.types.fmpz_mod_poly", ["src/flint/types/fmpz_mod_poly.pyx"]),
     ("flint.types.fmpz_mod_mat", ["src/flint/types/fmpz_mod_mat.pyx"]),
 
+    ("flint.types.fmpq_mpoly", ["src/flint/types/fmpq_mpoly.pyx"]),
+    ("flint.types.fmpz_mpoly_q", ["src/flint/types/fmpz_mpoly_q.pyx"]),
+
     ("flint.types.arf", ["src/flint/types/arf.pyx"]),
     ("flint.types.arb", ["src/flint/types/arb.pyx"]),
     ("flint.types.arb_poly", ["src/flint/types/arb_poly.pyx"]),

src/flint/__init__.py

@@ -4,22 +4,26 @@
 from .types.fmpz_poly import *
 from .types.fmpz_mat import *
 from .types.fmpz_series import *
+from .types.fmpz_vec import fmpz_vec
 
 from .types.fmpq import *
 from .types.fmpq_poly import *
 from .types.fmpq_mat import *
 from .types.fmpq_series import *
+from .types.fmpq_vec import fmpq_vec
 
 from .types.nmod import *
 from .types.nmod_poly import *
 from .types.nmod_mat import *
 from .types.nmod_series import *
 
-from .types.fmpz_mpoly import *
+from .types.fmpz_mpoly import fmpz_mpoly_ctx, fmpz_mpoly, fmpz_mpoly_vec
 from .types.fmpz_mod import *
 from .types.fmpz_mod_poly import *
 from .types.fmpz_mod_mat import fmpz_mod_mat
 
+from .types.fmpq_mpoly import fmpq_mpoly_ctx, fmpq_mpoly, fmpq_mpoly_vec
+
 from .types.arf import *
 from .types.arb import *
 from .types.arb_poly import *
@@ -36,6 +40,7 @@
 from .flint_base.flint_base import (
     FLINT_VERSION as __FLINT_VERSION__,
     FLINT_RELEASE as __FLINT_RELEASE__,
+    Ordering,
 )
 
-__version__ = '0.7.0a2'
+__version__ = '0.7.0a3'

src/flint/flint_base/flint_base.pxd

@@ -1,3 +1,5 @@
+from flint.flintlib.mpoly cimport ordering_t
+
 cdef class flint_elem:
     pass
 
@@ -7,6 +9,10 @@ cdef class flint_scalar(flint_elem):
 cdef class flint_poly(flint_elem):
     pass
 
+cdef class flint_mpoly_context(flint_elem):
+    cdef public object py_names
+    cdef const char ** c_names
+
 cdef class flint_mpoly(flint_elem):
     pass
 
@@ -15,3 +21,9 @@ cdef class flint_mat(flint_elem):
 
 cdef class flint_series(flint_elem):
     pass
+
+cpdef enum Ordering:
+    lex, deglex, degrevlex
+
+cdef ordering_t ordering_py_to_c(ordering: Ordering)
+cdef ordering_c_to_py(ordering_t ordering)