Merge branch 'master' into improve_powmod_and_compose

Author: GiacomoPope

.cirrus.yml renamed to .cirrus.yml.backup

@@ -9,14 +9,12 @@ cirrus_wheels_macos_arm64_task:
   env:
     PATH: /opt/homebrew/opt/[email protected]/bin:$PATH
     CIBW_ARCHS_MACOS: arm64
+    CIBW_TEST_COMMAND: "python -m flint.test"
   install_pre_requirements_script:
-    - brew install [email protected]
-    - ln -s python3 /opt/homebrew/opt/[email protected]/bin/python
-    - which python
-    - python --version
-  install_cibuildwheel_script:
-    - python -m pip install cibuildwheel==2.16.2
+    - python3 -m venv venv
+    - venv/bin/pip install --upgrade pip
+    - venv/bin/pip install cibuildwheel==2.16.2
   run_cibuildwheel_script:
-    - bin/cibw.sh
+    - venv/bin/cibuildwheel --platform macos
   wheels_artifacts:
     path: "wheelhouse/*"

.github/workflows/buildwheel.yml

@@ -10,14 +10,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
 
       - uses: msys2/setup-msys2@v2
         with:
@@ -31,8 +31,18 @@ jobs:
           path-type: inherit
         if: ${{ matrix.os == 'windows-2019' }}
 
+        # 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' }}
+
+        # 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' }}
+
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.19.2
         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
@@ -45,7 +55,7 @@ jobs:
 
   build_sdist:
     name: Build sdist
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -54,6 +64,11 @@ jobs:
         with:
           python-version: '3.12'
 
+      - run: sudo apt-get update
+      - run: sudo apt-get install libgmp-dev libmpfr-dev xz-utils ninja-build
+      - run: curl -O -L https://www.flintlib.org/flint-3.1.0.tar.gz
+      - run: tar -xzf flint-3.1.0.tar.gz
+      - run: cd flint-3.1.0 && ./configure --disable-static && make -j4 && sudo make install
       - run: pip install build
       - run: python -m build --sdist
 
@@ -91,7 +106,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
         python-version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
@@ -105,36 +120,69 @@ jobs:
       - run: pip install --no-index --find-links wheelhouse python_flint
       - run: python -m flint.test --verbose
 
-  test_pip_vcs_sdist:
-    name: pip install ${{ matrix.target }} on ${{ matrix.python-version }}
-    runs-on: ubuntu-22.04
+  # On new enough Ubuntu we can build against the system deb.
+  test_pip_flint_deb:
+    name: Build on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.11', '3.12', '3.13-dev']
-        # '.' means install from python-flint git checkout
-        # 'python-flint' means install from PyPI sdist
-        target: ['.', 'python-flint']
+        os: [ubuntu-24.04]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
-      - run: bin/pip_install_ubuntu.sh ${{ matrix.target }}
+          python-version: '3.12'
+      - run: sudo apt-get update
+      - run: sudo apt-get install libflint-dev
+      - run: pip install .
       - run: python -m flint.test --verbose
 
+  # For older Ubuntu we have to build Flint >= 3.0.0
   test_flint_versions:
-    name: Test flint ${{ matrix.flinttag }}
+    name: Test flint ${{ matrix.flint-tag }}
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        # minimum supported version and latest git
-        flinttag: ['v3.0.0', 'main']
+        # Supported versions and latest git
+        flint-tag: ['v3.0.0', 'v3.0.1', 'v3.1.0', 'v3.1.1', 'v3.1.2', 'main']
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
-      - run: bin/pip_install_ubuntu.sh . ${{ matrix.flinttag }}
+          python-version: '3.12'
+      - run: bin/install_flint_ubuntu.sh ${{ matrix.flint-tag }}
+      - run: pip install .
       - run: python -m flint.test --verbose
+
+  # Deploy wheels and sdist to PyPI
+
+  pypi_release:
+    name: Publish to PyPI
+    needs: [build_wheels, build_sdist]
+    # Run only when a tag is pushed to the flintlib/python-flint repo
+    if: "github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && github.repository_owner == 'flintlib'"
+    environment:
+      name: pypi
+      url: https://pypi.org/p/sympy
+    permissions:
+      id-token: write
+    runs-on: ubuntu-latest
+
+    steps:
+        # Downloads all artifacts
+      - name: Download release artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: wheelhouse
+          merge-multiple: true
+
+      - name: Copy the PyPI files into dist
+        run: mkdir dist && cp wheelhouse/*.whl wheelhouse/*.tar.gz dist
+
+      - name: Publish package on PyPI
+        # It is recommended to pin a commit hash here for security but it
+        # should be kept up to date. Possibly all actions and dependencies used
+        # by the build script should be pinned...
+        uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0  # v1.9.0

.github/workflows/ci-sage.yml

@@ -64,14 +64,10 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get install $DIST_PREREQ
         if: env.DIST_PREREQ != ''
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-      - run: pip install build
       - name: Run make dist, prepare upstream artifact
         run: |
-          (cd build/pkgs/${{ env.SPKG }}/src && python -m build --sdist) \
-          && mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/dist/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \
+          (cd build/pkgs/${{ env.SPKG }}/src && git archive --format=tar.gz --prefix=${{ env.SPKG }}-git/ HEAD > ${{ env.SPKG }}-git.tar.gz) \
+          && mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \
           && echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=standard" > upstream/update-pkgs.sh \
           && if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \
           && ls -l upstream/
@@ -87,7 +83,7 @@ jobs:
       targets:                  SAGE_CHECK=no SAGE_CHECK_flint=warn SAGE_CHECK_python_flint=yes python_flint
       # Standard setting: Test the current beta release of Sage:
       sage_repo:                sagemath/sage
-      sage_ref:                 refs/pull/37224/head
+      sage_ref:                 refs/pull/38340/head
       #sage_ref:                 develop
       upstream_artifact:        upstream
       # Docker targets (stages) to tag
@@ -106,7 +102,7 @@ jobs:
       targets:                  SAGE_CHECK=no SAGE_CHECK_flint=warn SAGE_CHECK_python_flint=yes python_flint
       # Standard setting: Test the current beta release of Sage:
       sage_repo:                sagemath/sage
-      sage_ref:                 refs/pull/37224/head
+      sage_ref:                 refs/pull/38340/head
       #sage_ref:                 develop
       upstream_artifact:        upstream
     needs: [dist]

.gitignore

@@ -1,4 +1,5 @@
 build/*
+build-install/*
 dist/*
 src/flint/**/*.c
 src/flint/*.html
@@ -18,3 +19,4 @@ MANIFEST
 .python-version
 *.DS_Store
 .venv
+.hypothesis

README.md

@@ -40,10 +40,20 @@ First install FLINT 3. Starting with python-flint 0.5.0 older versions of Flint
 such as 2.9 are not supported any more. Note that as of Flint 3 Arb no longer
 needs to be built separately as it is now merged into Flint.
 
-See here for instructions on building FLINT:
+As of e.g. Ubuntu 24.04 a new enough version of FLINT (at least version 3) can
+be installed from the Ubuntu repos like
+
+    sudo apt-get install libflint-dev
+
+For older distros the version in the repos is too old and a newer version of
+FLINT needs to be built. See here for instructions on building FLINT:
 
 * http://flintlib.org/
 
+A script that builds and installs FLINT on Ubuntu can be found here:
+
+* https://github.com/flintlib/python-flint/blob/master/bin/install_flint_ubuntu.sh
+
 The latest release of Python-FLINT can then be built from source and installed
 using:
 
@@ -54,11 +64,6 @@ as follows:
 
     pip install .
 
-A script that builds and installs FLINT and python-flint that is tested on
-Ubuntu can be found in the git repo here:
-
-* https://github.com/flintlib/python-flint/blob/master/bin/pip_install_ubuntu.sh
-
 See the documentation for further notes on building and installing
 python-flint:
 
@@ -126,6 +131,33 @@ To do
 CHANGELOG
 -------------
 
+Next release:
+
+- [gh-172](https://github.com/flintlib/python-flint/pull/161)
+  Add `fmpz_is_square`.
+- [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)
+  Bump Flint version to 3.1.3-p1 (Flint 3.0.0 - 3.1.3-p1 is supported but the
+  wheels are built with 3.1.3-p1).
+- [gh-148](https://github.com/flintlib/python-flint/pull/148)
+  Remove debug symbols to make smaller Linux binaries.
+- [gh-144](https://github.com/flintlib/python-flint/pull/144)
+  Add `rel_one_accuracy_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`).
+- [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)
+  Use meson-python instead of setuptools as the build backend.
+
 0.6.0
 
 - [gh-112](https://github.com/flintlib/python-flint/issues/112),

bin/activate

@@ -1,4 +1,3 @@
 export C_INCLUDE_PATH=$(pwd)/.local/include
 export LIBRARY_PATH=$(pwd)/.local/lib
 export LD_LIBRARY_PATH=$(pwd)/.local/lib
-export PYTHONPATH=$(pwd)/src

bin/build_dependencies_unix.sh

@@ -257,6 +257,7 @@ else
   tar xf mpfr-$MPFRVER.tar.gz
   cd mpfr-$MPFRVER
     ./configure --prefix=$PREFIX\
+      --host=$HOST_ARG\
       --with-gmp=$PREFIX\
       --enable-shared=yes\
       --enable-static=no
@@ -281,10 +282,17 @@ curl -O -L https://github.com/flintlib/flint/releases/download/v$FLINTVER/flint-
 tar xf flint-$FLINTVER.tar.gz
 cd flint-$FLINTVER
   ./bootstrap.sh
+  # --host=$HOST_ARG\ # host is ignored
+  # --enable-arch works on 3.1.3p1, not available  on HEAD
   ./configure --prefix=$PREFIX\
+    --enable-arch=${HOST_ARG%%-*}\
+    --disable-assembly\
+    --disable-avx2\
+    --disable-avx512\
     $FLINTARB_WITHGMP\
     --with-mpfr=$PREFIX\
-    --disable-static
+    --disable-static\
+    --disable-debug
   make -j6
   make install
 cd ..

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.1.0
-FLINTVER=3.0.1
+FLINTVER='3.1.3-p1'

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:])