Merge branch 'master' into pr_py313

Author: oscarbenjamin

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/buildwheel.yml

@@ -13,9 +13,9 @@ jobs:
         os: [ubuntu-20.04, windows-2019, macos-12]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
@@ -34,45 +34,32 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.16.5
         env:
-          CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
-          CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux_*"
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-          CIBW_BEFORE_ALL_LINUX: bin/cibw_before_all_linux.sh
-          CIBW_BEFORE_ALL_MACOS: bin/cibw_before_all_macosx_x86_64.sh
+          # 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: msys2 -c bin/cibw_before_build_windows.sh
-          CIBW_BEFORE_BUILD: pip install numpy setuptools cython delvewheel
-          CIBW_ENVIRONMENT: >
-            C_INCLUDE_PATH=$(pwd)/.local/include/
-            LIBRARY_PATH=$(pwd)/.local/lib/
-            LD_LIBRARY_PATH=$(pwd)/.local/lib:$LD_LIBRARY_PATH
-            PYTHON_FLINT_MINGW64=true
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
-            bin\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}
-          CIBW_TEST_COMMAND: python -c "import flint; print(str(flint.fmpz(2)))"
-
-      - uses: actions/upload-artifact@v3
+          CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel && msys2 -c bin/cibw_before_build_windows.sh
+
+      - uses: actions/upload-artifact@v4
         with:
+          name: wheels-${{ matrix.os }}
           path: wheelhouse/*.whl
 
   build_sdist:
     name: Build sdist
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 
-      - run: pip install --upgrade pip
-      - run: pip install cython setuptools
-      - run: python setup.py sdist
+      - run: pip install build
+      - run: python -m build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: sdist
           path: dist/*.tar.gz
 
   test_rst:
@@ -81,15 +68,15 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          name: wheels-ubuntu-20.04
           path: wheelhouse
 
       - run: pip install --upgrade pip
@@ -108,12 +95,12 @@ jobs:
         python-version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          name: wheels-${{ matrix.os }}
           path: wheelhouse
       - run: pip install --no-index --find-links wheelhouse python_flint
       - run: python -m flint.test --verbose
@@ -129,8 +116,8 @@ jobs:
         # 'python-flint' means install from PyPI sdist
         target: ['.', 'python-flint']
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - run: bin/pip_install_ubuntu.sh ${{ matrix.target }}

bin/build_dependencies_unix.sh

@@ -174,7 +174,7 @@ if [ $USE_GMP = "gmp" ]; then
         --enable-shared=yes\
         --enable-static=no\
         --host=$HOST_ARG
-      make -j3
+      make -j6
       make install
 
     cd ..
@@ -195,7 +195,7 @@ else
   tar xf yasm-$YASMVER.tar.gz
   cd yasm-$YASMVER
     ./configure --prefix=$PREFIX
-    make -j3
+    make -j6
     make install
   cd ..
 
@@ -226,7 +226,7 @@ else
       --enable-shared=yes\
       --enable-static=no\
       --enable-gmpcompat
-    make -j3
+    make -j6
     make install
   cd ..
 
@@ -260,7 +260,7 @@ else
       --with-gmp=$PREFIX\
       --enable-shared=yes\
       --enable-static=no
-    make -j3
+    make -j6
     make install
   cd ..
 fi
@@ -285,7 +285,7 @@ cd flint-$FLINTVER
     $FLINTARB_WITHGMP\
     --with-mpfr=$PREFIX\
     --disable-static
-  make -j3
+  make -j6
   make install
 cd ..
 
@@ -312,7 +312,7 @@ if [ $BUILD_ARB = "yes" ]; then
       $FLINTARB_WITHGMP\
       --with-mpfr=$PREFIX\
       --disable-static
-    make -j3
+    make -j6
     make install
     #
     # Set PATH so that DLLs are picked up on Windows.

bin/cibw.bat

@@ -21,12 +21,7 @@ rem wheels from a previous run so we delete them here.
 rem
 del /q wheelhouse\*
 
+rem override setting in pyproject.toml
 set CIBW_BUILD=cp39-* cp310-* cp311-*
-set CIBW_SKIP=*-win32 *-manylinux_i686 *-musllinux_*
-set CIBW_BEFORE_ALL_WINDOWS=C:\msys64\usr\bin\bash bin/cibw_before_all_windows.sh
-set CIBW_BEFORE_BUILD_WINDOWS=C:\msys64\usr\bin\bash bin/cibw_before_build_windows.sh
-set CIBW_ENVIRONMENT=PYTHON_FLINT_MINGW64=true
-set CIBW_REPAIR_WHEEL_COMMAND_WINDOWS=bin\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}
-set CIBW_TEST_COMMAND=python -c "import flint; print(str(flint.fmpz(2)))"
 
 cibuildwheel --platform windows

bin/cibw.sh

@@ -8,28 +8,10 @@
 
 rm -f wheelhouse/*
 
-# bin/build_dependencies_unix.sh places headers and shared libraries under .local
-export CIBW_ENVIRONMENT='C_INCLUDE_PATH=$(pwd)/.local/include/ LIBRARY_PATH=$(pwd)/.local/lib/ LD_LIBRARY_PATH=$(pwd)/.local/lib:$LD_LIBRARY_PATH PYTHON_FLINT_MINGW64=true'
-
-export CIBW_BUILD='cp39-* cp310-* cp311-* cp312-*'
-# export CIBW_BUILD='cp311-*'
-export CIBW_SKIP='*-win32 *-manylinux_i686 *-musllinux_*'
-
 # export CIBW_ARCHS_MACOS="x86_64"
 export CIBW_ARCHS_MACOS="arm64"
 
-export CIBW_BEFORE_ALL_LINUX=bin/cibw_before_all_linux.sh
-# export CIBW_BEFORE_ALL_MACOS=bin/cibw_before_all_macosx_x86_64.sh
-export CIBW_BEFORE_ALL_MACOS=bin/cibw_before_all_macosx_arm64.sh
-export CIBW_BEFORE_ALL_WINDOWS='C:\\msys64\\usr\\bin\\bash bin/cibw_before_all_windows.sh'
-
-export CIBW_BEFORE_BUILD='pip install numpy cython delvewheel'
-export CIBW_BEFORE_BUILD_WINDOWS='C:\\msys64\\usr\\bin\\bash bin/cibw_before_build_windows.sh'
-
-export CIBW_REPAIR_WHEEL_COMMAND_WINDOWS='bin\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}'
-
-# export CIBW_TEST_COMMAND="python -c 'import flint; print(str(flint.fmpz(2)))'"
-export CIBW_TEST_COMMAND="python -m flint.test"
+export CIBW_TEST_COMMAND="python -m flint.test"  # override setting in pyproject.toml
 
 # cibuildwheel --platform linux
 # cibuildwheel --platform windows

bin/pip_install_ubuntu.sh

@@ -71,8 +71,8 @@ sudo ldconfig /usr/local/lib
 echo -----------------------------------------------------------
 echo
 echo     Running:
-echo        $ pip install --no-binary :all: $PYTHON_FLINT
+echo        $ pip install --no-binary python-flint $PYTHON_FLINT
 echo
 echo -----------------------------------------------------------
 
-pip install --no-binary :all: $PYTHON_FLINT
+pip install --no-binary python-flint $PYTHON_FLINT

pyproject.toml

@@ -20,3 +20,30 @@ classifiers = [
 [project.readme]
 file = "README.md"
 content-type = "text/markdown"
+
+[tool.cibuildwheel]
+build = "cp39-* cp310-* cp311-* cp312-*"
+skip = "*-win32 *-manylinux_i686 *-musllinux_*"
+manylinux-x86_64-image = "manylinux2014"
+manylinux-i686-image = "manylinux2014"
+test-command = "python -c \"import flint; print(str(flint.fmpz(2)))\""
+
+[tool.cibuildwheel.environment]
+# bin/build_dependencies_unix.sh places headers and shared libraries under .local
+C_INCLUDE_PATH = "$(pwd)/.local/include/"
+LIBRARY_PATH = "$(pwd)/.local/lib/"
+LD_LIBRARY_PATH = "$(pwd)/.local/lib:$LD_LIBRARY_PATH"
+
+[tool.cibuildwheel.linux]
+before-all = "bin/cibw_before_all_linux.sh"
+
+[tool.cibuildwheel.macos]
+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}"
+
+[tool.cibuildwheel.windows.environment]
+PYTHON_FLINT_MINGW64 = "true"