From b5434c5ab7d630f99b68343c9c575b2d860cf9d4 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Mon, 9 Sep 2024 13:56:34 +0100 Subject: [PATCH 1/4] docs: use latest Flint when building docs --- .github/workflows/buildwheel.yml | 10 ++-------- .readthedocs.yaml | 16 ++++++++-------- bin/install_latest_flint_ubuntu.sh | 12 ++++++++++++ bin/rtd_before_all_linux.sh | 8 ++++++++ 4 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 bin/install_latest_flint_ubuntu.sh create mode 100755 bin/rtd_before_all_linux.sh diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index cde98caf..14357a16 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -67,11 +67,7 @@ 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: bin/install_latest_flint_ubuntu.sh - run: pip install build - run: python -m build --sdist @@ -129,9 +125,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.12' - - run: sudo apt-get update - - run: sudo apt-get install libflint-dev - + - run: bin/install_latest_flint_ubuntu.sh - run: pip install --upgrade pip - run: pip install -r requirements-dev.txt - run: spin run -- pytest --doctest-glob='*.rst' doc/source diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 71582673..468c055c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,15 +10,15 @@ build: os: ubuntu-24.04 tools: python: "3.12" - # You can also specify other tool versions: - # nodejs: "19" - # rust: "1.64" - # golang: "1.19" apt_packages: - - libflint-dev - jobs: - pre_build: - - pip install . + - libgmp-dev + - libmpfr-dev + - xz-utils + - ninja-build + commands: + - bin/install_latest_flint_ubuntu.sh + - spin docs + - mv doc/build/html $READTHEDOCS_OUTPUT/html # Build documentation in the "docs/" directory with Sphinx sphinx: diff --git a/bin/install_latest_flint_ubuntu.sh b/bin/install_latest_flint_ubuntu.sh new file mode 100644 index 00000000..2f17ec98 --- /dev/null +++ b/bin/install_latest_flint_ubuntu.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -e + +source bin/build_variables.sh + +sudo apt-get update +sudo apt-get install libgmp-dev libmpfr-dev xz-utils ninja-build +curl -O -L https://github.com/flintlib/flint/releases/download/v$FLINTVER/flint-$FLINTVER.tar.gz +tar xf flint-$FLINTVER.tar.gz +tar -xzf flint-$FLINTVER.tar.gz +cd flint-$FLINTVER && ./configure --disable-static && make -j$(expr $(nproc) + 1) && sudo make install diff --git a/bin/rtd_before_all_linux.sh b/bin/rtd_before_all_linux.sh new file mode 100755 index 00000000..ff4cddba --- /dev/null +++ b/bin/rtd_before_all_linux.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +apt-get install xz-utils + +bin/build_dependencies_unix.sh\ + --gmp gmp\ + --host x86_64-pc-linux-gnu\ + --use-gmp-github-mirror From 27b9041480ee6c16b2e6227ff2082518877aceea Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Mon, 9 Sep 2024 14:02:15 +0100 Subject: [PATCH 2/4] Fix line length in nmod_mpoly.rst --- doc/source/nmod_mpoly.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/nmod_mpoly.rst b/doc/source/nmod_mpoly.rst index b20c45ed..cdfb944e 100644 --- a/doc/source/nmod_mpoly.rst +++ b/doc/source/nmod_mpoly.rst @@ -1,5 +1,5 @@ **nmod_mpoly** -- multivariate polynomials over the integers mod n (word-size n) -=============================================================================== +================================================================================ .. autoclass :: flint.nmod_mpoly_ctx :members: From 08d8689b2827221e1f43eebedda4278d9214ba30 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Mon, 9 Sep 2024 14:03:47 +0100 Subject: [PATCH 3/4] Set executable bit on bin/install_latest_flint_ubuntu.sh --- bin/install_latest_flint_ubuntu.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/install_latest_flint_ubuntu.sh diff --git a/bin/install_latest_flint_ubuntu.sh b/bin/install_latest_flint_ubuntu.sh old mode 100644 new mode 100755 From f05baa608396ea39bddb33d897619eac98f26867 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Mon, 9 Sep 2024 14:10:45 +0100 Subject: [PATCH 4/4] Run ldconfig when installing FLINT --- bin/install_latest_flint_ubuntu.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/install_latest_flint_ubuntu.sh b/bin/install_latest_flint_ubuntu.sh index 2f17ec98..0006b792 100755 --- a/bin/install_latest_flint_ubuntu.sh +++ b/bin/install_latest_flint_ubuntu.sh @@ -6,7 +6,10 @@ source bin/build_variables.sh sudo apt-get update sudo apt-get install libgmp-dev libmpfr-dev xz-utils ninja-build + curl -O -L https://github.com/flintlib/flint/releases/download/v$FLINTVER/flint-$FLINTVER.tar.gz -tar xf flint-$FLINTVER.tar.gz tar -xzf flint-$FLINTVER.tar.gz cd flint-$FLINTVER && ./configure --disable-static && make -j$(expr $(nproc) + 1) && sudo make install + +ls -l /usr/local/lib +sudo ldconfig /usr/local/lib