From da082fd0802dadf8ab4998f5ab9f80e0024550cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Chapoton?= Date: Sat, 31 Aug 2024 08:05:01 +0200 Subject: [PATCH 1/2] fine tuning the cython-linter + fix W391 code --- .github/workflows/lint.yml | 2 +- pyproject.toml | 2 +- src/flint/types/acb_poly.pyx | 1 - src/flint/types/acb_series.pxd | 1 - src/flint/types/acb_series.pyx | 1 - src/flint/types/arb.pyx | 1 - src/flint/types/fmpq_mat.pyx | 2 -- src/flint/types/fmpq_series.pyx | 1 - src/flint/types/fmpz.pyx | 1 - src/flint/types/fmpz_poly.pyx | 1 - src/flint/types/fmpz_series.pyx | 1 - src/flint/types/nmod_series.pyx | 1 - 12 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 272cc1a6..37ca10d7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.11", "3.12"] + python-version: ["3.12"] steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index c67cefa9..615762fb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ build-backend = "mesonpy" [tool.cython-lint] max-line-length = 120 -ignore = ['E114','E117','E127','E128','E129','E202','E221','E222','E231','E261','E262','E265','E302','E303','E306','E501','E701','E703','E711','E722','E731','E741','E743','W391'] +ignore = ['E114','E117','E127','E128','E129','E202','E221','E222','E231','E261','E262','E265','E302','E303','E306','E501','E711','E722','E731','E741','E743'] exclude = 'src/flint/flintlib/.*' [tool.spin] diff --git a/src/flint/types/acb_poly.pyx b/src/flint/types/acb_poly.pyx index 3e73bebe..712c5980 100644 --- a/src/flint/types/acb_poly.pyx +++ b/src/flint/types/acb_poly.pyx @@ -424,4 +424,3 @@ cdef class acb_poly(flint_poly): arf_set_mag(arb_midref((r).val), m) mag_clear(m) return r - diff --git a/src/flint/types/acb_series.pxd b/src/flint/types/acb_series.pxd index 66896994..296744a9 100644 --- a/src/flint/types/acb_series.pxd +++ b/src/flint/types/acb_series.pxd @@ -7,4 +7,3 @@ cdef class acb_series(flint_series): cdef long prec cpdef long length(self) cpdef valuation(self) - diff --git a/src/flint/types/acb_series.pyx b/src/flint/types/acb_series.pyx index 03e7ca7e..0e3130c6 100644 --- a/src/flint/types/acb_series.pyx +++ b/src/flint/types/acb_series.pyx @@ -854,4 +854,3 @@ cdef class acb_series(flint_series): acb_poly_lambertw_series((u).val, (s).val, (k).val, 0, cap, getprec()) (u).prec = cap return u - diff --git a/src/flint/types/arb.pyx b/src/flint/types/arb.pyx index d456a110..30b38b74 100644 --- a/src/flint/types/arb.pyx +++ b/src/flint/types/arb.pyx @@ -2656,4 +2656,3 @@ cdef class arb(flint_scalar): arb_hypgeom_coulomb(NULL, (G).val, (l).val, (eta).val, (self).val, getprec()) return G - diff --git a/src/flint/types/fmpq_mat.pyx b/src/flint/types/fmpq_mat.pyx index b379b83e..549a2fc4 100644 --- a/src/flint/types/fmpq_mat.pyx +++ b/src/flint/types/fmpq_mat.pyx @@ -506,5 +506,3 @@ cdef class fmpq_mat(flint_mat): if n % 2: v *= self return v - - diff --git a/src/flint/types/fmpq_series.pyx b/src/flint/types/fmpq_series.pyx index 934b6d39..cb67e913 100644 --- a/src/flint/types/fmpq_series.pyx +++ b/src/flint/types/fmpq_series.pyx @@ -525,4 +525,3 @@ cdef class fmpq_series(flint_series): fmpq_poly_tanh_series((u).val, (s).val, cap) (u).prec = cap return u - diff --git a/src/flint/types/fmpz.pyx b/src/flint/types/fmpz.pyx index 537e064a..e5b6f4cb 100644 --- a/src/flint/types/fmpz.pyx +++ b/src/flint/types/fmpz.pyx @@ -1021,4 +1021,3 @@ cdef class fmpz(flint_scalar): if ttype == FMPZ_TMP: fmpz_clear(tval) return fmpz(v) - diff --git a/src/flint/types/fmpz_poly.pyx b/src/flint/types/fmpz_poly.pyx index 07052c4e..ec9b761f 100644 --- a/src/flint/types/fmpz_poly.pyx +++ b/src/flint/types/fmpz_poly.pyx @@ -647,4 +647,3 @@ cdef class fmpz_poly(flint_poly): return int(i) libc.stdlib.free(phi) return 0 - diff --git a/src/flint/types/fmpz_series.pyx b/src/flint/types/fmpz_series.pyx index 3fb01ef5..4689e7e8 100644 --- a/src/flint/types/fmpz_series.pyx +++ b/src/flint/types/fmpz_series.pyx @@ -358,4 +358,3 @@ cdef class fmpz_series(flint_series): fmpz_poly_revert_series((u).val, (s).val, cap) (u).prec = cap return u - diff --git a/src/flint/types/nmod_series.pyx b/src/flint/types/nmod_series.pyx index 160d5f2c..613a97c9 100644 --- a/src/flint/types/nmod_series.pyx +++ b/src/flint/types/nmod_series.pyx @@ -2,4 +2,3 @@ from flint.flint_base.flint_base cimport flint_series cdef class nmod_series(flint_series): pass - From f7cb70b8a58350bb3376dc4aed68c129cd16065d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Chapoton?= Date: Sat, 31 Aug 2024 08:10:29 +0200 Subject: [PATCH 2/2] remove more already-fixed codes --- pyproject.toml | 2 +- src/flint/types/acb.pyx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 615762fb..a753b2ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ build-backend = "mesonpy" [tool.cython-lint] max-line-length = 120 -ignore = ['E114','E117','E127','E128','E129','E202','E221','E222','E231','E261','E262','E265','E302','E303','E306','E501','E711','E722','E731','E741','E743'] +ignore = ['E114','E117','E127','E128','E129','E202','E221','E222','E231','E261','E262','E265','E501','E711','E722','E731','E741','E743'] exclude = 'src/flint/flintlib/.*' [tool.spin] diff --git a/src/flint/types/acb.pyx b/src/flint/types/acb.pyx index e188d700..0e60411f 100644 --- a/src/flint/types/acb.pyx +++ b/src/flint/types/acb.pyx @@ -97,7 +97,6 @@ cdef any_as_acb_or_notimplemented(x): # return acb(x) - # Copied with modifications from sage/rings/complex_arb.pyx @cython.internal cdef class IntegrationContext: