Skip to content

Commit 893857b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into pr_generic_rings
2 parents f7f0c1e + ae4fe25 commit 893857b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2229
-1074
lines changed

.github/workflows/buildwheel.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ jobs:
6767
with:
6868
python-version: '3.12'
6969

70-
- run: sudo apt-get update
71-
- run: sudo apt-get install libgmp-dev libmpfr-dev xz-utils ninja-build
72-
- run: curl -O -L https://www.flintlib.org/flint-3.1.0.tar.gz
73-
- run: tar -xzf flint-3.1.0.tar.gz
74-
- run: cd flint-3.1.0 && ./configure --disable-static && make -j4 && sudo make install
70+
- run: bin/install_latest_flint_ubuntu.sh
7571
- run: pip install build
7672
- run: python -m build --sdist
7773

@@ -129,9 +125,7 @@ jobs:
129125
- uses: actions/setup-python@v5
130126
with:
131127
python-version: '3.12'
132-
- run: sudo apt-get update
133-
- run: sudo apt-get install libflint-dev
134-
128+
- run: bin/install_latest_flint_ubuntu.sh
135129
- run: pip install --upgrade pip
136130
- run: pip install -r requirements-dev.txt
137131
- run: spin run -- pytest --doctest-glob='*.rst' doc/source

.readthedocs.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,24 @@ build:
1010
os: ubuntu-24.04
1111
tools:
1212
python: "3.12"
13-
# You can also specify other tool versions:
14-
# nodejs: "19"
15-
# rust: "1.64"
16-
# golang: "1.19"
13+
1714
apt_packages:
1815
- libflint-dev
1916
jobs:
2017
pre_build:
2118
- pip install .
2219

20+
# Tried to use this to build latest version of FLINT but FLINT does not build
21+
# in rtd for some reason. FLINT's configure seems to fail in all sorts of ways
22+
# even though GMP and MPFR build fine.
23+
#
24+
# commands:
25+
# - pip install -r requirements-dev.txt
26+
# - bin/build_dependencies_unix.sh --use-gmp-github-mirror
27+
# - spin build -- --pkg-config-path=.local/lib/pkgconfig -Dadd_flint_rpath=true
28+
# - spin docs
29+
# - mv doc/build/html $READTHEDOCS_OUTPUT/html
30+
2331
# Build documentation in the "docs/" directory with Sphinx
2432
sphinx:
2533
configuration: doc/source/conf.py

bin/install_latest_flint_ubuntu.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
source bin/build_variables.sh
6+
7+
sudo apt-get update
8+
sudo apt-get install libgmp-dev libmpfr-dev xz-utils ninja-build
9+
10+
curl -O -L https://github.com/flintlib/flint/releases/download/v$FLINTVER/flint-$FLINTVER.tar.gz
11+
tar -xzf flint-$FLINTVER.tar.gz
12+
cd flint-$FLINTVER && ./configure --disable-static && make -j$(expr $(nproc) + 1) && sudo make install
13+
14+
ls -l /usr/local/lib
15+
sudo ldconfig /usr/local/lib

bin/rtd_before_all_linux.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
apt-get install xz-utils
4+
5+
bin/build_dependencies_unix.sh\
6+
--gmp gmp\
7+
--host x86_64-pc-linux-gnu\
8+
--use-gmp-github-mirror

doc/source/fmpq_mpoly.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
**fmpq_mpoly** -- multivariate polynomials over the rational numbers
2+
===============================================================================
3+
4+
.. autoclass :: flint.fmpq_mpoly_ctx
5+
:members:
6+
:inherited-members:
7+
:undoc-members:
8+
9+
.. autoclass :: flint.fmpq_mpoly
10+
:members:
11+
:inherited-members:
12+
:undoc-members:
13+
14+
.. autoclass :: flint.fmpq_mpoly_vec
15+
:members:
16+
:inherited-members:
17+
:undoc-members:
18+

doc/source/fmpz_mod_mpoly.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
**fmpz_mod_mpoly** -- multivariate polynomials over the integers mod n
2+
===============================================================================
3+
4+
.. autoclass :: flint.fmpz_mod_mpoly_ctx
5+
:members:
6+
:inherited-members:
7+
:undoc-members:
8+
9+
.. autoclass :: flint.fmpz_mod_mpoly
10+
:members:
11+
:inherited-members:
12+
:undoc-members:
13+
14+
.. autoclass :: flint.fmpz_mod_mpoly_vec
15+
:members:
16+
:inherited-members:
17+
:undoc-members:
18+

doc/source/fmpz_mpoly.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
**fmpz_mpoly** -- multivariate polynomials over the integers
2+
===============================================================================
3+
4+
.. autoclass :: flint.fmpz_mpoly_ctx
5+
:members:
6+
:inherited-members:
7+
:undoc-members:
8+
9+
.. autoclass :: flint.fmpz_mpoly
10+
:members:
11+
:inherited-members:
12+
:undoc-members:
13+
14+
.. autoclass :: flint.fmpz_mpoly_vec
15+
:members:
16+
:inherited-members:
17+
:undoc-members:
18+

doc/source/index.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,13 @@ Polynomial types
7373
:maxdepth: 1
7474

7575
fmpz_poly.rst
76+
fmpz_mpoly.rst
7677
fmpq_poly.rst
78+
fmpq_mpoly.rst
7779
nmod_poly.rst
80+
nmod_mpoly.rst
7881
fmpz_mod_poly.rst
82+
fmpz_mod_mpoly.rst
7983
fq_default_poly.rst
8084
arb_poly.rst
8185
acb_poly.rst

doc/source/nmod_mpoly.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
**nmod_mpoly** -- multivariate polynomials over the integers mod n (word-size n)
2+
================================================================================
3+
4+
.. autoclass :: flint.nmod_mpoly_ctx
5+
:members:
6+
:inherited-members:
7+
:undoc-members:
8+
9+
.. autoclass :: flint.nmod_mpoly
10+
:members:
11+
:inherited-members:
12+
:undoc-members:
13+
14+
.. autoclass :: flint.nmod_mpoly_vec
15+
:members:
16+
:inherited-members:
17+
:undoc-members:
18+

pyproject.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,8 @@ build-backend = "mesonpy"
5353
# E741 ambiguous variable name
5454
# Reasoning: many places it makes sense to use l or other letters as variable
5555
# names as it is standard in mathematical notation.
56-
#
57-
# E743 ambiguous function definition
58-
# Reasoning: this is a work in progress and will be enforced after #210 is
59-
# resolved.
6056
max-line-length = 120
61-
ignore = ['E129','E501','E741','E743']
57+
ignore = ['E129','E501','E741']
6258
exclude = 'src/flint/flintlib/functions.*'
6359

6460
[tool.spin]

0 commit comments

Comments
 (0)