From 619c8c8bd4f36ec9b1f9f7ae676dc27d6525e94d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 16 Nov 2022 22:21:48 -0800 Subject: [PATCH 01/60] Mark files # sage_setup: distribution = sagemath-flint-arb --- src/sage/libs/arb/acb.pxd | 1 + src/sage/libs/arb/acb_calc.pxd | 1 + src/sage/libs/arb/acb_elliptic.pxd | 1 + src/sage/libs/arb/acb_hypgeom.pxd | 1 + src/sage/libs/arb/acb_mat.pxd | 1 + src/sage/libs/arb/acb_modular.pxd | 1 + src/sage/libs/arb/acb_poly.pxd | 1 + src/sage/libs/arb/arb.pxd | 1 + src/sage/libs/arb/arb_fmpz_poly.pxd | 1 + src/sage/libs/arb/arb_hypgeom.pxd | 1 + src/sage/libs/arb/arb_version.pyx | 2 +- src/sage/libs/arb/arf.pxd | 1 + src/sage/libs/arb/arith.pyx | 1 + src/sage/libs/arb/bernoulli.pxd | 1 + src/sage/libs/arb/mag.pxd | 1 + src/sage/libs/arb/types.pxd | 1 + src/sage/libs/flint/arith.pxd | 1 + src/sage/libs/flint/arith.pyx | 1 + src/sage/libs/flint/flint.pxd | 1 + src/sage/libs/flint/flint.pyx | 1 + src/sage/libs/flint/flint_ntl_wrap.h | 1 + src/sage/libs/flint/flint_wrap.h | 1 + src/sage/libs/flint/fmpq.pxd | 1 + src/sage/libs/flint/fmpq_mat.pxd | 1 + src/sage/libs/flint/fmpq_poly.pxd | 1 + src/sage/libs/flint/fmpz.pxd | 1 + src/sage/libs/flint/fmpz_mat.pxd | 1 + src/sage/libs/flint/fmpz_mod.pxd | 1 + src/sage/libs/flint/fmpz_mod_poly.pxd | 1 + src/sage/libs/flint/fmpz_poly.pxd | 1 + src/sage/libs/flint/fmpz_poly.pyx | 1 + src/sage/libs/flint/fmpz_poly_mat.pxd | 1 + src/sage/libs/flint/fmpz_poly_q.pxd | 1 + src/sage/libs/flint/fmpz_vec.pxd | 1 + src/sage/libs/flint/fq.pxd | 1 + src/sage/libs/flint/fq_nmod.pxd | 1 + src/sage/libs/flint/nmod_poly.pxd | 1 + src/sage/libs/flint/nmod_poly_linkage.pxi | 1 + src/sage/libs/flint/nmod_vec.pxd | 1 + src/sage/libs/flint/ntl_interface.pxd | 1 + src/sage/libs/flint/padic.pxd | 1 + src/sage/libs/flint/padic_poly.pxd | 1 + src/sage/libs/flint/qadic.pxd | 1 + src/sage/libs/flint/thread_pool.pxd | 1 + src/sage/libs/flint/types.pxd | 1 + src/sage/libs/flint/ulong_extras.pxd | 1 + src/sage/libs/flint/ulong_extras.pyx | 1 + src/sage/matrix/matrix_complex_ball_dense.pxd | 1 + src/sage/matrix/matrix_complex_ball_dense.pyx | 1 + src/sage/rings/complex_arb.pxd | 1 + src/sage/rings/complex_arb.pyx | 2 +- src/sage/rings/number_field/number_field_element_quadratic.pxd | 1 + src/sage/rings/number_field/number_field_element_quadratic.pyx | 1 + src/sage/rings/padics/qadic_flint_FP.pyx | 1 + src/sage/rings/polynomial/evaluation_flint.pyx | 1 + src/sage/rings/polynomial/polynomial_complex_arb.pxd | 1 + src/sage/rings/polynomial/polynomial_complex_arb.pyx | 2 +- src/sage/rings/real_arb.pxd | 1 + src/sage/rings/real_arb.pyx | 2 +- 59 files changed, 59 insertions(+), 4 deletions(-) diff --git a/src/sage/libs/arb/acb.pxd b/src/sage/libs/arb/acb.pxd index 5148dc43991..e6ddfe92425 100644 --- a/src/sage/libs/arb/acb.pxd +++ b/src/sage/libs/arb/acb.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb.h diff --git a/src/sage/libs/arb/acb_calc.pxd b/src/sage/libs/arb/acb_calc.pxd index a5dbf360b5e..c273ab18e8d 100644 --- a/src/sage/libs/arb/acb_calc.pxd +++ b/src/sage/libs/arb/acb_calc.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_calc.h diff --git a/src/sage/libs/arb/acb_elliptic.pxd b/src/sage/libs/arb/acb_elliptic.pxd index 176f68df00e..03c60a9e537 100644 --- a/src/sage/libs/arb/acb_elliptic.pxd +++ b/src/sage/libs/arb/acb_elliptic.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_elliptic.h diff --git a/src/sage/libs/arb/acb_hypgeom.pxd b/src/sage/libs/arb/acb_hypgeom.pxd index 418e766f10d..c041261d7e8 100644 --- a/src/sage/libs/arb/acb_hypgeom.pxd +++ b/src/sage/libs/arb/acb_hypgeom.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_hypgeom.h diff --git a/src/sage/libs/arb/acb_mat.pxd b/src/sage/libs/arb/acb_mat.pxd index aff7fa7d7b2..ea4ef0d289d 100644 --- a/src/sage/libs/arb/acb_mat.pxd +++ b/src/sage/libs/arb/acb_mat.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: depends = acb_mat.h from sage.libs.arb.types cimport acb_t, acb_ptr, acb_srcptr, acb_mat_t, acb_poly_t, mag_t diff --git a/src/sage/libs/arb/acb_modular.pxd b/src/sage/libs/arb/acb_modular.pxd index c708e9bf97d..55570f843e5 100644 --- a/src/sage/libs/arb/acb_modular.pxd +++ b/src/sage/libs/arb/acb_modular.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_modular.h diff --git a/src/sage/libs/arb/acb_poly.pxd b/src/sage/libs/arb/acb_poly.pxd index 69f4320055b..f960af5517c 100644 --- a/src/sage/libs/arb/acb_poly.pxd +++ b/src/sage/libs/arb/acb_poly.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_poly.h diff --git a/src/sage/libs/arb/arb.pxd b/src/sage/libs/arb/arb.pxd index c82b94de30f..0ba4f02c6ec 100644 --- a/src/sage/libs/arb/arb.pxd +++ b/src/sage/libs/arb/arb.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = arb.h diff --git a/src/sage/libs/arb/arb_fmpz_poly.pxd b/src/sage/libs/arb/arb_fmpz_poly.pxd index 079f76e9d9e..6b837f85897 100644 --- a/src/sage/libs/arb/arb_fmpz_poly.pxd +++ b/src/sage/libs/arb/arb_fmpz_poly.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = arb_fmpz_poly.h diff --git a/src/sage/libs/arb/arb_hypgeom.pxd b/src/sage/libs/arb/arb_hypgeom.pxd index fb1c40ddaa8..5f4b8b7777b 100644 --- a/src/sage/libs/arb/arb_hypgeom.pxd +++ b/src/sage/libs/arb/arb_hypgeom.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = arb_hypgeom.h diff --git a/src/sage/libs/arb/arb_version.pyx b/src/sage/libs/arb/arb_version.pyx index 6ad567e67ce..020853184e2 100644 --- a/src/sage/libs/arb/arb_version.pyx +++ b/src/sage/libs/arb/arb_version.pyx @@ -1,4 +1,4 @@ -# -*- coding: utf-8 +# sage_setup: distribution = sagemath-flint-arb from sage.libs.arb.arb cimport arb_version from sage.cpython.string cimport char_to_str diff --git a/src/sage/libs/arb/arf.pxd b/src/sage/libs/arb/arf.pxd index b8b83fefcdc..a1384e14e90 100644 --- a/src/sage/libs/arb/arf.pxd +++ b/src/sage/libs/arb/arf.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = arf.h diff --git a/src/sage/libs/arb/arith.pyx b/src/sage/libs/arb/arith.pyx index 31db27d6bb6..5d803677ec2 100644 --- a/src/sage/libs/arb/arith.pyx +++ b/src/sage/libs/arb/arith.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb """ Arithmetic functions using the arb library """ diff --git a/src/sage/libs/arb/bernoulli.pxd b/src/sage/libs/arb/bernoulli.pxd index 375b2b9bbcf..0341efd0b89 100644 --- a/src/sage/libs/arb/bernoulli.pxd +++ b/src/sage/libs/arb/bernoulli.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = bernoulli.h diff --git a/src/sage/libs/arb/mag.pxd b/src/sage/libs/arb/mag.pxd index d5d8693ea8f..eb58156bc56 100644 --- a/src/sage/libs/arb/mag.pxd +++ b/src/sage/libs/arb/mag.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = mag.h diff --git a/src/sage/libs/arb/types.pxd b/src/sage/libs/arb/types.pxd index 98ed96dfb7a..373937c261d 100644 --- a/src/sage/libs/arb/types.pxd +++ b/src/sage/libs/arb/types.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: depends = mag.h arf.h arb.h acb.h acb_mat.h acb_poly.h acb_calc.h # mag.h diff --git a/src/sage/libs/flint/arith.pxd b/src/sage/libs/flint/arith.pxd index c8e1fb35566..58c11c82728 100644 --- a/src/sage/libs/flint/arith.pxd +++ b/src/sage/libs/flint/arith.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/arith.h diff --git a/src/sage/libs/flint/arith.pyx b/src/sage/libs/flint/arith.pyx index f24446b4ae4..f1701ec6ce3 100644 --- a/src/sage/libs/flint/arith.pyx +++ b/src/sage/libs/flint/arith.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: extra_compile_args = -D_XPG6 """ FLINT Arithmetic Functions diff --git a/src/sage/libs/flint/flint.pxd b/src/sage/libs/flint/flint.pxd index df9e6a1e870..a41ad9e6514 100644 --- a/src/sage/libs/flint/flint.pxd +++ b/src/sage/libs/flint/flint.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/flint.h flint/fmpz.h diff --git a/src/sage/libs/flint/flint.pyx b/src/sage/libs/flint/flint.pyx index 19d76b4c867..52f0c635083 100644 --- a/src/sage/libs/flint/flint.pyx +++ b/src/sage/libs/flint/flint.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: extra_compile_args = -D_XPG6 """ Flint imports diff --git a/src/sage/libs/flint/flint_ntl_wrap.h b/src/sage/libs/flint/flint_ntl_wrap.h index 841d990817d..baff1cf8f28 100644 --- a/src/sage/libs/flint/flint_ntl_wrap.h +++ b/src/sage/libs/flint/flint_ntl_wrap.h @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb #ifndef SAGE_FLINT_NTL_WRAP_H #define SAGE_FLINT_NTL_WRAP_H /* diff --git a/src/sage/libs/flint/flint_wrap.h b/src/sage/libs/flint/flint_wrap.h index ae02e473a95..e96a7be682d 100644 --- a/src/sage/libs/flint/flint_wrap.h +++ b/src/sage/libs/flint/flint_wrap.h @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb #ifndef SAGE_FLINT_WRAP_H #define SAGE_FLINT_WRAP_H /* Using flint headers together in the same module as headers from some other diff --git a/src/sage/libs/flint/fmpq.pxd b/src/sage/libs/flint/fmpq.pxd index 5e64c82102f..51995b37ac6 100644 --- a/src/sage/libs/flint/fmpq.pxd +++ b/src/sage/libs/flint/fmpq.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpq.h diff --git a/src/sage/libs/flint/fmpq_mat.pxd b/src/sage/libs/flint/fmpq_mat.pxd index ccd90c251a8..01e496a2795 100644 --- a/src/sage/libs/flint/fmpq_mat.pxd +++ b/src/sage/libs/flint/fmpq_mat.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpq_mat.h diff --git a/src/sage/libs/flint/fmpq_poly.pxd b/src/sage/libs/flint/fmpq_poly.pxd index 20a797c0197..229664a67fb 100644 --- a/src/sage/libs/flint/fmpq_poly.pxd +++ b/src/sage/libs/flint/fmpq_poly.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpq_poly.h diff --git a/src/sage/libs/flint/fmpz.pxd b/src/sage/libs/flint/fmpz.pxd index 01058d0f130..e995b26b1c9 100644 --- a/src/sage/libs/flint/fmpz.pxd +++ b/src/sage/libs/flint/fmpz.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpz.h diff --git a/src/sage/libs/flint/fmpz_mat.pxd b/src/sage/libs/flint/fmpz_mat.pxd index 91457930213..dcba72474cc 100644 --- a/src/sage/libs/flint/fmpz_mat.pxd +++ b/src/sage/libs/flint/fmpz_mat.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpz_mat.h diff --git a/src/sage/libs/flint/fmpz_mod.pxd b/src/sage/libs/flint/fmpz_mod.pxd index 555b3123398..319e47cffd6 100644 --- a/src/sage/libs/flint/fmpz_mod.pxd +++ b/src/sage/libs/flint/fmpz_mod.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpz_mod.h diff --git a/src/sage/libs/flint/fmpz_mod_poly.pxd b/src/sage/libs/flint/fmpz_mod_poly.pxd index 24b653eb3b7..1365f054ef8 100644 --- a/src/sage/libs/flint/fmpz_mod_poly.pxd +++ b/src/sage/libs/flint/fmpz_mod_poly.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpz_mod_poly.h diff --git a/src/sage/libs/flint/fmpz_poly.pxd b/src/sage/libs/flint/fmpz_poly.pxd index 18b36672d30..fa3a92cff94 100644 --- a/src/sage/libs/flint/fmpz_poly.pxd +++ b/src/sage/libs/flint/fmpz_poly.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpz_poly.h diff --git a/src/sage/libs/flint/fmpz_poly.pyx b/src/sage/libs/flint/fmpz_poly.pyx index d894478ba60..1408b421036 100644 --- a/src/sage/libs/flint/fmpz_poly.pyx +++ b/src/sage/libs/flint/fmpz_poly.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: extra_compile_args = -D_XPG6 """ FLINT fmpz_poly class wrapper diff --git a/src/sage/libs/flint/fmpz_poly_mat.pxd b/src/sage/libs/flint/fmpz_poly_mat.pxd index d045c745de3..37b34d25d96 100644 --- a/src/sage/libs/flint/fmpz_poly_mat.pxd +++ b/src/sage/libs/flint/fmpz_poly_mat.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpz_poly_mat.h diff --git a/src/sage/libs/flint/fmpz_poly_q.pxd b/src/sage/libs/flint/fmpz_poly_q.pxd index 846542dc0d8..2baa62df050 100644 --- a/src/sage/libs/flint/fmpz_poly_q.pxd +++ b/src/sage/libs/flint/fmpz_poly_q.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/qadic.h diff --git a/src/sage/libs/flint/fmpz_vec.pxd b/src/sage/libs/flint/fmpz_vec.pxd index 8d90aaf5ba5..fd5aacf74cc 100644 --- a/src/sage/libs/flint/fmpz_vec.pxd +++ b/src/sage/libs/flint/fmpz_vec.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fmpz_vec.h diff --git a/src/sage/libs/flint/fq.pxd b/src/sage/libs/flint/fq.pxd index 7c7565a38d8..0b83f43692c 100644 --- a/src/sage/libs/flint/fq.pxd +++ b/src/sage/libs/flint/fq.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fq.h diff --git a/src/sage/libs/flint/fq_nmod.pxd b/src/sage/libs/flint/fq_nmod.pxd index 159aa4e4077..7dfa9dc3e65 100644 --- a/src/sage/libs/flint/fq_nmod.pxd +++ b/src/sage/libs/flint/fq_nmod.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/fq_nmod.h diff --git a/src/sage/libs/flint/nmod_poly.pxd b/src/sage/libs/flint/nmod_poly.pxd index d11ef304ca2..d8f97837895 100644 --- a/src/sage/libs/flint/nmod_poly.pxd +++ b/src/sage/libs/flint/nmod_poly.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/nmod_poly.h diff --git a/src/sage/libs/flint/nmod_poly_linkage.pxi b/src/sage/libs/flint/nmod_poly_linkage.pxi index 51c5fa196cb..0dbf5e7ae4c 100644 --- a/src/sage/libs/flint/nmod_poly_linkage.pxi +++ b/src/sage/libs/flint/nmod_poly_linkage.pxi @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb r""" Linkage for arithmetic with FLINT's nmod_poly_t elements. diff --git a/src/sage/libs/flint/nmod_vec.pxd b/src/sage/libs/flint/nmod_vec.pxd index b839447bb56..c400a74e866 100644 --- a/src/sage/libs/flint/nmod_vec.pxd +++ b/src/sage/libs/flint/nmod_vec.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/nmod_vec.h diff --git a/src/sage/libs/flint/ntl_interface.pxd b/src/sage/libs/flint/ntl_interface.pxd index d3ba446d8d3..1513f85a00a 100644 --- a/src/sage/libs/flint/ntl_interface.pxd +++ b/src/sage/libs/flint/ntl_interface.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: language = c++ # distutils: libraries = flint # distutils: depends = flint/NTL-interface.h diff --git a/src/sage/libs/flint/padic.pxd b/src/sage/libs/flint/padic.pxd index e155ddabfd8..a6dce86bc73 100644 --- a/src/sage/libs/flint/padic.pxd +++ b/src/sage/libs/flint/padic.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/qadic.h diff --git a/src/sage/libs/flint/padic_poly.pxd b/src/sage/libs/flint/padic_poly.pxd index 6cd172fd14f..039f478cf5d 100644 --- a/src/sage/libs/flint/padic_poly.pxd +++ b/src/sage/libs/flint/padic_poly.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/padic_poly.h diff --git a/src/sage/libs/flint/qadic.pxd b/src/sage/libs/flint/qadic.pxd index ec64e9eef74..e8cd305d4a3 100644 --- a/src/sage/libs/flint/qadic.pxd +++ b/src/sage/libs/flint/qadic.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/qadic.h diff --git a/src/sage/libs/flint/thread_pool.pxd b/src/sage/libs/flint/thread_pool.pxd index a2cd915de79..c27dff6c1f3 100644 --- a/src/sage/libs/flint/thread_pool.pxd +++ b/src/sage/libs/flint/thread_pool.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/thread_pool.h diff --git a/src/sage/libs/flint/types.pxd b/src/sage/libs/flint/types.pxd index 7208f89d9aa..e8fc11da2c2 100644 --- a/src/sage/libs/flint/types.pxd +++ b/src/sage/libs/flint/types.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: depends = flint/flint.h flint/fmpz.h flint/fmpz_poly.h flint/fmpz_mat.h flint/fmpq.h flint/fmpq_poly.h flint/fmpq_mat.h flint/fmpz_mod_poly.h flint/nmod_poly.h flint/fq.h flint/fq_nmod.h flint/ulong_extras.h flint/padic.h flint/padic_poly.h flint/qadic.h flint/fmpz_poly_q.h """ diff --git a/src/sage/libs/flint/ulong_extras.pxd b/src/sage/libs/flint/ulong_extras.pxd index b56f11d44db..2d53d48733c 100644 --- a/src/sage/libs/flint/ulong_extras.pxd +++ b/src/sage/libs/flint/ulong_extras.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint # distutils: depends = flint/ulong_extras.h diff --git a/src/sage/libs/flint/ulong_extras.pyx b/src/sage/libs/flint/ulong_extras.pyx index 10255a96f1c..861fb835b59 100644 --- a/src/sage/libs/flint/ulong_extras.pyx +++ b/src/sage/libs/flint/ulong_extras.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb def n_factor_to_list(unsigned long n, int proved): """ A wrapper around ``n_factor``. diff --git a/src/sage/matrix/matrix_complex_ball_dense.pxd b/src/sage/matrix/matrix_complex_ball_dense.pxd index fab9172f8b2..103dd4f21da 100644 --- a/src/sage/matrix/matrix_complex_ball_dense.pxd +++ b/src/sage/matrix/matrix_complex_ball_dense.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb from sage.libs.arb.types cimport acb_mat_t from .matrix_dense cimport Matrix_dense from sage.matrix.matrix_generic_dense cimport Matrix_generic_dense diff --git a/src/sage/matrix/matrix_complex_ball_dense.pyx b/src/sage/matrix/matrix_complex_ball_dense.pyx index 2269af40b05..8f7ad4e3021 100644 --- a/src/sage/matrix/matrix_complex_ball_dense.pyx +++ b/src/sage/matrix/matrix_complex_ball_dense.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = ARB_LIBRARY r""" Arbitrary precision complex ball matrices using Arb diff --git a/src/sage/rings/complex_arb.pxd b/src/sage/rings/complex_arb.pxd index 5f858a20fcf..2b4c1187390 100644 --- a/src/sage/rings/complex_arb.pxd +++ b/src/sage/rings/complex_arb.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb from sage.libs.arb.acb cimport acb_t from sage.rings.complex_interval cimport ComplexIntervalFieldElement from sage.rings.real_arb cimport RealBall diff --git a/src/sage/rings/complex_arb.pyx b/src/sage/rings/complex_arb.pyx index 797f5122d40..19457fa8e5d 100644 --- a/src/sage/rings/complex_arb.pyx +++ b/src/sage/rings/complex_arb.pyx @@ -1,4 +1,4 @@ -# -*- coding: utf-8 +# sage_setup: distribution = sagemath-flint-arb r""" Arbitrary precision complex balls using Arb diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pxd b/src/sage/rings/number_field/number_field_element_quadratic.pxd index 7a4f063de73..c2343de159b 100644 --- a/src/sage/rings/number_field/number_field_element_quadratic.pxd +++ b/src/sage/rings/number_field/number_field_element_quadratic.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb from sage.libs.gmp.types cimport mpz_t from sage.libs.arb.types cimport arb_t from sage.rings.integer cimport Integer diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pyx b/src/sage/rings/number_field/number_field_element_quadratic.pyx index 04224f2f208..9728f0bf21e 100644 --- a/src/sage/rings/number_field/number_field_element_quadratic.pyx +++ b/src/sage/rings/number_field/number_field_element_quadratic.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = NTL_LIBRARIES # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/rings/padics/qadic_flint_FP.pyx b/src/sage/rings/padics/qadic_flint_FP.pyx index 020b03b722a..99f2dfd7614 100644 --- a/src/sage/rings/padics/qadic_flint_FP.pyx +++ b/src/sage/rings/padics/qadic_flint_FP.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint include "sage/libs/linkages/padics/fmpz_poly_unram.pxi" diff --git a/src/sage/rings/polynomial/evaluation_flint.pyx b/src/sage/rings/polynomial/evaluation_flint.pyx index fc75fabd42d..d36b5966b9c 100644 --- a/src/sage/rings/polynomial/evaluation_flint.pyx +++ b/src/sage/rings/polynomial/evaluation_flint.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb # distutils: libraries = flint r""" Fast evaluation of polynomials (Horner's rule) diff --git a/src/sage/rings/polynomial/polynomial_complex_arb.pxd b/src/sage/rings/polynomial/polynomial_complex_arb.pxd index aa4e2a1c0dc..9b46c397072 100644 --- a/src/sage/rings/polynomial/polynomial_complex_arb.pxd +++ b/src/sage/rings/polynomial/polynomial_complex_arb.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb from sage.libs.arb.acb_poly cimport * from sage.rings.polynomial.polynomial_element cimport Polynomial diff --git a/src/sage/rings/polynomial/polynomial_complex_arb.pyx b/src/sage/rings/polynomial/polynomial_complex_arb.pyx index 5fc4ff1f6af..574476e17bd 100644 --- a/src/sage/rings/polynomial/polynomial_complex_arb.pyx +++ b/src/sage/rings/polynomial/polynomial_complex_arb.pyx @@ -1,4 +1,4 @@ -# -*- coding: utf-8 +# sage_setup: distribution = sagemath-flint-arb r""" Univariate polynomials over `\CC` with interval coefficients using Arb. diff --git a/src/sage/rings/real_arb.pxd b/src/sage/rings/real_arb.pxd index 2f48fa06988..76ffb95a98d 100644 --- a/src/sage/rings/real_arb.pxd +++ b/src/sage/rings/real_arb.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-flint-arb from sage.libs.arb.arb cimport arb_t from sage.libs.mpfi.types cimport mpfi_t from sage.rings.real_mpfi cimport RealIntervalField_class, RealIntervalFieldElement diff --git a/src/sage/rings/real_arb.pyx b/src/sage/rings/real_arb.pyx index 23a41c2bf6a..76b75e62f4f 100644 --- a/src/sage/rings/real_arb.pyx +++ b/src/sage/rings/real_arb.pyx @@ -1,4 +1,4 @@ -# -*- coding: utf-8 +# sage_setup: distribution = sagemath-flint-arb r""" Arbitrary precision real balls using Arb From 71b59217f26dbdb26e26c587ede4d325a1a65a4a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 16 Nov 2022 22:29:00 -0800 Subject: [PATCH 02/60] Mark files # sage_setup: distribution = sagemath-homfly --- src/sage/libs/homfly.pyx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sage/libs/homfly.pyx b/src/sage/libs/homfly.pyx index 0493908fae2..da4507579e5 100644 --- a/src/sage/libs/homfly.pyx +++ b/src/sage/libs/homfly.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-homfly # distutils: libraries = homfly gc r""" Cython wrapper for libhomfly library From fe08ab25712cb87ea60946b30f3cf65f94481865 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 16 Nov 2022 22:41:21 -0800 Subject: [PATCH 03/60] Mark files # sage_setup: distribution = sagemath-giac --- src/sage/libs/giac/__init__.py | 1 + src/sage/libs/giac/auto-methods.pxi | 1 + src/sage/libs/giac/giac.pxd | 1 + src/sage/libs/giac/giac.pyx | 1 + src/sage/libs/giac/keywords.pxi | 1 + src/sage_setup/autogen/giacpy-mkkeywords.py | 2 ++ 6 files changed, 7 insertions(+) diff --git a/src/sage/libs/giac/__init__.py b/src/sage/libs/giac/__init__.py index 558cd894b13..5c26a84e2b7 100644 --- a/src/sage/libs/giac/__init__.py +++ b/src/sage/libs/giac/__init__.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-giac # -*- coding: utf-8 -*- """ Wrappers for Giac functions diff --git a/src/sage/libs/giac/auto-methods.pxi b/src/sage/libs/giac/auto-methods.pxi index 9af4c0023bf..92166556652 100644 --- a/src/sage/libs/giac/auto-methods.pxi +++ b/src/sage/libs/giac/auto-methods.pxi @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-giac # file auto generated by mkkeywords.py cdef class GiacMethods_base: """ diff --git a/src/sage/libs/giac/giac.pxd b/src/sage/libs/giac/giac.pxd index 1d9da88d8d4..b1c57995763 100644 --- a/src/sage/libs/giac/giac.pxd +++ b/src/sage/libs/giac/giac.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-giac # distutils: language = c++ # **************************************************************************** # Copyright (C) 2012, Frederic Han diff --git a/src/sage/libs/giac/giac.pyx b/src/sage/libs/giac/giac.pyx index 4e451dba5e7..41753864f1a 100644 --- a/src/sage/libs/giac/giac.pyx +++ b/src/sage/libs/giac/giac.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-giac # distutils: libraries = giac # distutils: language = c++ r""" diff --git a/src/sage/libs/giac/keywords.pxi b/src/sage/libs/giac/keywords.pxi index 9bc7eebe0b5..e1253b9746a 100644 --- a/src/sage/libs/giac/keywords.pxi +++ b/src/sage/libs/giac/keywords.pxi @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-giac # file auto generated by mkkeywords.py blacklist = ['eval', 'cas_setup', 'i', 'list', 'input', 'in', 'sto', 'string', 'and', 'break', 'continue', 'else', 'for', 'from', 'if', 'not', 'or', 'pow', 'print', 'return', 'set[]', 'try', 'while', 'open', 'output', 'do', 'of', 'Request', 'i[]', '[]', 'ffunction', 'sleep', '[..]'] diff --git a/src/sage_setup/autogen/giacpy-mkkeywords.py b/src/sage_setup/autogen/giacpy-mkkeywords.py index 3a918b20aeb..dbc99b075f7 100644 --- a/src/sage_setup/autogen/giacpy-mkkeywords.py +++ b/src/sage_setup/autogen/giacpy-mkkeywords.py @@ -72,6 +72,7 @@ # building auto-methods.pxi Mi=open("auto-methods.pxi","w") +Mi.write("# sage_setup: distribution = sagemath-giac\n") Mi.write("# file auto generated by mkkeywords.py\n") s='cdef class GiacMethods_base:\n """\n Wrapper for a giac ``gen`` containing auto-generated methods.\n' s+='\n This class does not manage the ``gen`` inside in any way. It is just\n a dumb wrapper.' @@ -92,6 +93,7 @@ # building keywords.pxi with open("keywords.pxi", "w") as Fi: + Fi.write("# sage_setup: distribution = sagemath-giac\n") Fi.write("# file auto generated by mkkeywords.py\n") Fi.write("blacklist = " + str(blacklist) + "\n\n") Fi.write("toremove = " + str(toremove) + "\n\n") From 640aa74ca3189de7a263db7f7746ba49bec5760a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 16 Nov 2022 22:56:46 -0800 Subject: [PATCH 04/60] Mark files # sage_setup: distribution = sagemath-gap --- src/sage/coding/codecan/codecan.pxd | 1 + src/sage/coding/codecan/codecan.pyx | 1 + src/sage/combinat/enumeration_mod_permgroup.pxd | 1 + src/sage/combinat/enumeration_mod_permgroup.pyx | 1 + src/sage/combinat/root_system/reflection_group_c.pyx | 1 + src/sage/combinat/root_system/reflection_group_element.pxd | 1 + src/sage/combinat/root_system/reflection_group_element.pyx | 1 + src/sage/graphs/spanning_tree.pyx | 1 + src/sage/groups/libgap_wrapper.pxd | 1 + src/sage/groups/libgap_wrapper.pyx | 1 + src/sage/groups/matrix_gps/group_element.pxd | 1 + src/sage/groups/matrix_gps/group_element.pyx | 1 + .../perm_gps/partn_ref/automorphism_group_canonical_label.pxd | 1 + .../perm_gps/partn_ref/automorphism_group_canonical_label.pyx | 1 + src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd | 1 + src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx | 1 + src/sage/groups/perm_gps/partn_ref/data_structures.pxd | 1 + src/sage/groups/perm_gps/partn_ref/data_structures.pyx | 1 + src/sage/groups/perm_gps/partn_ref/double_coset.pxd | 1 + src/sage/groups/perm_gps/partn_ref/double_coset.pyx | 1 + src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd | 1 + src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx | 1 + src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd | 1 + src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx | 1 + src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd | 1 + src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx | 1 + src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd | 1 + src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx | 1 + src/sage/groups/perm_gps/partn_ref/refinement_python.pxd | 1 + src/sage/groups/perm_gps/partn_ref/refinement_python.pyx | 1 + src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd | 1 + src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx | 1 + src/sage/groups/perm_gps/partn_ref2/refinement_generic.pxd | 1 + src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx | 1 + src/sage/groups/perm_gps/permgroup_element.pxd | 1 + src/sage/groups/perm_gps/permgroup_element.pyx | 1 + src/sage/libs/gap/element.pxd | 1 + src/sage/libs/gap/element.pyx | 1 + src/sage/libs/gap/libgap.pyx | 1 + src/sage/libs/gap/util.pxd | 1 + src/sage/libs/gap/util.pyx | 1 + src/sage/matrix/matrix_gap.pxd | 1 + src/sage/matrix/matrix_gap.pyx | 1 + src/sage/sets/disjoint_set.pxd | 1 + src/sage/sets/disjoint_set.pyx | 1 + 45 files changed, 45 insertions(+) diff --git a/src/sage/coding/codecan/codecan.pxd b/src/sage/coding/codecan/codecan.pxd index dd72f6bb798..edefe429fdc 100644 --- a/src/sage/coding/codecan/codecan.pxd +++ b/src/sage/coding/codecan/codecan.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap from sage.groups.perm_gps.permgroup_element cimport PermutationGroupElement from sage.groups.semimonomial_transformations.semimonomial_transformation cimport SemimonomialTransformation from sage.modules.free_module_element cimport FreeModuleElement diff --git a/src/sage/coding/codecan/codecan.pyx b/src/sage/coding/codecan/codecan.pyx index 5320a49b179..e3529516599 100644 --- a/src/sage/coding/codecan/codecan.pyx +++ b/src/sage/coding/codecan/codecan.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Canonical forms and automorphism group computation for linear codes over finite fields diff --git a/src/sage/combinat/enumeration_mod_permgroup.pxd b/src/sage/combinat/enumeration_mod_permgroup.pxd index 2f457429ccf..e76f84dc7c8 100644 --- a/src/sage/combinat/enumeration_mod_permgroup.pxd +++ b/src/sage/combinat/enumeration_mod_permgroup.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap from sage.structure.list_clone cimport ClonableIntArray cpdef list all_children(ClonableIntArray v, int max_part) diff --git a/src/sage/combinat/enumeration_mod_permgroup.pyx b/src/sage/combinat/enumeration_mod_permgroup.pyx index 312026ca4c6..89cd883340e 100644 --- a/src/sage/combinat/enumeration_mod_permgroup.pyx +++ b/src/sage/combinat/enumeration_mod_permgroup.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Tools for enumeration modulo the action of a permutation group """ diff --git a/src/sage/combinat/root_system/reflection_group_c.pyx b/src/sage/combinat/root_system/reflection_group_c.pyx index 49175591edc..92be9a20cf4 100644 --- a/src/sage/combinat/root_system/reflection_group_c.pyx +++ b/src/sage/combinat/root_system/reflection_group_c.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #cython: wraparound=False, boundscheck=False r""" This contains a few time-critical auxiliary cython functions for diff --git a/src/sage/combinat/root_system/reflection_group_element.pxd b/src/sage/combinat/root_system/reflection_group_element.pxd index 04e98fc3fb2..b442383b7be 100644 --- a/src/sage/combinat/root_system/reflection_group_element.pxd +++ b/src/sage/combinat/root_system/reflection_group_element.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap from sage.groups.perm_gps.permgroup_element cimport PermutationGroupElement cdef class ComplexReflectionGroupElement(PermutationGroupElement): diff --git a/src/sage/combinat/root_system/reflection_group_element.pyx b/src/sage/combinat/root_system/reflection_group_element.pyx index c08a6001524..62687680a8a 100644 --- a/src/sage/combinat/root_system/reflection_group_element.pyx +++ b/src/sage/combinat/root_system/reflection_group_element.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Reflection group elements diff --git a/src/sage/graphs/spanning_tree.pyx b/src/sage/graphs/spanning_tree.pyx index 031b621cb58..ee3f4426428 100644 --- a/src/sage/graphs/spanning_tree.pyx +++ b/src/sage/graphs/spanning_tree.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap # cython: binding=True r""" Spanning trees diff --git a/src/sage/groups/libgap_wrapper.pxd b/src/sage/groups/libgap_wrapper.pxd index 0c43b098140..42214521586 100644 --- a/src/sage/groups/libgap_wrapper.pxd +++ b/src/sage/groups/libgap_wrapper.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap from sage.structure.element cimport MultiplicativeGroupElement from sage.libs.gap.element cimport GapElement diff --git a/src/sage/groups/libgap_wrapper.pyx b/src/sage/groups/libgap_wrapper.pyx index a76afc2ac94..d581a14eef8 100644 --- a/src/sage/groups/libgap_wrapper.pyx +++ b/src/sage/groups/libgap_wrapper.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ LibGAP-based Groups diff --git a/src/sage/groups/matrix_gps/group_element.pxd b/src/sage/groups/matrix_gps/group_element.pxd index df5f99aeca9..680bc8f23fd 100644 --- a/src/sage/groups/matrix_gps/group_element.pxd +++ b/src/sage/groups/matrix_gps/group_element.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap from sage.structure.element cimport MultiplicativeGroupElement, Element, MonoidElement, Matrix from sage.groups.libgap_wrapper cimport ElementLibGAP diff --git a/src/sage/groups/matrix_gps/group_element.pyx b/src/sage/groups/matrix_gps/group_element.pyx index 777b141beb0..828f0cc7e1a 100644 --- a/src/sage/groups/matrix_gps/group_element.pyx +++ b/src/sage/groups/matrix_gps/group_element.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Matrix Group Elements diff --git a/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pxd b/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pxd index 5fe1ebd140d..791ac2e89aa 100644 --- a/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pxd +++ b/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2006 - 2011 Robert L. Miller # diff --git a/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx b/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx index ad30101e161..d7ee6655a62 100644 --- a/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx +++ b/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Automorphism groups and canonical labels diff --git a/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd b/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd index dfcf347df4c..04d5415050f 100644 --- a/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd +++ b/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Declaration file for canonical augmentation diff --git a/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx b/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx index ac4c40b9b34..0f73efb0562 100644 --- a/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx +++ b/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Canonical augmentation diff --git a/src/sage/groups/perm_gps/partn_ref/data_structures.pxd b/src/sage/groups/perm_gps/partn_ref/data_structures.pxd index b469d09c2b5..67e9de7e68c 100644 --- a/src/sage/groups/perm_gps/partn_ref/data_structures.pxd +++ b/src/sage/groups/perm_gps/partn_ref/data_structures.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2006 - 2011 Robert L. Miller # diff --git a/src/sage/groups/perm_gps/partn_ref/data_structures.pyx b/src/sage/groups/perm_gps/partn_ref/data_structures.pyx index 74065fe1fec..2f67e4bcf3a 100644 --- a/src/sage/groups/perm_gps/partn_ref/data_structures.pyx +++ b/src/sage/groups/perm_gps/partn_ref/data_structures.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Data structures diff --git a/src/sage/groups/perm_gps/partn_ref/double_coset.pxd b/src/sage/groups/perm_gps/partn_ref/double_coset.pxd index 7db1b7764c3..e8d8abe03d1 100644 --- a/src/sage/groups/perm_gps/partn_ref/double_coset.pxd +++ b/src/sage/groups/perm_gps/partn_ref/double_coset.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2006 - 2011 Robert L. Miller # diff --git a/src/sage/groups/perm_gps/partn_ref/double_coset.pyx b/src/sage/groups/perm_gps/partn_ref/double_coset.pyx index 3f726879292..2a1e5415ce2 100644 --- a/src/sage/groups/perm_gps/partn_ref/double_coset.pyx +++ b/src/sage/groups/perm_gps/partn_ref/double_coset.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Double cosets diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd index 005142f8bc7..8dc5b95f27e 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2006 - 2011 Robert L. Miller # diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx index e18fdf5f41a..ebe8d0a06b8 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Partition backtrack functions for binary codes diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd index f26580d3010..bf3acd3b5cc 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2006 - 2011 Robert L. Miller # diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx index 1acb46201a0..1b20f913544 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Graph-theoretic partition backtrack functions diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd index 898dfa97528..20db4dd5073 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2006 - 2011 Robert L. Miller # Copyright (C) 2009 Nicolas Borie diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx index 5d8e3ff032a..4fda054767c 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Partition backtrack functions for lists -- a simple example of using partn_ref diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd index 0273291f014..aad03c0f51e 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2006 - 2011 Robert L. Miller # diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx index 736659318d6..b864050e825 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Partition backtrack functions for matrices diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_python.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_python.pxd index 1c13cb9c337..e9f338ede8d 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_python.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_python.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2006 - 2011 Robert L. Miller # diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_python.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_python.pyx index a24b0499888..3a20fbe1da2 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_python.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_python.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Python interface to partition backtrack functions diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd index 19f60c7f153..e265626e084 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Declaration file for simple set datastructures diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx index 912c9a31a0d..9c47b17b27f 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Partition backtrack functions for sets diff --git a/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pxd b/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pxd index e45afd3e578..08418c30841 100644 --- a/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pxd +++ b/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #******************************************************************************* # Copyright (C) 2012 Thomas Feulner # diff --git a/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx b/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx index f2ccca042ac..df00f3cbd68 100644 --- a/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx +++ b/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Automorphism groups and canonical labels. diff --git a/src/sage/groups/perm_gps/permgroup_element.pxd b/src/sage/groups/perm_gps/permgroup_element.pxd index a2ac8f20eaa..9e9b60c798e 100644 --- a/src/sage/groups/perm_gps/permgroup_element.pxd +++ b/src/sage/groups/perm_gps/permgroup_element.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap from sage.structure.element cimport MultiplicativeGroupElement, MonoidElement, Element from sage.structure.list_clone cimport ClonableIntArray from sage.rings.polynomial.polydict cimport ETuple diff --git a/src/sage/groups/perm_gps/permgroup_element.pyx b/src/sage/groups/perm_gps/permgroup_element.pyx index c0fbd8d15db..a14c5b10b88 100644 --- a/src/sage/groups/perm_gps/permgroup_element.pyx +++ b/src/sage/groups/perm_gps/permgroup_element.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Permutation group elements diff --git a/src/sage/libs/gap/element.pxd b/src/sage/libs/gap/element.pxd index a1bf8118d4f..7f1bcaa0fa4 100644 --- a/src/sage/libs/gap/element.pxd +++ b/src/sage/libs/gap/element.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2012 Volker Braun # diff --git a/src/sage/libs/gap/element.pyx b/src/sage/libs/gap/element.pyx index 976ee35e8fe..5c0aa2119eb 100644 --- a/src/sage/libs/gap/element.pyx +++ b/src/sage/libs/gap/element.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ GAP element wrapper diff --git a/src/sage/libs/gap/libgap.pyx b/src/sage/libs/gap/libgap.pyx index b1a64e57939..49aadf60143 100644 --- a/src/sage/libs/gap/libgap.pyx +++ b/src/sage/libs/gap/libgap.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Library Interface to GAP diff --git a/src/sage/libs/gap/util.pxd b/src/sage/libs/gap/util.pxd index 118146133f4..2cbf1032d6c 100644 --- a/src/sage/libs/gap/util.pxd +++ b/src/sage/libs/gap/util.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2012 Volker Braun # diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx index 344ab88c42a..604d555a9a6 100644 --- a/src/sage/libs/gap/util.pyx +++ b/src/sage/libs/gap/util.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Utility functions for GAP """ diff --git a/src/sage/matrix/matrix_gap.pxd b/src/sage/matrix/matrix_gap.pxd index 0667c158df8..b015ebe3fdb 100644 --- a/src/sage/matrix/matrix_gap.pxd +++ b/src/sage/matrix/matrix_gap.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap from .matrix_dense cimport Matrix_dense from sage.libs.gap.element cimport GapElement diff --git a/src/sage/matrix/matrix_gap.pyx b/src/sage/matrix/matrix_gap.pyx index 8485760e9cb..8f0f3576066 100644 --- a/src/sage/matrix/matrix_gap.pyx +++ b/src/sage/matrix/matrix_gap.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Wrappers on GAP matrices """ diff --git a/src/sage/sets/disjoint_set.pxd b/src/sage/sets/disjoint_set.pxd index 0b16d2fce83..39321bf2fd5 100644 --- a/src/sage/sets/disjoint_set.pxd +++ b/src/sage/sets/disjoint_set.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap #***************************************************************************** # Copyright (C) 2009 Sebastien Labbe # diff --git a/src/sage/sets/disjoint_set.pyx b/src/sage/sets/disjoint_set.pyx index aaa12438f15..7466276a689 100644 --- a/src/sage/sets/disjoint_set.pyx +++ b/src/sage/sets/disjoint_set.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap # -*- coding: utf-8 -*- r""" Disjoint-set data structure From d1ef6554a0729fc4f178f2ea93cb24cfed23c16d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 16 Nov 2022 23:41:55 -0800 Subject: [PATCH 05/60] Do not mark *.h files with # sage-setup: distribution --- src/sage/libs/flint/flint_ntl_wrap.h | 1 - src/sage/libs/flint/flint_wrap.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/sage/libs/flint/flint_ntl_wrap.h b/src/sage/libs/flint/flint_ntl_wrap.h index baff1cf8f28..841d990817d 100644 --- a/src/sage/libs/flint/flint_ntl_wrap.h +++ b/src/sage/libs/flint/flint_ntl_wrap.h @@ -1,4 +1,3 @@ -# sage_setup: distribution = sagemath-flint-arb #ifndef SAGE_FLINT_NTL_WRAP_H #define SAGE_FLINT_NTL_WRAP_H /* diff --git a/src/sage/libs/flint/flint_wrap.h b/src/sage/libs/flint/flint_wrap.h index e96a7be682d..ae02e473a95 100644 --- a/src/sage/libs/flint/flint_wrap.h +++ b/src/sage/libs/flint/flint_wrap.h @@ -1,4 +1,3 @@ -# sage_setup: distribution = sagemath-flint-arb #ifndef SAGE_FLINT_WRAP_H #define SAGE_FLINT_WRAP_H /* Using flint headers together in the same module as headers from some other From 8c46aab3019c70b2c4c80871a0abd418e25bf97b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 16 Nov 2022 23:59:16 -0800 Subject: [PATCH 06/60] pkgs/sagemath-gap, build/pkgs/sagemath_gap: New --- build/pkgs/sagemath_gap/SPKG.rst | 1 + build/pkgs/sagemath_gap/bootstrap | 1 + build/pkgs/sagemath_gap/dependencies | 1 + build/pkgs/sagemath_gap/install-requires.txt | 2 + build/pkgs/sagemath_gap/package-version.txt | 1 + build/pkgs/sagemath_gap/spkg-install | 29 +++++++++ build/pkgs/sagemath_gap/spkg-src | 21 ++++++ build/pkgs/sagemath_gap/src | 1 + build/pkgs/sagemath_gap/type | 1 + pkgs/sagemath-gap/MANIFEST.in | 11 ++++ pkgs/sagemath-gap/README.rst | 32 +++++++++ pkgs/sagemath-gap/VERSION.txt | 1 + pkgs/sagemath-gap/pyproject.toml.m4 | 16 +++++ pkgs/sagemath-gap/requirements.txt.m4 | 2 + pkgs/sagemath-gap/sage | 1 + pkgs/sagemath-gap/setup.cfg.m4 | 37 +++++++++++ pkgs/sagemath-gap/setup.py | 68 ++++++++++++++++++++ 17 files changed, 226 insertions(+) create mode 120000 build/pkgs/sagemath_gap/SPKG.rst create mode 120000 build/pkgs/sagemath_gap/bootstrap create mode 100644 build/pkgs/sagemath_gap/dependencies create mode 100644 build/pkgs/sagemath_gap/install-requires.txt create mode 120000 build/pkgs/sagemath_gap/package-version.txt create mode 100755 build/pkgs/sagemath_gap/spkg-install create mode 100755 build/pkgs/sagemath_gap/spkg-src create mode 120000 build/pkgs/sagemath_gap/src create mode 100644 build/pkgs/sagemath_gap/type create mode 100644 pkgs/sagemath-gap/MANIFEST.in create mode 100644 pkgs/sagemath-gap/README.rst create mode 100644 pkgs/sagemath-gap/VERSION.txt create mode 100644 pkgs/sagemath-gap/pyproject.toml.m4 create mode 100644 pkgs/sagemath-gap/requirements.txt.m4 create mode 120000 pkgs/sagemath-gap/sage create mode 100644 pkgs/sagemath-gap/setup.cfg.m4 create mode 100644 pkgs/sagemath-gap/setup.py diff --git a/build/pkgs/sagemath_gap/SPKG.rst b/build/pkgs/sagemath_gap/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_gap/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_gap/bootstrap b/build/pkgs/sagemath_gap/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_gap/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_gap/dependencies b/build/pkgs/sagemath_gap/dependencies new file mode 100644 index 00000000000..1f3d17229e3 --- /dev/null +++ b/build/pkgs/sagemath_gap/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib gap | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_gap/install-requires.txt b/build/pkgs/sagemath_gap/install-requires.txt new file mode 100644 index 00000000000..cd272703256 --- /dev/null +++ b/build/pkgs/sagemath_gap/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-gap diff --git a/build/pkgs/sagemath_gap/package-version.txt b/build/pkgs/sagemath_gap/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_gap/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_gap/spkg-install b/build/pkgs/sagemath_gap/spkg-install new file mode 100755 index 00000000000..7ce202f09ae --- /dev/null +++ b/build/pkgs/sagemath_gap/spkg-install @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +if [ "$SAGE_EDITABLE" = yes ]; then + # SAGE_ROOT/src/setup.py installs everything, nothing to do... + if [ "$SAGE_WHEELS" = yes ]; then + # ... except we build the wheel if requested + sdh_setup_bdist_wheel && sdh_store_wheel . + fi +else + if [ "$SAGE_WHEELS" = yes ]; then + # Modularized install via wheels + sdh_pip_install . + # else nothing to do in legacy direct installation. + fi +fi diff --git a/build/pkgs/sagemath_gap/spkg-src b/build/pkgs/sagemath_gap/spkg-src new file mode 100755 index 00000000000..a37d2c128ce --- /dev/null +++ b/build/pkgs/sagemath_gap/spkg-src @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# Script to prepare an sdist tarball for sagemath-gap +# This script is not used during build. +# +# HOW TO MAKE THE TARBALL: +# ./sage --sh build/pkgs/sagemath_gap/spkg-src + +if [ -z "$SAGE_ROOT" ] ; then + echo >&2 "Error - SAGE_ROOT undefined ... exiting" + echo >&2 "Maybe run 'sage -sh'?" + exit 1 +fi + +# Exit on failure +set -e + +cd build/pkgs/sagemath_gap + +cd src +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_gap/src b/build/pkgs/sagemath_gap/src new file mode 120000 index 00000000000..c6c9cb7af91 --- /dev/null +++ b/build/pkgs/sagemath_gap/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-gap \ No newline at end of file diff --git a/build/pkgs/sagemath_gap/type b/build/pkgs/sagemath_gap/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_gap/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-gap/MANIFEST.in b/pkgs/sagemath-gap/MANIFEST.in new file mode 100644 index 00000000000..8534471f1f2 --- /dev/null +++ b/pkgs/sagemath-gap/MANIFEST.in @@ -0,0 +1,11 @@ +global-exclude *.c +global-exclude *.cpp + +global-exclude __pycache__ +global-exclude *.py[co] +global-exclude *.bak +global-exclude *.so +global-exclude *~ +prune .tox +prune build +prune dist diff --git a/pkgs/sagemath-gap/README.rst b/pkgs/sagemath-gap/README.rst new file mode 100644 index 00000000000..59cc4ca5e18 --- /dev/null +++ b/pkgs/sagemath-gap/README.rst @@ -0,0 +1,32 @@ +============================================================================== + Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with gap +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +About this pip-installable source distribution +---------------------------------------------- + +This pip-installable source distribution ``sagemath-gap`` is a small +optional distribution for use with ``sagemath-standard``. + +It provides a Cython interface to the ``gap`` library for the purpose +of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-gap/VERSION.txt b/pkgs/sagemath-gap/VERSION.txt new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-gap/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-gap/pyproject.toml.m4 b/pkgs/sagemath-gap/pyproject.toml.m4 new file mode 100644 index 00000000000..71cd99a5b4f --- /dev/null +++ b/pkgs/sagemath-gap/pyproject.toml.m4 @@ -0,0 +1,16 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_categories \ + cython \ + gmpy2 \ + cysignals \ + cypari \ + memory_allocator \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-gap/requirements.txt.m4 b/pkgs/sagemath-gap/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-gap/requirements.txt.m4 @@ -0,0 +1,2 @@ +Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') +sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-gap/sage b/pkgs/sagemath-gap/sage new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-gap/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-gap/setup.cfg.m4 b/pkgs/sagemath-gap/setup.cfg.m4 new file mode 100644 index 00000000000..a16dda370ce --- /dev/null +++ b/pkgs/sagemath-gap/setup.cfg.m4 @@ -0,0 +1,37 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-gap +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with gap +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + cypari \ + cysignals \ + memory_allocator \ + sagemath_environment \ + sagemath_categories \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-gap/setup.py b/pkgs/sagemath-gap/setup.py new file mode 100644 index 00000000000..5f157f38536 --- /dev/null +++ b/pkgs/sagemath-gap/setup.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python + +from distutils import log +from setuptools import setup + +# Work around a Cython problem in Python 3.8.x on macOS +# https://github.com/cython/cython/issues/3262 +import os +if os.uname().sysname == 'Darwin': + import multiprocessing + multiprocessing.set_start_method('fork', force=True) + +# If build isolation is not in use and setuptools_scm is installed, +# then its file_finders entry point is invoked, which we don't need. +# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 +try: + import setuptools_scm.integration + setuptools_scm.integration.find_files = lambda _: [] +except ImportError: + pass + +# PEP 517 builds do not have . in sys.path +import sys +sys.path.insert(0, os.path.dirname(__file__)) + +if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): + sdist = True +else: + sdist = False + +if sdist: + cmdclass = {} +else: + from sage_setup.excepthook import excepthook + sys.excepthook = excepthook + + from sage_setup.setenv import setenv + setenv() + + import sage.env + sage.env.default_required_modules = sage.env.default_optional_modules = () + + from sage_setup.command.sage_build_cython import sage_build_cython + from sage_setup.command.sage_build_ext import sage_build_ext + sage_build_cython.built_distributions = ['sagemath-gap'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + from sage_setup.find import find_python_sources + python_packages, python_modules, cython_modules = find_python_sources( + '.', ['sage'], distributions=['sagemath-gap']) + + log.warn('python_packages = {0}'.format(python_packages)) + log.warn('python_modules = {0}'.format(python_modules)) + log.warn('cython_modules = {0}'.format(cython_modules)) + +setup( + cmdclass = cmdclass, + packages = python_packages, + py_modules = python_modules, + ext_modules = cython_modules, +) From 6db9b01631850b2d8ef48e0f0f8d2eb8d50e140d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 17 Nov 2022 00:40:45 -0800 Subject: [PATCH 07/60] pkgs/sagemath-homfly, build/pkgs/sagemath_homfly: New --- build/pkgs/sagemath_homfly/SPKG.rst | 1 + build/pkgs/sagemath_homfly/bootstrap | 1 + build/pkgs/sagemath_homfly/dependencies | 1 + build/pkgs/sagemath_homfly/distros/conda.txt | 1 + .../pkgs/sagemath_homfly/install-requires.txt | 2 + .../pkgs/sagemath_homfly/package-version.txt | 1 + build/pkgs/sagemath_homfly/spkg-install | 29 ++++++++ build/pkgs/sagemath_homfly/spkg-src | 21 ++++++ build/pkgs/sagemath_homfly/src | 1 + build/pkgs/sagemath_homfly/type | 1 + pkgs/sagemath-homfly/MANIFEST.in | 11 +++ pkgs/sagemath-homfly/README.rst | 32 +++++++++ pkgs/sagemath-homfly/VERSION.txt | 1 + pkgs/sagemath-homfly/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-homfly/requirements.txt.m4 | 2 + pkgs/sagemath-homfly/sage | 1 + pkgs/sagemath-homfly/setup.cfg.m4 | 33 +++++++++ pkgs/sagemath-homfly/setup.py | 68 +++++++++++++++++++ 18 files changed, 221 insertions(+) create mode 120000 build/pkgs/sagemath_homfly/SPKG.rst create mode 120000 build/pkgs/sagemath_homfly/bootstrap create mode 100644 build/pkgs/sagemath_homfly/dependencies create mode 100644 build/pkgs/sagemath_homfly/distros/conda.txt create mode 100644 build/pkgs/sagemath_homfly/install-requires.txt create mode 120000 build/pkgs/sagemath_homfly/package-version.txt create mode 100755 build/pkgs/sagemath_homfly/spkg-install create mode 100755 build/pkgs/sagemath_homfly/spkg-src create mode 120000 build/pkgs/sagemath_homfly/src create mode 100644 build/pkgs/sagemath_homfly/type create mode 100644 pkgs/sagemath-homfly/MANIFEST.in create mode 100644 pkgs/sagemath-homfly/README.rst create mode 100644 pkgs/sagemath-homfly/VERSION.txt create mode 100644 pkgs/sagemath-homfly/pyproject.toml.m4 create mode 100644 pkgs/sagemath-homfly/requirements.txt.m4 create mode 120000 pkgs/sagemath-homfly/sage create mode 100644 pkgs/sagemath-homfly/setup.cfg.m4 create mode 100644 pkgs/sagemath-homfly/setup.py diff --git a/build/pkgs/sagemath_homfly/SPKG.rst b/build/pkgs/sagemath_homfly/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_homfly/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_homfly/bootstrap b/build/pkgs/sagemath_homfly/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_homfly/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_homfly/dependencies b/build/pkgs/sagemath_homfly/dependencies new file mode 100644 index 00000000000..ce340466782 --- /dev/null +++ b/build/pkgs/sagemath_homfly/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib libhomfly | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_homfly/distros/conda.txt b/build/pkgs/sagemath_homfly/distros/conda.txt new file mode 100644 index 00000000000..8af83678269 --- /dev/null +++ b/build/pkgs/sagemath_homfly/distros/conda.txt @@ -0,0 +1 @@ +sagemath-homfly diff --git a/build/pkgs/sagemath_homfly/install-requires.txt b/build/pkgs/sagemath_homfly/install-requires.txt new file mode 100644 index 00000000000..673190afad7 --- /dev/null +++ b/build/pkgs/sagemath_homfly/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-homfly diff --git a/build/pkgs/sagemath_homfly/package-version.txt b/build/pkgs/sagemath_homfly/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_homfly/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_homfly/spkg-install b/build/pkgs/sagemath_homfly/spkg-install new file mode 100755 index 00000000000..7ce202f09ae --- /dev/null +++ b/build/pkgs/sagemath_homfly/spkg-install @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +if [ "$SAGE_EDITABLE" = yes ]; then + # SAGE_ROOT/src/setup.py installs everything, nothing to do... + if [ "$SAGE_WHEELS" = yes ]; then + # ... except we build the wheel if requested + sdh_setup_bdist_wheel && sdh_store_wheel . + fi +else + if [ "$SAGE_WHEELS" = yes ]; then + # Modularized install via wheels + sdh_pip_install . + # else nothing to do in legacy direct installation. + fi +fi diff --git a/build/pkgs/sagemath_homfly/spkg-src b/build/pkgs/sagemath_homfly/spkg-src new file mode 100755 index 00000000000..a8e60f69846 --- /dev/null +++ b/build/pkgs/sagemath_homfly/spkg-src @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# Script to prepare an sdist tarball for sagemath-homfly +# This script is not used during build. +# +# HOW TO MAKE THE TARBALL: +# ./sage --sh build/pkgs/sagemath_homfly/spkg-src + +if [ -z "$SAGE_ROOT" ] ; then + echo >&2 "Error - SAGE_ROOT undefined ... exiting" + echo >&2 "Maybe run 'sage -sh'?" + exit 1 +fi + +# Exit on failure +set -e + +cd build/pkgs/sagemath_homfly + +cd src +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_homfly/src b/build/pkgs/sagemath_homfly/src new file mode 120000 index 00000000000..1dbcf1093d1 --- /dev/null +++ b/build/pkgs/sagemath_homfly/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-homfly \ No newline at end of file diff --git a/build/pkgs/sagemath_homfly/type b/build/pkgs/sagemath_homfly/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_homfly/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-homfly/MANIFEST.in b/pkgs/sagemath-homfly/MANIFEST.in new file mode 100644 index 00000000000..8534471f1f2 --- /dev/null +++ b/pkgs/sagemath-homfly/MANIFEST.in @@ -0,0 +1,11 @@ +global-exclude *.c +global-exclude *.cpp + +global-exclude __pycache__ +global-exclude *.py[co] +global-exclude *.bak +global-exclude *.so +global-exclude *~ +prune .tox +prune build +prune dist diff --git a/pkgs/sagemath-homfly/README.rst b/pkgs/sagemath-homfly/README.rst new file mode 100644 index 00000000000..9d49ac7bfbb --- /dev/null +++ b/pkgs/sagemath-homfly/README.rst @@ -0,0 +1,32 @@ +============================================================================== + Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with homfly +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +About this pip-installable source distribution +---------------------------------------------- + +This pip-installable source distribution ``sagemath-homfly`` is a small +optional distribution for use with ``sagemath-standard``. + +It provides a Cython interface to the ``homfly`` library for the purpose +of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-homfly/VERSION.txt b/pkgs/sagemath-homfly/VERSION.txt new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-homfly/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-homfly/pyproject.toml.m4 b/pkgs/sagemath-homfly/pyproject.toml.m4 new file mode 100644 index 00000000000..aa4c23992be --- /dev/null +++ b/pkgs/sagemath-homfly/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_standard \ + cython \ + gmpy2 \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-homfly/requirements.txt.m4 b/pkgs/sagemath-homfly/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-homfly/requirements.txt.m4 @@ -0,0 +1,2 @@ +Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') +sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-homfly/sage b/pkgs/sagemath-homfly/sage new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-homfly/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-homfly/setup.cfg.m4 b/pkgs/sagemath-homfly/setup.cfg.m4 new file mode 100644 index 00000000000..460b9c62e34 --- /dev/null +++ b/pkgs/sagemath-homfly/setup.cfg.m4 @@ -0,0 +1,33 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-homfly +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with homfly +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagelib \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-homfly/setup.py b/pkgs/sagemath-homfly/setup.py new file mode 100644 index 00000000000..a5f750f51e2 --- /dev/null +++ b/pkgs/sagemath-homfly/setup.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python + +from distutils import log +from setuptools import setup + +# Work around a Cython problem in Python 3.8.x on macOS +# https://github.com/cython/cython/issues/3262 +import os +if os.uname().sysname == 'Darwin': + import multiprocessing + multiprocessing.set_start_method('fork', force=True) + +# If build isolation is not in use and setuptools_scm is installed, +# then its file_finders entry point is invoked, which we don't need. +# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 +try: + import setuptools_scm.integration + setuptools_scm.integration.find_files = lambda _: [] +except ImportError: + pass + +# PEP 517 builds do not have . in sys.path +import sys +sys.path.insert(0, os.path.dirname(__file__)) + +if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): + sdist = True +else: + sdist = False + +if sdist: + cmdclass = {} +else: + from sage_setup.excepthook import excepthook + sys.excepthook = excepthook + + from sage_setup.setenv import setenv + setenv() + + import sage.env + sage.env.default_required_modules = sage.env.default_optional_modules = () + + from sage_setup.command.sage_build_cython import sage_build_cython + from sage_setup.command.sage_build_ext import sage_build_ext + sage_build_cython.built_distributions = ['sagemath-homfly'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + from sage_setup.find import find_python_sources + python_packages, python_modules, cython_modules = find_python_sources( + '.', ['sage'], distributions=['sagemath-homfly']) + + log.warn('python_packages = {0}'.format(python_packages)) + log.warn('python_modules = {0}'.format(python_modules)) + log.warn('cython_modules = {0}'.format(cython_modules)) + +setup( + cmdclass = cmdclass, + packages = python_packages, + py_modules = python_modules, + ext_modules = cython_modules, +) From 390ebb83098b61111d4a4b748c2a2a90b44b2ad3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 17 Nov 2022 20:14:53 -0800 Subject: [PATCH 08/60] build/pkgs/sagemath_{gap,homfly}/spkg-install: Symlink to sagemath_objects spkg-install --- build/pkgs/sagemath_flint_arb/spkg-install | 1 + build/pkgs/sagemath_gap/spkg-install | 30 +--------------------- build/pkgs/sagemath_giac/spkg-install | 1 + build/pkgs/sagemath_homfly/spkg-install | 30 +--------------------- 4 files changed, 4 insertions(+), 58 deletions(-) create mode 120000 build/pkgs/sagemath_flint_arb/spkg-install mode change 100755 => 120000 build/pkgs/sagemath_gap/spkg-install create mode 120000 build/pkgs/sagemath_giac/spkg-install mode change 100755 => 120000 build/pkgs/sagemath_homfly/spkg-install diff --git a/build/pkgs/sagemath_flint_arb/spkg-install b/build/pkgs/sagemath_flint_arb/spkg-install new file mode 120000 index 00000000000..e60fac9ffa1 --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/spkg-install @@ -0,0 +1 @@ +../sagemath_objects/spkg-install \ No newline at end of file diff --git a/build/pkgs/sagemath_gap/spkg-install b/build/pkgs/sagemath_gap/spkg-install deleted file mode 100755 index 7ce202f09ae..00000000000 --- a/build/pkgs/sagemath_gap/spkg-install +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash -# From sage-spkg. -# For type=script packages, the build rule in build/make/Makefile sources -# sage-env but not sage-dist-helpers. -lib="$SAGE_ROOT/build/bin/sage-dist-helpers" -source "$lib" -if [ $? -ne 0 ]; then - echo >&2 "Error: failed to source $lib" - echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" - exit 1 -fi -cd src - -export PIP_NO_INDEX=true -export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" - -if [ "$SAGE_EDITABLE" = yes ]; then - # SAGE_ROOT/src/setup.py installs everything, nothing to do... - if [ "$SAGE_WHEELS" = yes ]; then - # ... except we build the wheel if requested - sdh_setup_bdist_wheel && sdh_store_wheel . - fi -else - if [ "$SAGE_WHEELS" = yes ]; then - # Modularized install via wheels - sdh_pip_install . - # else nothing to do in legacy direct installation. - fi -fi diff --git a/build/pkgs/sagemath_gap/spkg-install b/build/pkgs/sagemath_gap/spkg-install new file mode 120000 index 00000000000..e60fac9ffa1 --- /dev/null +++ b/build/pkgs/sagemath_gap/spkg-install @@ -0,0 +1 @@ +../sagemath_objects/spkg-install \ No newline at end of file diff --git a/build/pkgs/sagemath_giac/spkg-install b/build/pkgs/sagemath_giac/spkg-install new file mode 120000 index 00000000000..e60fac9ffa1 --- /dev/null +++ b/build/pkgs/sagemath_giac/spkg-install @@ -0,0 +1 @@ +../sagemath_objects/spkg-install \ No newline at end of file diff --git a/build/pkgs/sagemath_homfly/spkg-install b/build/pkgs/sagemath_homfly/spkg-install deleted file mode 100755 index 7ce202f09ae..00000000000 --- a/build/pkgs/sagemath_homfly/spkg-install +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash -# From sage-spkg. -# For type=script packages, the build rule in build/make/Makefile sources -# sage-env but not sage-dist-helpers. -lib="$SAGE_ROOT/build/bin/sage-dist-helpers" -source "$lib" -if [ $? -ne 0 ]; then - echo >&2 "Error: failed to source $lib" - echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" - exit 1 -fi -cd src - -export PIP_NO_INDEX=true -export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" - -if [ "$SAGE_EDITABLE" = yes ]; then - # SAGE_ROOT/src/setup.py installs everything, nothing to do... - if [ "$SAGE_WHEELS" = yes ]; then - # ... except we build the wheel if requested - sdh_setup_bdist_wheel && sdh_store_wheel . - fi -else - if [ "$SAGE_WHEELS" = yes ]; then - # Modularized install via wheels - sdh_pip_install . - # else nothing to do in legacy direct installation. - fi -fi diff --git a/build/pkgs/sagemath_homfly/spkg-install b/build/pkgs/sagemath_homfly/spkg-install new file mode 120000 index 00000000000..e60fac9ffa1 --- /dev/null +++ b/build/pkgs/sagemath_homfly/spkg-install @@ -0,0 +1 @@ +../sagemath_objects/spkg-install \ No newline at end of file From 9f26fb8c102e05033b60679798afba7ad031e796 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 18 Nov 2022 14:40:22 -0800 Subject: [PATCH 09/60] pkgs/sagemath-gap/MANIFEST.in: Add VERSION.txt --- pkgs/sagemath-gap/MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/sagemath-gap/MANIFEST.in b/pkgs/sagemath-gap/MANIFEST.in index 8534471f1f2..e53070fe86b 100644 --- a/pkgs/sagemath-gap/MANIFEST.in +++ b/pkgs/sagemath-gap/MANIFEST.in @@ -9,3 +9,5 @@ global-exclude *~ prune .tox prune build prune dist + +include VERSION.txt From 13f030c9c0de107541db3f2796b29705ee103f03 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 12:14:49 -0800 Subject: [PATCH 10/60] src/sage/libs/gap: Add # sage_setup: distribution to more files --- src/sage/libs/gap/__init__.py | 1 + src/sage/libs/gap/all_documented_functions.py | 1 + src/sage/libs/gap/assigned_names.py | 1 + src/sage/libs/gap/context_managers.py | 1 + src/sage/libs/gap/gap_functions.py | 1 + src/sage/libs/gap/gap_globals.py | 1 + src/sage/libs/gap/gap_includes.pxd | 1 + src/sage/libs/gap/operations.py | 1 + src/sage/libs/gap/saved_workspace.py | 1 + src/sage/libs/gap/test.py | 1 + src/sage/libs/gap/test_long.py | 1 + 11 files changed, 11 insertions(+) diff --git a/src/sage/libs/gap/__init__.py b/src/sage/libs/gap/__init__.py index faee3554865..7d14acf0f3c 100644 --- a/src/sage/libs/gap/__init__.py +++ b/src/sage/libs/gap/__init__.py @@ -1 +1,2 @@ +# sage_setup: distribution = sagemath-gap # libgap diff --git a/src/sage/libs/gap/all_documented_functions.py b/src/sage/libs/gap/all_documented_functions.py index 7554a08f91f..dcb34892697 100644 --- a/src/sage/libs/gap/all_documented_functions.py +++ b/src/sage/libs/gap/all_documented_functions.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """nodoctest All Documented GAP Functions diff --git a/src/sage/libs/gap/assigned_names.py b/src/sage/libs/gap/assigned_names.py index e8d1f1707cc..e136e95f5e0 100644 --- a/src/sage/libs/gap/assigned_names.py +++ b/src/sage/libs/gap/assigned_names.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """nodoctest List of assigned names in GAP diff --git a/src/sage/libs/gap/context_managers.py b/src/sage/libs/gap/context_managers.py index b42e9c02f4f..9252c3ee510 100644 --- a/src/sage/libs/gap/context_managers.py +++ b/src/sage/libs/gap/context_managers.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Context Managers for LibGAP diff --git a/src/sage/libs/gap/gap_functions.py b/src/sage/libs/gap/gap_functions.py index 8fb29399479..2d4f6482aec 100644 --- a/src/sage/libs/gap/gap_functions.py +++ b/src/sage/libs/gap/gap_functions.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """Common global functions defined by GAP.""" ############################################################################### diff --git a/src/sage/libs/gap/gap_globals.py b/src/sage/libs/gap/gap_globals.py index 4c3e6eb3aae..b2a413c06d9 100644 --- a/src/sage/libs/gap/gap_globals.py +++ b/src/sage/libs/gap/gap_globals.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """Common globals defined by GAP.""" ############################################################################### diff --git a/src/sage/libs/gap/gap_includes.pxd b/src/sage/libs/gap/gap_includes.pxd index 6d22e32540b..d7bf3c49faa 100644 --- a/src/sage/libs/gap/gap_includes.pxd +++ b/src/sage/libs/gap/gap_includes.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap # distutils: libraries = gap gmp m ############################################################################### # Copyright (C) 2009, William Stein diff --git a/src/sage/libs/gap/operations.py b/src/sage/libs/gap/operations.py index 434d1a01511..0cbfb8ffa5a 100644 --- a/src/sage/libs/gap/operations.py +++ b/src/sage/libs/gap/operations.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Operations for LibGAP Elements diff --git a/src/sage/libs/gap/saved_workspace.py b/src/sage/libs/gap/saved_workspace.py index ad5adec36d0..1ce0c32489d 100644 --- a/src/sage/libs/gap/saved_workspace.py +++ b/src/sage/libs/gap/saved_workspace.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ LibGAP Workspace Support diff --git a/src/sage/libs/gap/test.py b/src/sage/libs/gap/test.py index bee6f17ba84..2ab1f306582 100644 --- a/src/sage/libs/gap/test.py +++ b/src/sage/libs/gap/test.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Short tests for GAP """ diff --git a/src/sage/libs/gap/test_long.py b/src/sage/libs/gap/test_long.py index 262db5ad287..a365b2c4a4a 100644 --- a/src/sage/libs/gap/test_long.py +++ b/src/sage/libs/gap/test_long.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Long tests for GAP From a73b48939a304a91b6548338a3f0c9d17777109f Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 12:16:01 -0800 Subject: [PATCH 11/60] Add src/sage/**/all__sagemath_gap.py --- src/sage/all__sagemath_gap.py | 1 + src/sage/libs/all__sagemath_gap.py | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/sage/all__sagemath_gap.py create mode 100644 src/sage/libs/all__sagemath_gap.py diff --git a/src/sage/all__sagemath_gap.py b/src/sage/all__sagemath_gap.py new file mode 100644 index 00000000000..dd59a6da735 --- /dev/null +++ b/src/sage/all__sagemath_gap.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-gap diff --git a/src/sage/libs/all__sagemath_gap.py b/src/sage/libs/all__sagemath_gap.py new file mode 100644 index 00000000000..dd59a6da735 --- /dev/null +++ b/src/sage/libs/all__sagemath_gap.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-gap From 30112b269ea607f778561c05f024be665520cbfa Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 12:17:38 -0800 Subject: [PATCH 12/60] pkgs/sagemath-gap: WIP setup.py --- build/pkgs/sagemath_gap/spkg-install | 31 ++++++++++++++- pkgs/sagemath-gap/MANIFEST.in | 12 +++++- pkgs/sagemath-gap/setup.py | 57 ++++++++++++---------------- 3 files changed, 65 insertions(+), 35 deletions(-) mode change 120000 => 100755 build/pkgs/sagemath_gap/spkg-install diff --git a/build/pkgs/sagemath_gap/spkg-install b/build/pkgs/sagemath_gap/spkg-install deleted file mode 120000 index e60fac9ffa1..00000000000 --- a/build/pkgs/sagemath_gap/spkg-install +++ /dev/null @@ -1 +0,0 @@ -../sagemath_objects/spkg-install \ No newline at end of file diff --git a/build/pkgs/sagemath_gap/spkg-install b/build/pkgs/sagemath_gap/spkg-install new file mode 100755 index 00000000000..81355093128 --- /dev/null +++ b/build/pkgs/sagemath_gap/spkg-install @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +rm -Rf build +# First build the sdist, then build the wheel from the sdist. +# https://pypa-build.readthedocs.io/en/latest/#python--m-build +# (Important because sagemath-objects uses MANIFEST.in for filtering.) +# Do not install the wheel. +DIST_DIR="$(mktemp -d)" +python3 -m build --outdir "$DIST_DIR"/dist . || sdh_die "Failure building sdist and wheel" +ls -l "$DIST_DIR"/dist/*.tar.gz +wheel=$(cd "$DIST_DIR" && sdh_store_wheel . && echo $wheel) +ls -l "$wheel" + +if [ "$SAGE_CHECK" != no ]; then + tox -r -v -e sagepython-sagewheels-nopypi-norequirements --installpkg $wheel +fi diff --git a/pkgs/sagemath-gap/MANIFEST.in b/pkgs/sagemath-gap/MANIFEST.in index e53070fe86b..34f63c9b2d3 100644 --- a/pkgs/sagemath-gap/MANIFEST.in +++ b/pkgs/sagemath-gap/MANIFEST.in @@ -1,3 +1,13 @@ +include VERSION.txt + +prune sage +global-include all__sagemath_gap.py +graft sage/libs/gap +graft sage/data_structures # FIXME +include sage/combinat/enumeration_mod_permgroup.pyx +graft sage/groups/perm_gps +include sage/matrix/matrix_gap.pyx + global-exclude *.c global-exclude *.cpp @@ -9,5 +19,3 @@ global-exclude *~ prune .tox prune build prune dist - -include VERSION.txt diff --git a/pkgs/sagemath-gap/setup.py b/pkgs/sagemath-gap/setup.py index 5f157f38536..50872742e74 100644 --- a/pkgs/sagemath-gap/setup.py +++ b/pkgs/sagemath-gap/setup.py @@ -19,50 +19,43 @@ except ImportError: pass -# PEP 517 builds do not have . in sys.path import sys -sys.path.insert(0, os.path.dirname(__file__)) +from sage_setup.excepthook import excepthook +sys.excepthook = excepthook -if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): - sdist = True -else: - sdist = False +from sage_setup.setenv import setenv +setenv() -if sdist: - cmdclass = {} -else: - from sage_setup.excepthook import excepthook - sys.excepthook = excepthook +import sage.env +sage.env.default_required_modules = sage.env.default_optional_modules = () - from sage_setup.setenv import setenv - setenv() +from sage_setup.command.sage_build_cython import sage_build_cython +from sage_setup.command.sage_build_ext import sage_build_ext +import os.path - import sage.env - sage.env.default_required_modules = sage.env.default_optional_modules = () +sage_build_cython.built_distributions = ['sagemath-gap'] - from sage_setup.command.sage_build_cython import sage_build_cython - from sage_setup.command.sage_build_ext import sage_build_ext - sage_build_cython.built_distributions = ['sagemath-gap'] +cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) - cmdclass = dict(build_cython=sage_build_cython, - build_ext=sage_build_ext) +from sage_setup.find import find_python_sources, find_extra_files +python_packages, python_modules, cython_modules = find_python_sources( + '.', ['sage'], distributions=['sagemath-gap']) +extra_files = find_extra_files( + '.', ['sage'], '/doesnotexist', distributions=['sagemath-gap']) +package_data = {"": [f + for pkg, files in extra_files.items() + for f in files ]} -if sdist: - python_packages = [] - python_modules = [] - cython_modules = [] -else: - from sage_setup.find import find_python_sources - python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-gap']) - - log.warn('python_packages = {0}'.format(python_packages)) - log.warn('python_modules = {0}'.format(python_modules)) - log.warn('cython_modules = {0}'.format(cython_modules)) +log.warn('python_packages = {0}'.format(python_packages)) +log.warn('python_modules = {0}'.format(python_modules)) +log.warn('cython_modules = {0}'.format(cython_modules)) +log.warn('package_data = {0}'.format(package_data)) setup( cmdclass = cmdclass, packages = python_packages, py_modules = python_modules, ext_modules = cython_modules, + package_data = package_data, ) From cae814a92eaee042032b7d5170d3497b7941fc73 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 12:42:30 -0800 Subject: [PATCH 13/60] src/sage/groups/perm_gps/partn_ref/data_structures.pyx: Remove cimport from sage.libs.flint (only used by doctesting helper functions) --- src/sage/groups/perm_gps/partn_ref/data_structures.pyx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sage/groups/perm_gps/partn_ref/data_structures.pyx b/src/sage/groups/perm_gps/partn_ref/data_structures.pyx index 2f67e4bcf3a..8482a9e88c7 100644 --- a/src/sage/groups/perm_gps/partn_ref/data_structures.pyx +++ b/src/sage/groups/perm_gps/partn_ref/data_structures.pyx @@ -34,7 +34,6 @@ from cysignals.memory cimport sig_malloc, sig_calloc, sig_realloc, sig_free from sage.data_structures.bitset_base cimport * from sage.rings.integer cimport Integer -from sage.libs.flint.ulong_extras cimport n_is_prime # OrbitPartition (OP) @@ -1145,6 +1144,8 @@ cdef bint SC_is_giant(int n, int num_perms, int *perms, float p, bitset_t suppor Running time is roughly O(-ln(1-p)*n*ln(m)) where m <= n is the size of the support of the group. """ + from sage.libs.flint.ulong_extras import n_is_prime + cdef int i, j, num_steps, support_root cdef size_t m = 1 cdef unsigned long q From 5fda124e7131590d29d9f7b1c899ba1e5e9c485f Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 13:08:28 -0800 Subject: [PATCH 14/60] Add src/sage/**/all__sagemath_gap.py --- src/sage/groups/all__sagemath_gap.py | 1 + src/sage/matrix/all__sagemath_gap.py | 1 + src/sage/sets/all__sagemath_gap.py | 1 + 3 files changed, 3 insertions(+) create mode 100644 src/sage/groups/all__sagemath_gap.py create mode 100644 src/sage/matrix/all__sagemath_gap.py create mode 100644 src/sage/sets/all__sagemath_gap.py diff --git a/src/sage/groups/all__sagemath_gap.py b/src/sage/groups/all__sagemath_gap.py new file mode 100644 index 00000000000..dd59a6da735 --- /dev/null +++ b/src/sage/groups/all__sagemath_gap.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-gap diff --git a/src/sage/matrix/all__sagemath_gap.py b/src/sage/matrix/all__sagemath_gap.py new file mode 100644 index 00000000000..dd59a6da735 --- /dev/null +++ b/src/sage/matrix/all__sagemath_gap.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-gap diff --git a/src/sage/sets/all__sagemath_gap.py b/src/sage/sets/all__sagemath_gap.py new file mode 100644 index 00000000000..dd59a6da735 --- /dev/null +++ b/src/sage/sets/all__sagemath_gap.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-gap From a2feea0ad14e71b58e88a8bc2cec8e283b25e2ea Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 13:08:54 -0800 Subject: [PATCH 15/60] Add src/sage/**/all__sagemath_gap.py --- pkgs/sagemath-gap/MANIFEST.in | 22 ++++++++++++++----- src/sage/coding/all__sagemath_gap.py | 1 + src/sage/groups/perm_gps/__init__.py | 1 + src/sage/groups/perm_gps/all.py | 1 + src/sage/groups/perm_gps/constructor.py | 1 + src/sage/groups/perm_gps/cubegroup.py | 1 + src/sage/groups/perm_gps/permgroup.py | 1 + .../groups/perm_gps/permgroup_morphism.py | 1 + src/sage/groups/perm_gps/permgroup_named.py | 1 + .../perm_gps/permutation_groups_catalog.py | 1 + .../groups/perm_gps/symgp_conjugacy_class.py | 1 + 11 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 src/sage/coding/all__sagemath_gap.py diff --git a/pkgs/sagemath-gap/MANIFEST.in b/pkgs/sagemath-gap/MANIFEST.in index 34f63c9b2d3..a1166211cc5 100644 --- a/pkgs/sagemath-gap/MANIFEST.in +++ b/pkgs/sagemath-gap/MANIFEST.in @@ -1,12 +1,22 @@ include VERSION.txt prune sage -global-include all__sagemath_gap.py -graft sage/libs/gap -graft sage/data_structures # FIXME -include sage/combinat/enumeration_mod_permgroup.pyx -graft sage/groups/perm_gps -include sage/matrix/matrix_gap.pyx +global-include all__sagemath_gap.py + +graft sage/coding/codecan +include sage/combinat/enumeration_mod_permgroup.p* +include sage/combinat/root_system/reflection_group*.p* +graft sage/data_structures # FIXME +recursive-include sage/graphs *.pxd # FIXME +include sage/graphs/spanning_tree.p* +graft sage/groups/perm_gps +include sage/groups/libgap_wrapper.p* +include sage/groups/matrix_gps/group_element.p* +graft sage/libs/gap +recursive-include sage/matrix *.pxd # FIXME +include sage/matrix/matrix_gap.p* +recursive-include sage/rings *.pxd # FIXME +include sage/sets/disjoint_set.p* global-exclude *.c global-exclude *.cpp diff --git a/src/sage/coding/all__sagemath_gap.py b/src/sage/coding/all__sagemath_gap.py new file mode 100644 index 00000000000..dd59a6da735 --- /dev/null +++ b/src/sage/coding/all__sagemath_gap.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-gap diff --git a/src/sage/groups/perm_gps/__init__.py b/src/sage/groups/perm_gps/__init__.py index e69de29bb2d..dd59a6da735 100644 --- a/src/sage/groups/perm_gps/__init__.py +++ b/src/sage/groups/perm_gps/__init__.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-gap diff --git a/src/sage/groups/perm_gps/all.py b/src/sage/groups/perm_gps/all.py index 83afad7c691..96214c09a84 100644 --- a/src/sage/groups/perm_gps/all.py +++ b/src/sage/groups/perm_gps/all.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap from .permgroup_named import (SymmetricGroup, AlternatingGroup, DihedralGroup, SplitMetacyclicGroup, SemidihedralGroup, CyclicPermutationGroup, diff --git a/src/sage/groups/perm_gps/constructor.py b/src/sage/groups/perm_gps/constructor.py index 73dc5f94c41..eeebc7b68b7 100644 --- a/src/sage/groups/perm_gps/constructor.py +++ b/src/sage/groups/perm_gps/constructor.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap """ Constructor for permutations diff --git a/src/sage/groups/perm_gps/cubegroup.py b/src/sage/groups/perm_gps/cubegroup.py index 921c6201c43..b147afbc774 100644 --- a/src/sage/groups/perm_gps/cubegroup.py +++ b/src/sage/groups/perm_gps/cubegroup.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Rubik's cube group functions diff --git a/src/sage/groups/perm_gps/permgroup.py b/src/sage/groups/perm_gps/permgroup.py index 7723ec25260..fb14d984b6d 100644 --- a/src/sage/groups/perm_gps/permgroup.py +++ b/src/sage/groups/perm_gps/permgroup.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap # -*- coding: utf-8 -*- r""" Permutation groups diff --git a/src/sage/groups/perm_gps/permgroup_morphism.py b/src/sage/groups/perm_gps/permgroup_morphism.py index 917ddd01865..a2e29c757e9 100644 --- a/src/sage/groups/perm_gps/permgroup_morphism.py +++ b/src/sage/groups/perm_gps/permgroup_morphism.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Permutation group homomorphisms diff --git a/src/sage/groups/perm_gps/permgroup_named.py b/src/sage/groups/perm_gps/permgroup_named.py index a3be9f974fe..164e94db638 100644 --- a/src/sage/groups/perm_gps/permgroup_named.py +++ b/src/sage/groups/perm_gps/permgroup_named.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" "Named" Permutation groups (such as the symmetric group, S_n) diff --git a/src/sage/groups/perm_gps/permutation_groups_catalog.py b/src/sage/groups/perm_gps/permutation_groups_catalog.py index 52f99920307..e91742a3e11 100644 --- a/src/sage/groups/perm_gps/permutation_groups_catalog.py +++ b/src/sage/groups/perm_gps/permutation_groups_catalog.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Catalog of permutation groups diff --git a/src/sage/groups/perm_gps/symgp_conjugacy_class.py b/src/sage/groups/perm_gps/symgp_conjugacy_class.py index d6112df67af..3092aaa4133 100644 --- a/src/sage/groups/perm_gps/symgp_conjugacy_class.py +++ b/src/sage/groups/perm_gps/symgp_conjugacy_class.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Conjugacy Classes Of The Symmetric Group From 665d01c429f42ef07b929d1fb213aa1f5af88452 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 13:14:10 -0800 Subject: [PATCH 16/60] pkgs/sagemath-gap/tox.ini: New --- pkgs/sagemath-gap/tox.ini | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 pkgs/sagemath-gap/tox.ini diff --git a/pkgs/sagemath-gap/tox.ini b/pkgs/sagemath-gap/tox.ini new file mode 100644 index 00000000000..492c30f3252 --- /dev/null +++ b/pkgs/sagemath-gap/tox.ini @@ -0,0 +1,64 @@ +# To build and test in the tox environment: +# +# ./sage -sh -c '(cd pkgs/sagemath-gap && tox -v -v -v -e sagepython)' +# +# To test interactively: +# +# pkgs/sagemath-gap/.tox/sagepython/bin/python +# +[tox] +envlist = + sagepython-norequirements + +[testenv] +deps = + !norequirements: -rrequirements.txt + # tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576 + sagemath-repl + +extras = test + +passenv = + # Variables set by .homebrew-build-env + CPATH + LIBRARY_PATH + PKG_CONFIG_PATH + # Parallel build + SAGE_NUM_THREADS + SAGE_NUM_THREADS_PARALLEL + # SAGE_VENV only for referring to the basepython or finding the wheels + sagepython, sagewheels: SAGE_VENV + # Location of the wheels + sagewheels: SAGE_SPKG_WHEELS + +setenv = + # Sage scripts such as sage-runtests like to use $HOME/.sage + HOME={envdir} + # We supply pip options by environment variables so that they + # apply both to the installation of the dependencies and of the package + sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels} + nopypi: PIP_NO_INDEX=true + +whitelist_externals = + bash + +commands = + # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package. + # Importing sage.libs.gap.libgap does not work yet because of the runtime dep on 'sage.rings.polynomial' + # {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.libs.gap.libgap' + + +[testenv:sagepython] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 From 963fa7704055f99af12c80654f904ee8ffd21c22 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 13:14:41 -0800 Subject: [PATCH 17/60] pkgs/sagemath-gap/MANIFEST.in: Add deps for sage/coding/codecan --- pkgs/sagemath-gap/MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/sagemath-gap/MANIFEST.in b/pkgs/sagemath-gap/MANIFEST.in index a1166211cc5..056b6a1fd7a 100644 --- a/pkgs/sagemath-gap/MANIFEST.in +++ b/pkgs/sagemath-gap/MANIFEST.in @@ -12,9 +12,11 @@ include sage/graphs/spanning_tree.p* graft sage/groups/perm_gps include sage/groups/libgap_wrapper.p* include sage/groups/matrix_gps/group_element.p* +recursive-include sage/groups/semimonomial_transformations *.pxd # FIXME graft sage/libs/gap recursive-include sage/matrix *.pxd # FIXME include sage/matrix/matrix_gap.p* +recursive-include sage/modules *.pxd # FIXME recursive-include sage/rings *.pxd # FIXME include sage/sets/disjoint_set.p* From 96b863ce7d3ce45460e81afcac5d7448c7ee720b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 13:26:53 -0800 Subject: [PATCH 18/60] pkgs/sagemath-gap: Update description --- pkgs/sagemath-gap/README.rst | 12 +++++------- pkgs/sagemath-gap/setup.cfg.m4 | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/sagemath-gap/README.rst b/pkgs/sagemath-gap/README.rst index 59cc4ca5e18..16a578653cc 100644 --- a/pkgs/sagemath-gap/README.rst +++ b/pkgs/sagemath-gap/README.rst @@ -1,6 +1,6 @@ -============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with gap -============================================================================== +============================================================================= + Sage: Open Source Mathematics Software: Computational Group Theory with GAP +============================================================================= About SageMath -------------- @@ -26,7 +26,5 @@ About this pip-installable source distribution ---------------------------------------------- This pip-installable source distribution ``sagemath-gap`` is a small -optional distribution for use with ``sagemath-standard``. - -It provides a Cython interface to the ``gap`` library for the purpose -of computing graph (iso/auto)morphisms. +distribution that provides modules that depend on the GAP system, see +https://www.gap-system.org diff --git a/pkgs/sagemath-gap/setup.cfg.m4 b/pkgs/sagemath-gap/setup.cfg.m4 index a16dda370ce..966019e0b2e 100644 --- a/pkgs/sagemath-gap/setup.cfg.m4 +++ b/pkgs/sagemath-gap/setup.cfg.m4 @@ -2,7 +2,7 @@ [metadata] name = sagemath-gap version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with gap +description = Sage: Open Source Mathematics Software: Computational Group Theory with GAP long_description = file: README.rst long_description_content_type = text/x-rst license = GNU General Public License (GPL) v2 or later From b73a92956789a2548063ce867556b2d81d49f2dd Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 13:29:30 -0800 Subject: [PATCH 19/60] build/pkgs/sagemath_gap/dependencies: Update --- build/pkgs/sagemath_gap/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sagemath_gap/dependencies b/build/pkgs/sagemath_gap/dependencies index 1f3d17229e3..280291af7cd 100644 --- a/build/pkgs/sagemath_gap/dependencies +++ b/build/pkgs/sagemath_gap/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib gap | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sagemath_environment sagemath_categories gap | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig From fc9113500aa80e5ae09a8e120c20bbff66b3599b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 20:39:23 -0800 Subject: [PATCH 20/60] pkgs/sagemath-homfly: Fix up --- build/pkgs/sagemath_homfly/spkg-install | 2 +- pkgs/sagemath-homfly/MANIFEST.in | 6 +++ pkgs/sagemath-homfly/README.rst | 9 ++-- pkgs/sagemath-homfly/pyproject.toml.m4 | 3 +- pkgs/sagemath-homfly/setup.cfg.m4 | 4 +- pkgs/sagemath-homfly/tox.ini | 63 +++++++++++++++++++++++++ src/sage/all__sagemath_homfly.py | 1 + src/sage/libs/all__sagemath_homfly.py | 1 + 8 files changed, 79 insertions(+), 10 deletions(-) create mode 100644 pkgs/sagemath-homfly/tox.ini create mode 100644 src/sage/all__sagemath_homfly.py create mode 100644 src/sage/libs/all__sagemath_homfly.py diff --git a/build/pkgs/sagemath_homfly/spkg-install b/build/pkgs/sagemath_homfly/spkg-install index e60fac9ffa1..f916d59c4da 120000 --- a/build/pkgs/sagemath_homfly/spkg-install +++ b/build/pkgs/sagemath_homfly/spkg-install @@ -1 +1 @@ -../sagemath_objects/spkg-install \ No newline at end of file +../sagemath_gap/spkg-install \ No newline at end of file diff --git a/pkgs/sagemath-homfly/MANIFEST.in b/pkgs/sagemath-homfly/MANIFEST.in index 8534471f1f2..48cb0804082 100644 --- a/pkgs/sagemath-homfly/MANIFEST.in +++ b/pkgs/sagemath-homfly/MANIFEST.in @@ -1,3 +1,9 @@ +include VERSION.txt + +prune sage +global-include all__sagemath_homfly.py +include sage/libs/homfly.p* + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-homfly/README.rst b/pkgs/sagemath-homfly/README.rst index 9d49ac7bfbb..51e9dd63594 100644 --- a/pkgs/sagemath-homfly/README.rst +++ b/pkgs/sagemath-homfly/README.rst @@ -1,6 +1,6 @@ -============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with homfly -============================================================================== +========================================================================================== + Sage: Open Source Mathematics Software: Homfly polynomials of knots/links with libhomfly +========================================================================================== About SageMath -------------- @@ -28,5 +28,4 @@ About this pip-installable source distribution This pip-installable source distribution ``sagemath-homfly`` is a small optional distribution for use with ``sagemath-standard``. -It provides a Cython interface to the ``homfly`` library for the purpose -of computing graph (iso/auto)morphisms. +It provides a Cython interface to the ``libhomfly`` library. diff --git a/pkgs/sagemath-homfly/pyproject.toml.m4 b/pkgs/sagemath-homfly/pyproject.toml.m4 index aa4c23992be..09b583ac3ac 100644 --- a/pkgs/sagemath-homfly/pyproject.toml.m4 +++ b/pkgs/sagemath-homfly/pyproject.toml.m4 @@ -6,9 +6,8 @@ requires = [ wheel \ sage_setup \ sagemath_environment \ - sagemath_standard \ + sagemath_objects \ cython \ - gmpy2 \ cysignals \ ')] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-homfly/setup.cfg.m4 b/pkgs/sagemath-homfly/setup.cfg.m4 index 460b9c62e34..ddca453ed11 100644 --- a/pkgs/sagemath-homfly/setup.cfg.m4 +++ b/pkgs/sagemath-homfly/setup.cfg.m4 @@ -2,7 +2,7 @@ [metadata] name = sagemath-homfly version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with homfly +description = Sage: Open Source Mathematics Software: Homfly polynomials of knots/links with libhomfly long_description = file: README.rst long_description_content_type = text/x-rst license = GNU General Public License (GPL) v2 or later @@ -29,5 +29,5 @@ classifiers = python_requires = >=3.8, <3.12 install_requires = esyscmd(`sage-get-system-packages install-requires \ - sagelib \ + cysignals \ | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-homfly/tox.ini b/pkgs/sagemath-homfly/tox.ini new file mode 100644 index 00000000000..fea5497b2a5 --- /dev/null +++ b/pkgs/sagemath-homfly/tox.ini @@ -0,0 +1,63 @@ +# To build and test in the tox environment: +# +# ./sage -sh -c '(cd pkgs/sagemath-homfly && tox -v -v -v -e sagepython)' +# +# To test interactively: +# +# pkgs/sagemath-homfly/.tox/sagepython/bin/python +# +[tox] +envlist = + sagepython-norequirements + +[testenv] +deps = + !norequirements: -rrequirements.txt + # tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576 + sagemath-repl + +extras = test + +passenv = + # Variables set by .homebrew-build-env + CPATH + LIBRARY_PATH + PKG_CONFIG_PATH + # Parallel build + SAGE_NUM_THREADS + SAGE_NUM_THREADS_PARALLEL + # SAGE_VENV only for referring to the basepython or finding the wheels + sagepython, sagewheels: SAGE_VENV + # Location of the wheels + sagewheels: SAGE_SPKG_WHEELS + +setenv = + # Sage scripts such as sage-runtests like to use $HOME/.sage + HOME={envdir} + # We supply pip options by environment variables so that they + # apply both to the installation of the dependencies and of the package + sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels} + nopypi: PIP_NO_INDEX=true + +whitelist_externals = + bash + +commands = + # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package. + {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.libs.homfly' + + +[testenv:sagepython] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 diff --git a/src/sage/all__sagemath_homfly.py b/src/sage/all__sagemath_homfly.py new file mode 100644 index 00000000000..8a8d066959a --- /dev/null +++ b/src/sage/all__sagemath_homfly.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-homfly diff --git a/src/sage/libs/all__sagemath_homfly.py b/src/sage/libs/all__sagemath_homfly.py new file mode 100644 index 00000000000..8a8d066959a --- /dev/null +++ b/src/sage/libs/all__sagemath_homfly.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-homfly From 0869a7f471b569af4f73506d4ab27d5c09654e75 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 20:40:03 -0800 Subject: [PATCH 21/60] pkgs/sagemath-environment: Add sage.misc.package_dir properly --- pkgs/sagemath-environment/setup.cfg.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/sagemath-environment/setup.cfg.m4 b/pkgs/sagemath-environment/setup.cfg.m4 index c67043cb715..c7abf5676ae 100644 --- a/pkgs/sagemath-environment/setup.cfg.m4 +++ b/pkgs/sagemath-environment/setup.cfg.m4 @@ -36,6 +36,7 @@ py_modules = sage.version sage.misc.all__sagemath_environment sage.misc.package + sage.misc.package_dir sage.misc.temporary_file sage.misc.viewer From 31b08a1f867ea2f949fa6e56778d0958d8d0d53b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 20:52:10 -0800 Subject: [PATCH 22/60] .gitignore: Ignore generated files --- .gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitignore b/.gitignore index d598d2e633f..c169317fd43 100644 --- a/.gitignore +++ b/.gitignore @@ -178,14 +178,26 @@ build/bin/sage-build-env-config /pkgs/sagemath-categories/setup.cfg /pkgs/sagemath-environment/setup.cfg /pkgs/sagemath-repl/setup.cfg +/pkgs/sagemath-flint-arb/setup.cfg +/pkgs/sagemath-gap/setup.cfg +/pkgs/sagemath-giac/setup.cfg +/pkgs/sagemath-homfly/setup.cfg /pkgs/sagemath-objects/pyproject.toml /pkgs/sagemath-categories/pyproject.toml /pkgs/sagemath-environment/pyproject.toml /pkgs/sagemath-repl/pyproject.toml +/pkgs/sagemath-flint-arb/pyproject.toml +/pkgs/sagemath-gap/pyproject.toml +/pkgs/sagemath-giac/pyproject.toml +/pkgs/sagemath-homfly/pyproject.toml /pkgs/sagemath-objects/requirements.txt /pkgs/sagemath-categories/requirements.txt /pkgs/sagemath-environment/requirements.txt /pkgs/sagemath-repl/requirements.txt +/pkgs/sagemath-flint-arb/requirements.txt +/pkgs/sagemath-gap/requirements.txt +/pkgs/sagemath-giac/requirements.txt +/pkgs/sagemath-homfly/requirements.txt /pkgs/sagemath-categories/MANIFEST.in # same for old locations - before Trac #31577 From 961fb3f744e09868a59ca87d7ae5b590d886e338 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 21:48:57 -0800 Subject: [PATCH 23/60] pkgs/sagemath-flint-arb: New --- build/pkgs/sagemath_flint_arb/SPKG.rst | 1 + build/pkgs/sagemath_flint_arb/bootstrap | 1 + build/pkgs/sagemath_flint_arb/dependencies | 1 + .../pkgs/sagemath_flint_arb/distros/conda.txt | 1 + .../sagemath_flint_arb/install-requires.txt | 2 + .../sagemath_flint_arb/package-version.txt | 1 + build/pkgs/sagemath_flint_arb/spkg-src | 21 ++++++ build/pkgs/sagemath_flint_arb/src | 1 + build/pkgs/sagemath_flint_arb/type | 1 + pkgs/sagemath-flint-arb/MANIFEST.in | 33 +++++++++ pkgs/sagemath-flint-arb/README.rst | 32 +++++++++ pkgs/sagemath-flint-arb/VERSION.txt | 1 + pkgs/sagemath-flint-arb/pyproject.toml.m4 | 15 ++++ pkgs/sagemath-flint-arb/requirements.txt.m4 | 2 + pkgs/sagemath-flint-arb/sage | 1 + pkgs/sagemath-flint-arb/setup.cfg.m4 | 33 +++++++++ pkgs/sagemath-flint-arb/setup.py | 68 +++++++++++++++++++ src/sage/all__sagemath_flint_arb.py | 1 + src/sage/libs/all__sagemath_flint_arb.py | 1 + src/sage/matrix/all__sagemath_flint_arb.py | 1 + src/sage/rings/all__sagemath_flint_arb.py | 1 + 21 files changed, 219 insertions(+) create mode 120000 build/pkgs/sagemath_flint_arb/SPKG.rst create mode 120000 build/pkgs/sagemath_flint_arb/bootstrap create mode 100644 build/pkgs/sagemath_flint_arb/dependencies create mode 100644 build/pkgs/sagemath_flint_arb/distros/conda.txt create mode 100644 build/pkgs/sagemath_flint_arb/install-requires.txt create mode 120000 build/pkgs/sagemath_flint_arb/package-version.txt create mode 100755 build/pkgs/sagemath_flint_arb/spkg-src create mode 120000 build/pkgs/sagemath_flint_arb/src create mode 100644 build/pkgs/sagemath_flint_arb/type create mode 100644 pkgs/sagemath-flint-arb/MANIFEST.in create mode 100644 pkgs/sagemath-flint-arb/README.rst create mode 100644 pkgs/sagemath-flint-arb/VERSION.txt create mode 100644 pkgs/sagemath-flint-arb/pyproject.toml.m4 create mode 100644 pkgs/sagemath-flint-arb/requirements.txt.m4 create mode 120000 pkgs/sagemath-flint-arb/sage create mode 100644 pkgs/sagemath-flint-arb/setup.cfg.m4 create mode 100644 pkgs/sagemath-flint-arb/setup.py create mode 100644 src/sage/all__sagemath_flint_arb.py create mode 100644 src/sage/libs/all__sagemath_flint_arb.py create mode 100644 src/sage/matrix/all__sagemath_flint_arb.py create mode 100644 src/sage/rings/all__sagemath_flint_arb.py diff --git a/build/pkgs/sagemath_flint_arb/SPKG.rst b/build/pkgs/sagemath_flint_arb/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_flint_arb/bootstrap b/build/pkgs/sagemath_flint_arb/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_flint_arb/dependencies b/build/pkgs/sagemath_flint_arb/dependencies new file mode 100644 index 00000000000..57aa8f0ee97 --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib flint-arb | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_flint_arb/distros/conda.txt b/build/pkgs/sagemath_flint_arb/distros/conda.txt new file mode 100644 index 00000000000..5b2cb38d886 --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/distros/conda.txt @@ -0,0 +1 @@ +sagemath-flint-arb diff --git a/build/pkgs/sagemath_flint_arb/install-requires.txt b/build/pkgs/sagemath_flint_arb/install-requires.txt new file mode 100644 index 00000000000..9e09cf11e04 --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-flint-arb diff --git a/build/pkgs/sagemath_flint_arb/package-version.txt b/build/pkgs/sagemath_flint_arb/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_flint_arb/spkg-src b/build/pkgs/sagemath_flint_arb/spkg-src new file mode 100755 index 00000000000..b5d25eef815 --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/spkg-src @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# Script to prepare an sdist tarball for sagemath-flint-arb +# This script is not used during build. +# +# HOW TO MAKE THE TARBALL: +# ./sage --sh build/pkgs/sagemath_flint-arb/spkg-src + +if [ -z "$SAGE_ROOT" ] ; then + echo >&2 "Error - SAGE_ROOT undefined ... exiting" + echo >&2 "Maybe run 'sage -sh'?" + exit 1 +fi + +# Exit on failure +set -e + +cd build/pkgs/sagemath_flint-arb + +cd src +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_flint_arb/src b/build/pkgs/sagemath_flint_arb/src new file mode 120000 index 00000000000..00d51baaba1 --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-flint-arb \ No newline at end of file diff --git a/build/pkgs/sagemath_flint_arb/type b/build/pkgs/sagemath_flint_arb/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_flint_arb/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-flint-arb/MANIFEST.in b/pkgs/sagemath-flint-arb/MANIFEST.in new file mode 100644 index 00000000000..42349764381 --- /dev/null +++ b/pkgs/sagemath-flint-arb/MANIFEST.in @@ -0,0 +1,33 @@ +include VERSION.txt + +prune sage +global-include all__sagemath_flint_arb.py + +graft sage/libs/arb +graft sage/libs/flint +recursive-include sage/libs/gsl *.pxd # FIXME +recursive-include sage/libs/mpfr *.pxd # FIXME +recursive-include sage/libs/mpfi *.pxd # FIXME +recursive-include sage/matrix *.pxd # FIXME +include sage/matrix/matrix_complex_ball_dense.p* +include sage/misc/binary_tree.p* # FIXME +recursive-include sage/rings *.pxd # FIXME +include sage/rings/complex_arb.p* +include sage/rings/integer_fake.h # FIXME +include sage/rings/number_field/number_field_element_quadratic.p* +include sage/rings/padics/qadic_flint_FP.p* +include sage/rings/polynomial/evaluation_flint.p* +include sage/rings/polynomial/polynomial_complex_arb.p* +include sage/rings/real_arb.p* + +global-exclude *.c +global-exclude *.cpp + +global-exclude __pycache__ +global-exclude *.py[co] +global-exclude *.bak +global-exclude *.so +global-exclude *~ +prune .tox +prune build +prune dist diff --git a/pkgs/sagemath-flint-arb/README.rst b/pkgs/sagemath-flint-arb/README.rst new file mode 100644 index 00000000000..1eccfc787af --- /dev/null +++ b/pkgs/sagemath-flint-arb/README.rst @@ -0,0 +1,32 @@ +============================================================================== + Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with flint-arb +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +About this pip-installable source distribution +---------------------------------------------- + +This pip-installable source distribution ``sagemath-flint-arb`` is a small +optional distribution for use with ``sagemath-standard``. + +It provides a Cython interface to the ``flint-arb`` library for the purpose +of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-flint-arb/VERSION.txt b/pkgs/sagemath-flint-arb/VERSION.txt new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-flint-arb/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-flint-arb/pyproject.toml.m4 b/pkgs/sagemath-flint-arb/pyproject.toml.m4 new file mode 100644 index 00000000000..87a5ef21aa9 --- /dev/null +++ b/pkgs/sagemath-flint-arb/pyproject.toml.m4 @@ -0,0 +1,15 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_categories \ + cython \ + gmpy2 \ + cypari \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-flint-arb/requirements.txt.m4 b/pkgs/sagemath-flint-arb/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-flint-arb/requirements.txt.m4 @@ -0,0 +1,2 @@ +Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') +sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-flint-arb/sage b/pkgs/sagemath-flint-arb/sage new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-flint-arb/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-flint-arb/setup.cfg.m4 b/pkgs/sagemath-flint-arb/setup.cfg.m4 new file mode 100644 index 00000000000..ca7de427aca --- /dev/null +++ b/pkgs/sagemath-flint-arb/setup.cfg.m4 @@ -0,0 +1,33 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-flint-arb +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with flint-arb +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagemath_categories \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-flint-arb/setup.py b/pkgs/sagemath-flint-arb/setup.py new file mode 100644 index 00000000000..263ae46a44a --- /dev/null +++ b/pkgs/sagemath-flint-arb/setup.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python + +from distutils import log +from setuptools import setup + +# Work around a Cython problem in Python 3.8.x on macOS +# https://github.com/cython/cython/issues/3262 +import os +if os.uname().sysname == 'Darwin': + import multiprocessing + multiprocessing.set_start_method('fork', force=True) + +# If build isolation is not in use and setuptools_scm is installed, +# then its file_finders entry point is invoked, which we don't need. +# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 +try: + import setuptools_scm.integration + setuptools_scm.integration.find_files = lambda _: [] +except ImportError: + pass + +# PEP 517 builds do not have . in sys.path +import sys +sys.path.insert(0, os.path.dirname(__file__)) + +if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): + sdist = True +else: + sdist = False + +if sdist: + cmdclass = {} +else: + from sage_setup.excepthook import excepthook + sys.excepthook = excepthook + + from sage_setup.setenv import setenv + setenv() + + import sage.env + sage.env.default_required_modules = sage.env.default_optional_modules = ('gsl',) + + from sage_setup.command.sage_build_cython import sage_build_cython + from sage_setup.command.sage_build_ext import sage_build_ext + sage_build_cython.built_distributions = ['sagemath-flint-arb'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + from sage_setup.find import find_python_sources + python_packages, python_modules, cython_modules = find_python_sources( + '.', ['sage'], distributions=['sagemath-flint-arb']) + + log.warn('python_packages = {0}'.format(python_packages)) + log.warn('python_modules = {0}'.format(python_modules)) + log.warn('cython_modules = {0}'.format(cython_modules)) + +setup( + cmdclass = cmdclass, + packages = python_packages, + py_modules = python_modules, + ext_modules = cython_modules, +) diff --git a/src/sage/all__sagemath_flint_arb.py b/src/sage/all__sagemath_flint_arb.py new file mode 100644 index 00000000000..07b83b001f9 --- /dev/null +++ b/src/sage/all__sagemath_flint_arb.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-flint-arb diff --git a/src/sage/libs/all__sagemath_flint_arb.py b/src/sage/libs/all__sagemath_flint_arb.py new file mode 100644 index 00000000000..07b83b001f9 --- /dev/null +++ b/src/sage/libs/all__sagemath_flint_arb.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-flint-arb diff --git a/src/sage/matrix/all__sagemath_flint_arb.py b/src/sage/matrix/all__sagemath_flint_arb.py new file mode 100644 index 00000000000..07b83b001f9 --- /dev/null +++ b/src/sage/matrix/all__sagemath_flint_arb.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-flint-arb diff --git a/src/sage/rings/all__sagemath_flint_arb.py b/src/sage/rings/all__sagemath_flint_arb.py new file mode 100644 index 00000000000..07b83b001f9 --- /dev/null +++ b/src/sage/rings/all__sagemath_flint_arb.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-flint-arb From 45cce7b0b51a738205d5441a1fa6a64ad095d15c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 22:48:14 -0800 Subject: [PATCH 24/60] pkgs/sagemath-giac: New --- build/pkgs/sagemath_giac/SPKG.rst | 1 + build/pkgs/sagemath_giac/bootstrap | 1 + build/pkgs/sagemath_giac/dependencies | 1 + build/pkgs/sagemath_giac/distros/conda.txt | 1 + build/pkgs/sagemath_giac/install-requires.txt | 2 + build/pkgs/sagemath_giac/package-version.txt | 1 + build/pkgs/sagemath_giac/spkg-src | 21 ++++++ build/pkgs/sagemath_giac/src | 1 + build/pkgs/sagemath_giac/type | 1 + pkgs/sagemath-giac/MANIFEST.in | 19 ++++++ pkgs/sagemath-giac/README.rst | 32 +++++++++ pkgs/sagemath-giac/VERSION.txt | 1 + pkgs/sagemath-giac/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-giac/requirements.txt.m4 | 2 + pkgs/sagemath-giac/sage | 1 + pkgs/sagemath-giac/setup.cfg.m4 | 33 +++++++++ pkgs/sagemath-giac/setup.py | 68 +++++++++++++++++++ src/sage/all__sagemath_giac.py | 1 + src/sage/libs/all__sagemath_giac.py | 1 + 19 files changed, 202 insertions(+) create mode 120000 build/pkgs/sagemath_giac/SPKG.rst create mode 120000 build/pkgs/sagemath_giac/bootstrap create mode 100644 build/pkgs/sagemath_giac/dependencies create mode 100644 build/pkgs/sagemath_giac/distros/conda.txt create mode 100644 build/pkgs/sagemath_giac/install-requires.txt create mode 120000 build/pkgs/sagemath_giac/package-version.txt create mode 100755 build/pkgs/sagemath_giac/spkg-src create mode 120000 build/pkgs/sagemath_giac/src create mode 100644 build/pkgs/sagemath_giac/type create mode 100644 pkgs/sagemath-giac/MANIFEST.in create mode 100644 pkgs/sagemath-giac/README.rst create mode 100644 pkgs/sagemath-giac/VERSION.txt create mode 100644 pkgs/sagemath-giac/pyproject.toml.m4 create mode 100644 pkgs/sagemath-giac/requirements.txt.m4 create mode 120000 pkgs/sagemath-giac/sage create mode 100644 pkgs/sagemath-giac/setup.cfg.m4 create mode 100644 pkgs/sagemath-giac/setup.py create mode 100644 src/sage/all__sagemath_giac.py create mode 100644 src/sage/libs/all__sagemath_giac.py diff --git a/build/pkgs/sagemath_giac/SPKG.rst b/build/pkgs/sagemath_giac/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_giac/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_giac/bootstrap b/build/pkgs/sagemath_giac/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_giac/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_giac/dependencies b/build/pkgs/sagemath_giac/dependencies new file mode 100644 index 00000000000..1b7836c539a --- /dev/null +++ b/build/pkgs/sagemath_giac/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib giac | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_giac/distros/conda.txt b/build/pkgs/sagemath_giac/distros/conda.txt new file mode 100644 index 00000000000..2daf2fbb6b2 --- /dev/null +++ b/build/pkgs/sagemath_giac/distros/conda.txt @@ -0,0 +1 @@ +sagemath-giac diff --git a/build/pkgs/sagemath_giac/install-requires.txt b/build/pkgs/sagemath_giac/install-requires.txt new file mode 100644 index 00000000000..34fe03aff44 --- /dev/null +++ b/build/pkgs/sagemath_giac/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-giac diff --git a/build/pkgs/sagemath_giac/package-version.txt b/build/pkgs/sagemath_giac/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_giac/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_giac/spkg-src b/build/pkgs/sagemath_giac/spkg-src new file mode 100755 index 00000000000..97a309a7835 --- /dev/null +++ b/build/pkgs/sagemath_giac/spkg-src @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# Script to prepare an sdist tarball for sagemath-giac +# This script is not used during build. +# +# HOW TO MAKE THE TARBALL: +# ./sage --sh build/pkgs/sagemath_giac/spkg-src + +if [ -z "$SAGE_ROOT" ] ; then + echo >&2 "Error - SAGE_ROOT undefined ... exiting" + echo >&2 "Maybe run 'sage -sh'?" + exit 1 +fi + +# Exit on failure +set -e + +cd build/pkgs/sagemath_giac + +cd src +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_giac/src b/build/pkgs/sagemath_giac/src new file mode 120000 index 00000000000..6c40ff4f747 --- /dev/null +++ b/build/pkgs/sagemath_giac/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-giac \ No newline at end of file diff --git a/build/pkgs/sagemath_giac/type b/build/pkgs/sagemath_giac/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_giac/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-giac/MANIFEST.in b/pkgs/sagemath-giac/MANIFEST.in new file mode 100644 index 00000000000..5b5ef0cb3f0 --- /dev/null +++ b/pkgs/sagemath-giac/MANIFEST.in @@ -0,0 +1,19 @@ +include VERSION.txt + +prune sage +global-include all__sagemath_giac.py + +graft sage/libs/giac +recursive-include sage/rings *.pxd # FIXME + +global-exclude *.c +global-exclude *.cpp + +global-exclude __pycache__ +global-exclude *.py[co] +global-exclude *.bak +global-exclude *.so +global-exclude *~ +prune .tox +prune build +prune dist diff --git a/pkgs/sagemath-giac/README.rst b/pkgs/sagemath-giac/README.rst new file mode 100644 index 00000000000..f8f35c66417 --- /dev/null +++ b/pkgs/sagemath-giac/README.rst @@ -0,0 +1,32 @@ +============================================================================== + Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with giac +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +About this pip-installable source distribution +---------------------------------------------- + +This pip-installable source distribution ``sagemath-giac`` is a small +optional distribution for use with ``sagemath-standard``. + +It provides a Cython interface to the ``giac`` library for the purpose +of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-giac/VERSION.txt b/pkgs/sagemath-giac/VERSION.txt new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-giac/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-giac/pyproject.toml.m4 b/pkgs/sagemath-giac/pyproject.toml.m4 new file mode 100644 index 00000000000..b7a4f7cb1ed --- /dev/null +++ b/pkgs/sagemath-giac/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_categories \ + cython \ + gmpy2 \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-giac/requirements.txt.m4 b/pkgs/sagemath-giac/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-giac/requirements.txt.m4 @@ -0,0 +1,2 @@ +Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') +sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-giac/sage b/pkgs/sagemath-giac/sage new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-giac/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-giac/setup.cfg.m4 b/pkgs/sagemath-giac/setup.cfg.m4 new file mode 100644 index 00000000000..6b102f60866 --- /dev/null +++ b/pkgs/sagemath-giac/setup.cfg.m4 @@ -0,0 +1,33 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-giac +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with giac +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagemath_categories \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-giac/setup.py b/pkgs/sagemath-giac/setup.py new file mode 100644 index 00000000000..b30a2dcafff --- /dev/null +++ b/pkgs/sagemath-giac/setup.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python + +from distutils import log +from setuptools import setup + +# Work around a Cython problem in Python 3.8.x on macOS +# https://github.com/cython/cython/issues/3262 +import os +if os.uname().sysname == 'Darwin': + import multiprocessing + multiprocessing.set_start_method('fork', force=True) + +# If build isolation is not in use and setuptools_scm is installed, +# then its file_finders entry point is invoked, which we don't need. +# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 +try: + import setuptools_scm.integration + setuptools_scm.integration.find_files = lambda _: [] +except ImportError: + pass + +# PEP 517 builds do not have . in sys.path +import sys +sys.path.insert(0, os.path.dirname(__file__)) + +if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): + sdist = True +else: + sdist = False + +if sdist: + cmdclass = {} +else: + from sage_setup.excepthook import excepthook + sys.excepthook = excepthook + + from sage_setup.setenv import setenv + setenv() + + import sage.env + sage.env.default_required_modules = sage.env.default_optional_modules = () + + from sage_setup.command.sage_build_cython import sage_build_cython + from sage_setup.command.sage_build_ext import sage_build_ext + sage_build_cython.built_distributions = ['sagemath-giac'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + from sage_setup.find import find_python_sources + python_packages, python_modules, cython_modules = find_python_sources( + '.', ['sage'], distributions=['sagemath-giac']) + + log.warn('python_packages = {0}'.format(python_packages)) + log.warn('python_modules = {0}'.format(python_modules)) + log.warn('cython_modules = {0}'.format(cython_modules)) + +setup( + cmdclass = cmdclass, + packages = python_packages, + py_modules = python_modules, + ext_modules = cython_modules, +) diff --git a/src/sage/all__sagemath_giac.py b/src/sage/all__sagemath_giac.py new file mode 100644 index 00000000000..43f71d83e8b --- /dev/null +++ b/src/sage/all__sagemath_giac.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-giac diff --git a/src/sage/libs/all__sagemath_giac.py b/src/sage/libs/all__sagemath_giac.py new file mode 100644 index 00000000000..43f71d83e8b --- /dev/null +++ b/src/sage/libs/all__sagemath_giac.py @@ -0,0 +1 @@ +# sage_setup: distribution = sagemath-giac From 47a2519acbf15b502a619288da2f62d2c208c018 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 23:03:24 -0800 Subject: [PATCH 25/60] Fixup --- Makefile | 4 ++++ build/pkgs/sagemath_flint_arb/dependencies | 2 +- build/pkgs/sagemath_flint_arb/spkg-src | 4 ++-- build/pkgs/sagemath_giac/dependencies | 2 +- build/pkgs/sagemath_homfly/dependencies | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 414398ddf0d..c7fda746b09 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,10 @@ pypi-sdists: sage_setup ./sage --sh build/pkgs/sagemath_categories/spkg-src ./sage --sh build/pkgs/sagemath_environment/spkg-src ./sage --sh build/pkgs/sagemath_repl/spkg-src + ./sage --sh build/pkgs/sagemath_giac/spkg-src + ./sage --sh build/pkgs/sagemath_flint_arb/spkg-src + ./sage --sh build/pkgs/sagemath_gap/spkg-src + ./sage --sh build/pkgs/sagemath_homfly/spkg-src @echo "Built sdists are in upstream/" # Ensuring wheels are present, even for packages that may have been installed diff --git a/build/pkgs/sagemath_flint_arb/dependencies b/build/pkgs/sagemath_flint_arb/dependencies index 57aa8f0ee97..0dc9b2241d3 100644 --- a/build/pkgs/sagemath_flint_arb/dependencies +++ b/build/pkgs/sagemath_flint_arb/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib flint-arb | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sagemath_categories flint-arb | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_flint_arb/spkg-src b/build/pkgs/sagemath_flint_arb/spkg-src index b5d25eef815..b78fd49cf64 100755 --- a/build/pkgs/sagemath_flint_arb/spkg-src +++ b/build/pkgs/sagemath_flint_arb/spkg-src @@ -4,7 +4,7 @@ # This script is not used during build. # # HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sagemath_flint-arb/spkg-src +# ./sage --sh build/pkgs/sagemath_flint_arb/spkg-src if [ -z "$SAGE_ROOT" ] ; then echo >&2 "Error - SAGE_ROOT undefined ... exiting" @@ -15,7 +15,7 @@ fi # Exit on failure set -e -cd build/pkgs/sagemath_flint-arb +cd build/pkgs/sagemath_flint_arb cd src python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_giac/dependencies b/build/pkgs/sagemath_giac/dependencies index 1b7836c539a..bb845cfb41c 100644 --- a/build/pkgs/sagemath_giac/dependencies +++ b/build/pkgs/sagemath_giac/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib giac | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sagemath_categories giac | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_homfly/dependencies b/build/pkgs/sagemath_homfly/dependencies index ce340466782..06784a6984d 100644 --- a/build/pkgs/sagemath_homfly/dependencies +++ b/build/pkgs/sagemath_homfly/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib libhomfly | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sagemath_categories libhomfly | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig From 513fc3f3e0ae775cb5f92f6fc81cb9d53484851f Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 23:05:19 -0800 Subject: [PATCH 26/60] Add tox.ini --- pkgs/sagemath-flint-arb/tox.ini | 64 +++++++++++++++++++++++++++++++++ pkgs/sagemath-giac/tox.ini | 64 +++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 pkgs/sagemath-flint-arb/tox.ini create mode 100644 pkgs/sagemath-giac/tox.ini diff --git a/pkgs/sagemath-flint-arb/tox.ini b/pkgs/sagemath-flint-arb/tox.ini new file mode 100644 index 00000000000..4d4d9f20f19 --- /dev/null +++ b/pkgs/sagemath-flint-arb/tox.ini @@ -0,0 +1,64 @@ +# To build and test in the tox environment: +# +# ./sage -sh -c '(cd pkgs/sagemath-homfly && tox -v -v -v -e sagepython)' +# +# To test interactively: +# +# pkgs/sagemath-homfly/.tox/sagepython/bin/python +# +[tox] +envlist = + sagepython-norequirements + +[testenv] +deps = + !norequirements: -rrequirements.txt + # tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576 + sagemath-repl + +extras = test + +passenv = + # Variables set by .homebrew-build-env + CPATH + LIBRARY_PATH + PKG_CONFIG_PATH + # Parallel build + SAGE_NUM_THREADS + SAGE_NUM_THREADS_PARALLEL + # SAGE_VENV only for referring to the basepython or finding the wheels + sagepython, sagewheels: SAGE_VENV + # Location of the wheels + sagewheels: SAGE_SPKG_WHEELS + +setenv = + # Sage scripts such as sage-runtests like to use $HOME/.sage + HOME={envdir} + # We supply pip options by environment variables so that they + # apply both to the installation of the dependencies and of the package + sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels} + nopypi: PIP_NO_INDEX=true + +whitelist_externals = + bash + +commands = + # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package. + # Currently cannot import -- missing runtime dep sage.rings.integer + # {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.libs.flint.fmpz_poly' + + +[testenv:sagepython] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 diff --git a/pkgs/sagemath-giac/tox.ini b/pkgs/sagemath-giac/tox.ini new file mode 100644 index 00000000000..536e83cf685 --- /dev/null +++ b/pkgs/sagemath-giac/tox.ini @@ -0,0 +1,64 @@ +# To build and test in the tox environment: +# +# ./sage -sh -c '(cd pkgs/sagemath-homfly && tox -v -v -v -e sagepython)' +# +# To test interactively: +# +# pkgs/sagemath-homfly/.tox/sagepython/bin/python +# +[tox] +envlist = + sagepython-norequirements + +[testenv] +deps = + !norequirements: -rrequirements.txt + # tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576 + sagemath-repl + +extras = test + +passenv = + # Variables set by .homebrew-build-env + CPATH + LIBRARY_PATH + PKG_CONFIG_PATH + # Parallel build + SAGE_NUM_THREADS + SAGE_NUM_THREADS_PARALLEL + # SAGE_VENV only for referring to the basepython or finding the wheels + sagepython, sagewheels: SAGE_VENV + # Location of the wheels + sagewheels: SAGE_SPKG_WHEELS + +setenv = + # Sage scripts such as sage-runtests like to use $HOME/.sage + HOME={envdir} + # We supply pip options by environment variables so that they + # apply both to the installation of the dependencies and of the package + sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels} + nopypi: PIP_NO_INDEX=true + +whitelist_externals = + bash + +commands = + # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package. + # Currently cannot be imported - dep sage.rings.integer missing + # {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.libs.giac.giac' + + +[testenv:sagepython] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 From 0f198cafdc72abcab02994e66cdbd9c917b31bc3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 23:16:40 -0800 Subject: [PATCH 27/60] Makefile: Add to PYPI_WHEEL_PACKAGES --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c7fda746b09..f542d42f0ef 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ pypi-sdists: sage_setup # Ensuring wheels are present, even for packages that may have been installed # as editable. Until we have better uninstallation of script packages, we # just remove the timestamps, which will lead to rebuilds of the packages. -PYPI_WHEEL_PACKAGES = sage_sws2rst sage_setup sagemath_environment sagemath_objects sagemath_repl sagemath_categories +PYPI_WHEEL_PACKAGES = sage_sws2rst sage_setup sagemath_environment sagemath_objects sagemath_repl sagemath_categories sagemath_giac sagemath_flint_arb sagemath_gap sagemath_homfly pypi-wheels: for a in $(PYPI_WHEEL_PACKAGES); do \ rm -f venv/var/lib/sage/installed/$$a-*; \ From 133e5b811eac34ef3b14a1c18596cb679d3002ab Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Dec 2022 11:08:28 -0800 Subject: [PATCH 28/60] Remove copy-pasted conda.txt files --- build/pkgs/sagemath_flint_arb/distros/conda.txt | 1 - build/pkgs/sagemath_giac/distros/conda.txt | 1 - build/pkgs/sagemath_homfly/distros/conda.txt | 1 - 3 files changed, 3 deletions(-) delete mode 100644 build/pkgs/sagemath_flint_arb/distros/conda.txt delete mode 100644 build/pkgs/sagemath_giac/distros/conda.txt delete mode 100644 build/pkgs/sagemath_homfly/distros/conda.txt diff --git a/build/pkgs/sagemath_flint_arb/distros/conda.txt b/build/pkgs/sagemath_flint_arb/distros/conda.txt deleted file mode 100644 index 5b2cb38d886..00000000000 --- a/build/pkgs/sagemath_flint_arb/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -sagemath-flint-arb diff --git a/build/pkgs/sagemath_giac/distros/conda.txt b/build/pkgs/sagemath_giac/distros/conda.txt deleted file mode 100644 index 2daf2fbb6b2..00000000000 --- a/build/pkgs/sagemath_giac/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -sagemath-giac diff --git a/build/pkgs/sagemath_homfly/distros/conda.txt b/build/pkgs/sagemath_homfly/distros/conda.txt deleted file mode 100644 index 8af83678269..00000000000 --- a/build/pkgs/sagemath_homfly/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -sagemath-homfly From 4c8f5b5db2450e99e5968d4dedc88bb0e89127ca Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Dec 2022 12:33:14 -0800 Subject: [PATCH 29/60] src/sage/sets/disjoint_set.pyx: Remove obsolete -*- coding -*- line --- src/sage/sets/disjoint_set.pyx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sage/sets/disjoint_set.pyx b/src/sage/sets/disjoint_set.pyx index 7466276a689..87cde956a25 100644 --- a/src/sage/sets/disjoint_set.pyx +++ b/src/sage/sets/disjoint_set.pyx @@ -1,5 +1,4 @@ # sage_setup: distribution = sagemath-gap -# -*- coding: utf-8 -*- r""" Disjoint-set data structure From 2be77afa09adf9e4f079569d1aa9aeb501de1956 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Dec 2022 12:39:21 -0800 Subject: [PATCH 30/60] pkgs/sagemath-flint-arb: Update description --- pkgs/sagemath-flint-arb/README.rst | 9 +++------ pkgs/sagemath-flint-arb/setup.cfg.m4 | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/sagemath-flint-arb/README.rst b/pkgs/sagemath-flint-arb/README.rst index 1eccfc787af..93094a70c38 100644 --- a/pkgs/sagemath-flint-arb/README.rst +++ b/pkgs/sagemath-flint-arb/README.rst @@ -1,5 +1,5 @@ ============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with flint-arb + Sage: Open Source Mathematics Software: Fast computations with FLINT and arb ============================================================================== About SageMath @@ -25,8 +25,5 @@ installs the Sage Library (sagelib, implemented in Python and Cython). About this pip-installable source distribution ---------------------------------------------- -This pip-installable source distribution ``sagemath-flint-arb`` is a small -optional distribution for use with ``sagemath-standard``. - -It provides a Cython interface to the ``flint-arb`` library for the purpose -of computing graph (iso/auto)morphisms. +This pip-installable source distribution ``sagemath-flint-arb`` provides +Cython interfaces to the ``FLINT`` and ``arb`` libraries. diff --git a/pkgs/sagemath-flint-arb/setup.cfg.m4 b/pkgs/sagemath-flint-arb/setup.cfg.m4 index ca7de427aca..820220da360 100644 --- a/pkgs/sagemath-flint-arb/setup.cfg.m4 +++ b/pkgs/sagemath-flint-arb/setup.cfg.m4 @@ -2,7 +2,7 @@ [metadata] name = sagemath-flint-arb version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with flint-arb +description = Sage: Open Source Mathematics Software: Fast computations with FLINT and arb long_description = file: README.rst long_description_content_type = text/x-rst license = GNU General Public License (GPL) v2 or later From a827f299c54650e6a71bdb6bede15b8536f06eb0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Dec 2022 12:42:16 -0800 Subject: [PATCH 31/60] pkgs/sagemath-giac: Update description --- pkgs/sagemath-giac/README.rst | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/sagemath-giac/README.rst b/pkgs/sagemath-giac/README.rst index f8f35c66417..515f800236f 100644 --- a/pkgs/sagemath-giac/README.rst +++ b/pkgs/sagemath-giac/README.rst @@ -1,6 +1,6 @@ -============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with giac -============================================================================== +======================================================================== + Sage: Open Source Mathematics Software: Symbolic computation with GIAC +======================================================================== About SageMath -------------- @@ -25,8 +25,5 @@ installs the Sage Library (sagelib, implemented in Python and Cython). About this pip-installable source distribution ---------------------------------------------- -This pip-installable source distribution ``sagemath-giac`` is a small -optional distribution for use with ``sagemath-standard``. - -It provides a Cython interface to the ``giac`` library for the purpose -of computing graph (iso/auto)morphisms. +This pip-installable source distribution ``sagemath-giac`` provides a Cython +interface to GIAC. From 112e29ec892ab6901b83ce35d0b476f3af008df3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 6 Dec 2022 13:26:50 -0800 Subject: [PATCH 32/60] src/sage/groups/perm_gps/partn_ref/data_structures.pyx: In doctest support code, avoid use of FLINT --- src/sage/groups/perm_gps/partn_ref/data_structures.pyx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sage/groups/perm_gps/partn_ref/data_structures.pyx b/src/sage/groups/perm_gps/partn_ref/data_structures.pyx index 8482a9e88c7..b9aa617b327 100644 --- a/src/sage/groups/perm_gps/partn_ref/data_structures.pyx +++ b/src/sage/groups/perm_gps/partn_ref/data_structures.pyx @@ -34,6 +34,10 @@ from cysignals.memory cimport sig_malloc, sig_calloc, sig_realloc, sig_free from sage.data_structures.bitset_base cimport * from sage.rings.integer cimport Integer +# from sage.libs.flint.ulong_extras cimport n_is_prime +# -- avoid modularization obstruction -- function is only used for a doctest helper +from sage.arith.misc import is_prime as n_is_prime + # OrbitPartition (OP) @@ -1144,8 +1148,6 @@ cdef bint SC_is_giant(int n, int num_perms, int *perms, float p, bitset_t suppor Running time is roughly O(-ln(1-p)*n*ln(m)) where m <= n is the size of the support of the group. """ - from sage.libs.flint.ulong_extras import n_is_prime - cdef int i, j, num_steps, support_root cdef size_t m = 1 cdef unsigned long q From 8b1cf25446766c8befe26ca2a8ccb0890926fdb7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 13 Dec 2022 22:56:41 -0800 Subject: [PATCH 33/60] pkgs/sagemath-standard/setup.py: Include files marked as # sage_setup: distribution = sagemath-flint-arb etc. --- pkgs/sagemath-standard/setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/sagemath-standard/setup.py b/pkgs/sagemath-standard/setup.py index d03b63400f6..7e397ec685c 100755 --- a/pkgs/sagemath-standard/setup.py +++ b/pkgs/sagemath-standard/setup.py @@ -91,7 +91,12 @@ print("Discovering Python/Cython source code....") t = time.time() from sage.misc.package import is_package_installed_and_updated - distributions = [''] + distributions = ['', + 'sagemath-flint-arb', + 'sagemath-gap', + 'sagemath-giac', + 'sagemath-homfly', + ] optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib', 'coxeter3', 'sirocco', 'meataxe'] distributions += ['sagemath-{}'.format(pkg) From 5fc1addaee342a3433e7effc271c19ceb06b9b09 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 18 Dec 2022 19:47:39 -0800 Subject: [PATCH 34/60] build/pkgs/sagemath*/spkg-src: Use build --- build/pkgs/sagemath_flint_arb/spkg-src | 5 ++++- build/pkgs/sagemath_gap/spkg-src | 5 ++++- build/pkgs/sagemath_giac/spkg-src | 5 ++++- build/pkgs/sagemath_homfly/spkg-src | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sagemath_flint_arb/spkg-src b/build/pkgs/sagemath_flint_arb/spkg-src index b78fd49cf64..5e07840a90c 100755 --- a/build/pkgs/sagemath_flint_arb/spkg-src +++ b/build/pkgs/sagemath_flint_arb/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_flint_arb cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# Get rid of old *.egg-info/SOURCES.txt +rm -Rf *.egg-info + +python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_gap/spkg-src b/build/pkgs/sagemath_gap/spkg-src index a37d2c128ce..f6030db6a8c 100755 --- a/build/pkgs/sagemath_gap/spkg-src +++ b/build/pkgs/sagemath_gap/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_gap cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# Get rid of old *.egg-info/SOURCES.txt +rm -Rf *.egg-info + +python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_giac/spkg-src b/build/pkgs/sagemath_giac/spkg-src index 97a309a7835..22a051ef282 100755 --- a/build/pkgs/sagemath_giac/spkg-src +++ b/build/pkgs/sagemath_giac/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_giac cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# Get rid of old *.egg-info/SOURCES.txt +rm -Rf *.egg-info + +python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_homfly/spkg-src b/build/pkgs/sagemath_homfly/spkg-src index a8e60f69846..8ee94522cfd 100755 --- a/build/pkgs/sagemath_homfly/spkg-src +++ b/build/pkgs/sagemath_homfly/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_homfly cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# Get rid of old *.egg-info/SOURCES.txt +rm -Rf *.egg-info + +python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" From 1531fda69d3c9179f72c0c71cb702f65630b8afc Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 18 Dec 2022 20:00:26 -0800 Subject: [PATCH 35/60] build/pkgs/sagemath_flint_arb/dependencies: Fix up --- build/pkgs/sagemath_flint_arb/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sagemath_flint_arb/dependencies b/build/pkgs/sagemath_flint_arb/dependencies index 0dc9b2241d3..8dfbe4108bf 100644 --- a/build/pkgs/sagemath_flint_arb/dependencies +++ b/build/pkgs/sagemath_flint_arb/dependencies @@ -1 +1 @@ -$(PYTHON) sagemath_categories flint-arb | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sagemath_categories flint arb | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig From 2340a917e2c0d715ada83e030d2bc0f54ef090e3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 17:45:13 -0700 Subject: [PATCH 36/60] Rename sagemath-flint-arb to sagemath-flint --- .gitignore | 6 +++--- build/make/Makefile.in | 2 +- build/pkgs/{sagemath_flint_arb => sagemath_flint}/SPKG.rst | 0 build/pkgs/{sagemath_flint_arb => sagemath_flint}/bootstrap | 0 .../{sagemath_flint_arb => sagemath_flint}/dependencies | 0 .../install-requires.txt | 2 +- .../package-version.txt | 0 .../{sagemath_flint_arb => sagemath_flint}/spkg-install | 0 build/pkgs/{sagemath_flint_arb => sagemath_flint}/spkg-src | 6 +++--- build/pkgs/sagemath_flint/src | 1 + build/pkgs/{sagemath_flint_arb => sagemath_flint}/type | 0 build/pkgs/sagemath_flint_arb/src | 1 - pkgs/{sagemath-flint-arb => sagemath-flint}/MANIFEST.in | 2 +- pkgs/{sagemath-flint-arb => sagemath-flint}/README.rst | 2 +- pkgs/{sagemath-flint-arb => sagemath-flint}/VERSION.txt | 0 .../pyproject.toml.m4 | 0 .../requirements.txt.m4 | 0 pkgs/{sagemath-flint-arb => sagemath-flint}/sage | 0 pkgs/{sagemath-flint-arb => sagemath-flint}/setup.cfg.m4 | 2 +- pkgs/{sagemath-flint-arb => sagemath-flint}/setup.py | 4 ++-- pkgs/{sagemath-flint-arb => sagemath-flint}/tox.ini | 0 pkgs/sagemath-standard/setup.py | 2 +- src/sage/all__sagemath_flint_arb.py | 2 +- src/sage/libs/all__sagemath_flint_arb.py | 2 +- src/sage/libs/arb/acb.pxd | 2 +- src/sage/libs/arb/acb_calc.pxd | 2 +- src/sage/libs/arb/acb_elliptic.pxd | 2 +- src/sage/libs/arb/acb_hypgeom.pxd | 2 +- src/sage/libs/arb/acb_mat.pxd | 2 +- src/sage/libs/arb/acb_modular.pxd | 2 +- src/sage/libs/arb/acb_poly.pxd | 2 +- src/sage/libs/arb/arb.pxd | 2 +- src/sage/libs/arb/arb_fmpz_poly.pxd | 2 +- src/sage/libs/arb/arb_hypgeom.pxd | 2 +- src/sage/libs/arb/arb_version.pyx | 2 +- src/sage/libs/arb/arf.pxd | 2 +- src/sage/libs/arb/arith.pyx | 2 +- src/sage/libs/arb/bernoulli.pxd | 2 +- src/sage/libs/arb/mag.pxd | 2 +- src/sage/libs/arb/types.pxd | 2 +- src/sage/libs/flint/arith.pxd | 2 +- src/sage/libs/flint/arith.pyx | 2 +- src/sage/libs/flint/flint.pxd | 2 +- src/sage/libs/flint/flint.pyx | 2 +- src/sage/libs/flint/fmpq.pxd | 2 +- src/sage/libs/flint/fmpq_mat.pxd | 2 +- src/sage/libs/flint/fmpq_poly.pxd | 2 +- src/sage/libs/flint/fmpz.pxd | 2 +- src/sage/libs/flint/fmpz_mat.pxd | 2 +- src/sage/libs/flint/fmpz_mod.pxd | 2 +- src/sage/libs/flint/fmpz_mod_poly.pxd | 2 +- src/sage/libs/flint/fmpz_poly.pxd | 2 +- src/sage/libs/flint/fmpz_poly.pyx | 2 +- src/sage/libs/flint/fmpz_poly_mat.pxd | 2 +- src/sage/libs/flint/fmpz_poly_q.pxd | 2 +- src/sage/libs/flint/fmpz_vec.pxd | 2 +- src/sage/libs/flint/fq.pxd | 2 +- src/sage/libs/flint/fq_nmod.pxd | 2 +- src/sage/libs/flint/nmod_poly.pxd | 2 +- src/sage/libs/flint/nmod_poly_linkage.pxi | 2 +- src/sage/libs/flint/nmod_vec.pxd | 2 +- src/sage/libs/flint/ntl_interface.pxd | 2 +- src/sage/libs/flint/padic.pxd | 2 +- src/sage/libs/flint/padic_poly.pxd | 2 +- src/sage/libs/flint/qadic.pxd | 2 +- src/sage/libs/flint/thread_pool.pxd | 2 +- src/sage/libs/flint/types.pxd | 2 +- src/sage/libs/flint/ulong_extras.pxd | 2 +- src/sage/libs/flint/ulong_extras.pyx | 2 +- src/sage/matrix/all__sagemath_flint_arb.py | 2 +- src/sage/matrix/matrix_complex_ball_dense.pxd | 2 +- src/sage/matrix/matrix_complex_ball_dense.pyx | 2 +- src/sage/rings/all__sagemath_flint_arb.py | 2 +- src/sage/rings/complex_arb.pxd | 2 +- src/sage/rings/complex_arb.pyx | 2 +- .../rings/number_field/number_field_element_quadratic.pxd | 2 +- .../rings/number_field/number_field_element_quadratic.pyx | 2 +- src/sage/rings/padics/qadic_flint_FP.pyx | 2 +- src/sage/rings/polynomial/evaluation_flint.pyx | 2 +- src/sage/rings/polynomial/polynomial_complex_arb.pxd | 2 +- src/sage/rings/polynomial/polynomial_complex_arb.pyx | 2 +- src/sage/rings/real_arb.pxd | 2 +- src/sage/rings/real_arb.pyx | 2 +- 83 files changed, 76 insertions(+), 76 deletions(-) rename build/pkgs/{sagemath_flint_arb => sagemath_flint}/SPKG.rst (100%) rename build/pkgs/{sagemath_flint_arb => sagemath_flint}/bootstrap (100%) rename build/pkgs/{sagemath_flint_arb => sagemath_flint}/dependencies (100%) rename build/pkgs/{sagemath_flint_arb => sagemath_flint}/install-requires.txt (79%) rename build/pkgs/{sagemath_flint_arb => sagemath_flint}/package-version.txt (100%) rename build/pkgs/{sagemath_flint_arb => sagemath_flint}/spkg-install (100%) rename build/pkgs/{sagemath_flint_arb => sagemath_flint}/spkg-src (73%) create mode 120000 build/pkgs/sagemath_flint/src rename build/pkgs/{sagemath_flint_arb => sagemath_flint}/type (100%) delete mode 120000 build/pkgs/sagemath_flint_arb/src rename pkgs/{sagemath-flint-arb => sagemath-flint}/MANIFEST.in (96%) rename pkgs/{sagemath-flint-arb => sagemath-flint}/README.rst (93%) rename pkgs/{sagemath-flint-arb => sagemath-flint}/VERSION.txt (100%) rename pkgs/{sagemath-flint-arb => sagemath-flint}/pyproject.toml.m4 (100%) rename pkgs/{sagemath-flint-arb => sagemath-flint}/requirements.txt.m4 (100%) rename pkgs/{sagemath-flint-arb => sagemath-flint}/sage (100%) rename pkgs/{sagemath-flint-arb => sagemath-flint}/setup.cfg.m4 (97%) rename pkgs/{sagemath-flint-arb => sagemath-flint}/setup.py (93%) rename pkgs/{sagemath-flint-arb => sagemath-flint}/tox.ini (100%) diff --git a/.gitignore b/.gitignore index d57c4722950..934a441ec5f 100644 --- a/.gitignore +++ b/.gitignore @@ -178,7 +178,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-categories/setup.cfg /pkgs/sagemath-environment/setup.cfg /pkgs/sagemath-repl/setup.cfg -/pkgs/sagemath-flint-arb/setup.cfg +/pkgs/sagemath-flint/setup.cfg /pkgs/sagemath-gap/setup.cfg /pkgs/sagemath-giac/setup.cfg /pkgs/sagemath-homfly/setup.cfg @@ -186,7 +186,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-categories/pyproject.toml /pkgs/sagemath-environment/pyproject.toml /pkgs/sagemath-repl/pyproject.toml -/pkgs/sagemath-flint-arb/pyproject.toml +/pkgs/sagemath-flint/pyproject.toml /pkgs/sagemath-gap/pyproject.toml /pkgs/sagemath-giac/pyproject.toml /pkgs/sagemath-homfly/pyproject.toml @@ -194,7 +194,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-categories/requirements.txt /pkgs/sagemath-environment/requirements.txt /pkgs/sagemath-repl/requirements.txt -/pkgs/sagemath-flint-arb/requirements.txt +/pkgs/sagemath-flint/requirements.txt /pkgs/sagemath-gap/requirements.txt /pkgs/sagemath-giac/requirements.txt /pkgs/sagemath-homfly/requirements.txt diff --git a/build/make/Makefile.in b/build/make/Makefile.in index b7699378cc3..f426d15ca14 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -137,7 +137,7 @@ PYPI_WHEEL_PACKAGES = \ sagemath_repl \ sagemath_categories \ sagemath_giac \ - sagemath_flint_arb \ + sagemath_flint \ sagemath_gap \ sagemath_homfly diff --git a/build/pkgs/sagemath_flint_arb/SPKG.rst b/build/pkgs/sagemath_flint/SPKG.rst similarity index 100% rename from build/pkgs/sagemath_flint_arb/SPKG.rst rename to build/pkgs/sagemath_flint/SPKG.rst diff --git a/build/pkgs/sagemath_flint_arb/bootstrap b/build/pkgs/sagemath_flint/bootstrap similarity index 100% rename from build/pkgs/sagemath_flint_arb/bootstrap rename to build/pkgs/sagemath_flint/bootstrap diff --git a/build/pkgs/sagemath_flint_arb/dependencies b/build/pkgs/sagemath_flint/dependencies similarity index 100% rename from build/pkgs/sagemath_flint_arb/dependencies rename to build/pkgs/sagemath_flint/dependencies diff --git a/build/pkgs/sagemath_flint_arb/install-requires.txt b/build/pkgs/sagemath_flint/install-requires.txt similarity index 79% rename from build/pkgs/sagemath_flint_arb/install-requires.txt rename to build/pkgs/sagemath_flint/install-requires.txt index 9e09cf11e04..c4018e433ca 100644 --- a/build/pkgs/sagemath_flint_arb/install-requires.txt +++ b/build/pkgs/sagemath_flint/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-flint-arb +sagemath-flint diff --git a/build/pkgs/sagemath_flint_arb/package-version.txt b/build/pkgs/sagemath_flint/package-version.txt similarity index 100% rename from build/pkgs/sagemath_flint_arb/package-version.txt rename to build/pkgs/sagemath_flint/package-version.txt diff --git a/build/pkgs/sagemath_flint_arb/spkg-install b/build/pkgs/sagemath_flint/spkg-install similarity index 100% rename from build/pkgs/sagemath_flint_arb/spkg-install rename to build/pkgs/sagemath_flint/spkg-install diff --git a/build/pkgs/sagemath_flint_arb/spkg-src b/build/pkgs/sagemath_flint/spkg-src similarity index 73% rename from build/pkgs/sagemath_flint_arb/spkg-src rename to build/pkgs/sagemath_flint/spkg-src index 5e07840a90c..557f275e331 100755 --- a/build/pkgs/sagemath_flint_arb/spkg-src +++ b/build/pkgs/sagemath_flint/spkg-src @@ -1,10 +1,10 @@ #!/usr/bin/env bash # -# Script to prepare an sdist tarball for sagemath-flint-arb +# Script to prepare an sdist tarball for sagemath-flint # This script is not used during build. # # HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sagemath_flint_arb/spkg-src +# ./sage --sh build/pkgs/sagemath_flint/spkg-src if [ -z "$SAGE_ROOT" ] ; then echo >&2 "Error - SAGE_ROOT undefined ... exiting" @@ -15,7 +15,7 @@ fi # Exit on failure set -e -cd build/pkgs/sagemath_flint_arb +cd build/pkgs/sagemath_flint cd src # Get rid of old *.egg-info/SOURCES.txt diff --git a/build/pkgs/sagemath_flint/src b/build/pkgs/sagemath_flint/src new file mode 120000 index 00000000000..544b611bda1 --- /dev/null +++ b/build/pkgs/sagemath_flint/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-flint \ No newline at end of file diff --git a/build/pkgs/sagemath_flint_arb/type b/build/pkgs/sagemath_flint/type similarity index 100% rename from build/pkgs/sagemath_flint_arb/type rename to build/pkgs/sagemath_flint/type diff --git a/build/pkgs/sagemath_flint_arb/src b/build/pkgs/sagemath_flint_arb/src deleted file mode 120000 index 00d51baaba1..00000000000 --- a/build/pkgs/sagemath_flint_arb/src +++ /dev/null @@ -1 +0,0 @@ -../../../pkgs/sagemath-flint-arb \ No newline at end of file diff --git a/pkgs/sagemath-flint-arb/MANIFEST.in b/pkgs/sagemath-flint/MANIFEST.in similarity index 96% rename from pkgs/sagemath-flint-arb/MANIFEST.in rename to pkgs/sagemath-flint/MANIFEST.in index 42349764381..fff7a6c7141 100644 --- a/pkgs/sagemath-flint-arb/MANIFEST.in +++ b/pkgs/sagemath-flint/MANIFEST.in @@ -1,7 +1,7 @@ include VERSION.txt prune sage -global-include all__sagemath_flint_arb.py +global-include all__sagemath_flint.py graft sage/libs/arb graft sage/libs/flint diff --git a/pkgs/sagemath-flint-arb/README.rst b/pkgs/sagemath-flint/README.rst similarity index 93% rename from pkgs/sagemath-flint-arb/README.rst rename to pkgs/sagemath-flint/README.rst index 93094a70c38..d7f8eae5a56 100644 --- a/pkgs/sagemath-flint-arb/README.rst +++ b/pkgs/sagemath-flint/README.rst @@ -25,5 +25,5 @@ installs the Sage Library (sagelib, implemented in Python and Cython). About this pip-installable source distribution ---------------------------------------------- -This pip-installable source distribution ``sagemath-flint-arb`` provides +This pip-installable source distribution ``sagemath-flint`` provides Cython interfaces to the ``FLINT`` and ``arb`` libraries. diff --git a/pkgs/sagemath-flint-arb/VERSION.txt b/pkgs/sagemath-flint/VERSION.txt similarity index 100% rename from pkgs/sagemath-flint-arb/VERSION.txt rename to pkgs/sagemath-flint/VERSION.txt diff --git a/pkgs/sagemath-flint-arb/pyproject.toml.m4 b/pkgs/sagemath-flint/pyproject.toml.m4 similarity index 100% rename from pkgs/sagemath-flint-arb/pyproject.toml.m4 rename to pkgs/sagemath-flint/pyproject.toml.m4 diff --git a/pkgs/sagemath-flint-arb/requirements.txt.m4 b/pkgs/sagemath-flint/requirements.txt.m4 similarity index 100% rename from pkgs/sagemath-flint-arb/requirements.txt.m4 rename to pkgs/sagemath-flint/requirements.txt.m4 diff --git a/pkgs/sagemath-flint-arb/sage b/pkgs/sagemath-flint/sage similarity index 100% rename from pkgs/sagemath-flint-arb/sage rename to pkgs/sagemath-flint/sage diff --git a/pkgs/sagemath-flint-arb/setup.cfg.m4 b/pkgs/sagemath-flint/setup.cfg.m4 similarity index 97% rename from pkgs/sagemath-flint-arb/setup.cfg.m4 rename to pkgs/sagemath-flint/setup.cfg.m4 index 820220da360..60a29148fec 100644 --- a/pkgs/sagemath-flint-arb/setup.cfg.m4 +++ b/pkgs/sagemath-flint/setup.cfg.m4 @@ -1,6 +1,6 @@ # -*- conf-unix -*- [metadata] -name = sagemath-flint-arb +name = sagemath-flint version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Fast computations with FLINT and arb long_description = file: README.rst diff --git a/pkgs/sagemath-flint-arb/setup.py b/pkgs/sagemath-flint/setup.py similarity index 93% rename from pkgs/sagemath-flint-arb/setup.py rename to pkgs/sagemath-flint/setup.py index 263ae46a44a..7edf74f3f2e 100644 --- a/pkgs/sagemath-flint-arb/setup.py +++ b/pkgs/sagemath-flint/setup.py @@ -42,7 +42,7 @@ from sage_setup.command.sage_build_cython import sage_build_cython from sage_setup.command.sage_build_ext import sage_build_ext - sage_build_cython.built_distributions = ['sagemath-flint-arb'] + sage_build_cython.built_distributions = ['sagemath-flint'] cmdclass = dict(build_cython=sage_build_cython, build_ext=sage_build_ext) @@ -54,7 +54,7 @@ else: from sage_setup.find import find_python_sources python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-flint-arb']) + '.', ['sage'], distributions=['sagemath-flint']) log.warn('python_packages = {0}'.format(python_packages)) log.warn('python_modules = {0}'.format(python_modules)) diff --git a/pkgs/sagemath-flint-arb/tox.ini b/pkgs/sagemath-flint/tox.ini similarity index 100% rename from pkgs/sagemath-flint-arb/tox.ini rename to pkgs/sagemath-flint/tox.ini diff --git a/pkgs/sagemath-standard/setup.py b/pkgs/sagemath-standard/setup.py index d77ea733c48..f7040529487 100755 --- a/pkgs/sagemath-standard/setup.py +++ b/pkgs/sagemath-standard/setup.py @@ -77,7 +77,7 @@ print("Discovering Python/Cython source code....") t = time.time() distributions = ['', - 'sagemath-flint-arb', + 'sagemath-flint', 'sagemath-gap', 'sagemath-giac', 'sagemath-homfly', diff --git a/src/sage/all__sagemath_flint_arb.py b/src/sage/all__sagemath_flint_arb.py index 07b83b001f9..d31bae41036 100644 --- a/src/sage/all__sagemath_flint_arb.py +++ b/src/sage/all__sagemath_flint_arb.py @@ -1 +1 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint diff --git a/src/sage/libs/all__sagemath_flint_arb.py b/src/sage/libs/all__sagemath_flint_arb.py index 07b83b001f9..d31bae41036 100644 --- a/src/sage/libs/all__sagemath_flint_arb.py +++ b/src/sage/libs/all__sagemath_flint_arb.py @@ -1 +1 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint diff --git a/src/sage/libs/arb/acb.pxd b/src/sage/libs/arb/acb.pxd index e6ddfe92425..162fae40467 100644 --- a/src/sage/libs/arb/acb.pxd +++ b/src/sage/libs/arb/acb.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb.h diff --git a/src/sage/libs/arb/acb_calc.pxd b/src/sage/libs/arb/acb_calc.pxd index c273ab18e8d..340011f5ebc 100644 --- a/src/sage/libs/arb/acb_calc.pxd +++ b/src/sage/libs/arb/acb_calc.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_calc.h diff --git a/src/sage/libs/arb/acb_elliptic.pxd b/src/sage/libs/arb/acb_elliptic.pxd index 03c60a9e537..d764992dde8 100644 --- a/src/sage/libs/arb/acb_elliptic.pxd +++ b/src/sage/libs/arb/acb_elliptic.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_elliptic.h diff --git a/src/sage/libs/arb/acb_hypgeom.pxd b/src/sage/libs/arb/acb_hypgeom.pxd index c041261d7e8..cd3ec94bc7c 100644 --- a/src/sage/libs/arb/acb_hypgeom.pxd +++ b/src/sage/libs/arb/acb_hypgeom.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_hypgeom.h diff --git a/src/sage/libs/arb/acb_mat.pxd b/src/sage/libs/arb/acb_mat.pxd index ea4ef0d289d..fcf39441109 100644 --- a/src/sage/libs/arb/acb_mat.pxd +++ b/src/sage/libs/arb/acb_mat.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: depends = acb_mat.h from sage.libs.arb.types cimport acb_t, acb_ptr, acb_srcptr, acb_mat_t, acb_poly_t, mag_t diff --git a/src/sage/libs/arb/acb_modular.pxd b/src/sage/libs/arb/acb_modular.pxd index 55570f843e5..5b101c1c823 100644 --- a/src/sage/libs/arb/acb_modular.pxd +++ b/src/sage/libs/arb/acb_modular.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_modular.h diff --git a/src/sage/libs/arb/acb_poly.pxd b/src/sage/libs/arb/acb_poly.pxd index f960af5517c..59735d87ba0 100644 --- a/src/sage/libs/arb/acb_poly.pxd +++ b/src/sage/libs/arb/acb_poly.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = acb_poly.h diff --git a/src/sage/libs/arb/arb.pxd b/src/sage/libs/arb/arb.pxd index 0ba4f02c6ec..f27030bc6dd 100644 --- a/src/sage/libs/arb/arb.pxd +++ b/src/sage/libs/arb/arb.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = arb.h diff --git a/src/sage/libs/arb/arb_fmpz_poly.pxd b/src/sage/libs/arb/arb_fmpz_poly.pxd index 6b837f85897..639d30a8ca2 100644 --- a/src/sage/libs/arb/arb_fmpz_poly.pxd +++ b/src/sage/libs/arb/arb_fmpz_poly.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = arb_fmpz_poly.h diff --git a/src/sage/libs/arb/arb_hypgeom.pxd b/src/sage/libs/arb/arb_hypgeom.pxd index 5f4b8b7777b..f2d9757ba33 100644 --- a/src/sage/libs/arb/arb_hypgeom.pxd +++ b/src/sage/libs/arb/arb_hypgeom.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = arb_hypgeom.h diff --git a/src/sage/libs/arb/arb_version.pyx b/src/sage/libs/arb/arb_version.pyx index 49f4a281d3e..51d01d79d9a 100644 --- a/src/sage/libs/arb/arb_version.pyx +++ b/src/sage/libs/arb/arb_version.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint from sage.libs.arb.arb cimport arb_version from sage.cpython.string cimport char_to_str diff --git a/src/sage/libs/arb/arf.pxd b/src/sage/libs/arb/arf.pxd index a1384e14e90..571c673abc1 100644 --- a/src/sage/libs/arb/arf.pxd +++ b/src/sage/libs/arb/arf.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = arf.h diff --git a/src/sage/libs/arb/arith.pyx b/src/sage/libs/arb/arith.pyx index e45b98846a0..c392ecf38bf 100644 --- a/src/sage/libs/arb/arith.pyx +++ b/src/sage/libs/arb/arith.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint """ Arithmetic functions using the arb library """ diff --git a/src/sage/libs/arb/bernoulli.pxd b/src/sage/libs/arb/bernoulli.pxd index 0341efd0b89..ee46d626fcc 100644 --- a/src/sage/libs/arb/bernoulli.pxd +++ b/src/sage/libs/arb/bernoulli.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = bernoulli.h diff --git a/src/sage/libs/arb/mag.pxd b/src/sage/libs/arb/mag.pxd index eb58156bc56..f6f8fe2ec26 100644 --- a/src/sage/libs/arb/mag.pxd +++ b/src/sage/libs/arb/mag.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = mag.h diff --git a/src/sage/libs/arb/types.pxd b/src/sage/libs/arb/types.pxd index 373937c261d..0f2113054b3 100644 --- a/src/sage/libs/arb/types.pxd +++ b/src/sage/libs/arb/types.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: depends = mag.h arf.h arb.h acb.h acb_mat.h acb_poly.h acb_calc.h # mag.h diff --git a/src/sage/libs/flint/arith.pxd b/src/sage/libs/flint/arith.pxd index 58c11c82728..31188526d8d 100644 --- a/src/sage/libs/flint/arith.pxd +++ b/src/sage/libs/flint/arith.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/arith.h diff --git a/src/sage/libs/flint/arith.pyx b/src/sage/libs/flint/arith.pyx index f1701ec6ce3..541a3c1c67e 100644 --- a/src/sage/libs/flint/arith.pyx +++ b/src/sage/libs/flint/arith.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: extra_compile_args = -D_XPG6 """ FLINT Arithmetic Functions diff --git a/src/sage/libs/flint/flint.pxd b/src/sage/libs/flint/flint.pxd index a41ad9e6514..d8ccbe723f1 100644 --- a/src/sage/libs/flint/flint.pxd +++ b/src/sage/libs/flint/flint.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/flint.h flint/fmpz.h diff --git a/src/sage/libs/flint/flint.pyx b/src/sage/libs/flint/flint.pyx index 52f0c635083..1196d375f3b 100644 --- a/src/sage/libs/flint/flint.pyx +++ b/src/sage/libs/flint/flint.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: extra_compile_args = -D_XPG6 """ Flint imports diff --git a/src/sage/libs/flint/fmpq.pxd b/src/sage/libs/flint/fmpq.pxd index 51995b37ac6..7a29c1b1298 100644 --- a/src/sage/libs/flint/fmpq.pxd +++ b/src/sage/libs/flint/fmpq.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpq.h diff --git a/src/sage/libs/flint/fmpq_mat.pxd b/src/sage/libs/flint/fmpq_mat.pxd index 01e496a2795..ffba3422bea 100644 --- a/src/sage/libs/flint/fmpq_mat.pxd +++ b/src/sage/libs/flint/fmpq_mat.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpq_mat.h diff --git a/src/sage/libs/flint/fmpq_poly.pxd b/src/sage/libs/flint/fmpq_poly.pxd index 229664a67fb..301fefc15ac 100644 --- a/src/sage/libs/flint/fmpq_poly.pxd +++ b/src/sage/libs/flint/fmpq_poly.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpq_poly.h diff --git a/src/sage/libs/flint/fmpz.pxd b/src/sage/libs/flint/fmpz.pxd index e995b26b1c9..d6df41369be 100644 --- a/src/sage/libs/flint/fmpz.pxd +++ b/src/sage/libs/flint/fmpz.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpz.h diff --git a/src/sage/libs/flint/fmpz_mat.pxd b/src/sage/libs/flint/fmpz_mat.pxd index dcba72474cc..0036d172438 100644 --- a/src/sage/libs/flint/fmpz_mat.pxd +++ b/src/sage/libs/flint/fmpz_mat.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpz_mat.h diff --git a/src/sage/libs/flint/fmpz_mod.pxd b/src/sage/libs/flint/fmpz_mod.pxd index 319e47cffd6..6a26effca8b 100644 --- a/src/sage/libs/flint/fmpz_mod.pxd +++ b/src/sage/libs/flint/fmpz_mod.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpz_mod.h diff --git a/src/sage/libs/flint/fmpz_mod_poly.pxd b/src/sage/libs/flint/fmpz_mod_poly.pxd index 1365f054ef8..f2e5326c725 100644 --- a/src/sage/libs/flint/fmpz_mod_poly.pxd +++ b/src/sage/libs/flint/fmpz_mod_poly.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpz_mod_poly.h diff --git a/src/sage/libs/flint/fmpz_poly.pxd b/src/sage/libs/flint/fmpz_poly.pxd index fa3a92cff94..7f559e68bdc 100644 --- a/src/sage/libs/flint/fmpz_poly.pxd +++ b/src/sage/libs/flint/fmpz_poly.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpz_poly.h diff --git a/src/sage/libs/flint/fmpz_poly.pyx b/src/sage/libs/flint/fmpz_poly.pyx index 79dc1d7ddbf..cadfde73bdb 100644 --- a/src/sage/libs/flint/fmpz_poly.pyx +++ b/src/sage/libs/flint/fmpz_poly.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: extra_compile_args = -D_XPG6 """ FLINT fmpz_poly class wrapper diff --git a/src/sage/libs/flint/fmpz_poly_mat.pxd b/src/sage/libs/flint/fmpz_poly_mat.pxd index 37b34d25d96..b7a990aeead 100644 --- a/src/sage/libs/flint/fmpz_poly_mat.pxd +++ b/src/sage/libs/flint/fmpz_poly_mat.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpz_poly_mat.h diff --git a/src/sage/libs/flint/fmpz_poly_q.pxd b/src/sage/libs/flint/fmpz_poly_q.pxd index 2baa62df050..337ae02f3fa 100644 --- a/src/sage/libs/flint/fmpz_poly_q.pxd +++ b/src/sage/libs/flint/fmpz_poly_q.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/qadic.h diff --git a/src/sage/libs/flint/fmpz_vec.pxd b/src/sage/libs/flint/fmpz_vec.pxd index fd5aacf74cc..db4965c89f3 100644 --- a/src/sage/libs/flint/fmpz_vec.pxd +++ b/src/sage/libs/flint/fmpz_vec.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fmpz_vec.h diff --git a/src/sage/libs/flint/fq.pxd b/src/sage/libs/flint/fq.pxd index 0b83f43692c..4d2625d7277 100644 --- a/src/sage/libs/flint/fq.pxd +++ b/src/sage/libs/flint/fq.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fq.h diff --git a/src/sage/libs/flint/fq_nmod.pxd b/src/sage/libs/flint/fq_nmod.pxd index 7dfa9dc3e65..1d769595232 100644 --- a/src/sage/libs/flint/fq_nmod.pxd +++ b/src/sage/libs/flint/fq_nmod.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/fq_nmod.h diff --git a/src/sage/libs/flint/nmod_poly.pxd b/src/sage/libs/flint/nmod_poly.pxd index d8f97837895..cc2b938db5f 100644 --- a/src/sage/libs/flint/nmod_poly.pxd +++ b/src/sage/libs/flint/nmod_poly.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/nmod_poly.h diff --git a/src/sage/libs/flint/nmod_poly_linkage.pxi b/src/sage/libs/flint/nmod_poly_linkage.pxi index 74e276dd1f6..a17cc31e6cb 100644 --- a/src/sage/libs/flint/nmod_poly_linkage.pxi +++ b/src/sage/libs/flint/nmod_poly_linkage.pxi @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint r""" Linkage for arithmetic with FLINT's nmod_poly_t elements. diff --git a/src/sage/libs/flint/nmod_vec.pxd b/src/sage/libs/flint/nmod_vec.pxd index c400a74e866..3cdd01afbfb 100644 --- a/src/sage/libs/flint/nmod_vec.pxd +++ b/src/sage/libs/flint/nmod_vec.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/nmod_vec.h diff --git a/src/sage/libs/flint/ntl_interface.pxd b/src/sage/libs/flint/ntl_interface.pxd index 1513f85a00a..dc27e44d9fd 100644 --- a/src/sage/libs/flint/ntl_interface.pxd +++ b/src/sage/libs/flint/ntl_interface.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: language = c++ # distutils: libraries = flint # distutils: depends = flint/NTL-interface.h diff --git a/src/sage/libs/flint/padic.pxd b/src/sage/libs/flint/padic.pxd index a6dce86bc73..4699a768e76 100644 --- a/src/sage/libs/flint/padic.pxd +++ b/src/sage/libs/flint/padic.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/qadic.h diff --git a/src/sage/libs/flint/padic_poly.pxd b/src/sage/libs/flint/padic_poly.pxd index 039f478cf5d..e5a4c0866cb 100644 --- a/src/sage/libs/flint/padic_poly.pxd +++ b/src/sage/libs/flint/padic_poly.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/padic_poly.h diff --git a/src/sage/libs/flint/qadic.pxd b/src/sage/libs/flint/qadic.pxd index e8cd305d4a3..29534b98594 100644 --- a/src/sage/libs/flint/qadic.pxd +++ b/src/sage/libs/flint/qadic.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/qadic.h diff --git a/src/sage/libs/flint/thread_pool.pxd b/src/sage/libs/flint/thread_pool.pxd index c27dff6c1f3..517dacd2284 100644 --- a/src/sage/libs/flint/thread_pool.pxd +++ b/src/sage/libs/flint/thread_pool.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/thread_pool.h diff --git a/src/sage/libs/flint/types.pxd b/src/sage/libs/flint/types.pxd index 37c326e7830..ef1393b1f46 100644 --- a/src/sage/libs/flint/types.pxd +++ b/src/sage/libs/flint/types.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: depends = flint/flint.h flint/fmpz.h flint/fmpz_factor.h flint/fmpz_poly.h flint/fmpz_mat.h flint/fmpq.h flint/fmpq_poly.h flint/fmpq_mat.h flint/fmpz_mod_poly.h flint/nmod_poly.h flint/fq.h flint/fq_nmod.h flint/ulong_extras.h flint/padic.h flint/padic_poly.h flint/qadic.h flint/fmpz_poly_q.h """ diff --git a/src/sage/libs/flint/ulong_extras.pxd b/src/sage/libs/flint/ulong_extras.pxd index 2d53d48733c..9f3a627c123 100644 --- a/src/sage/libs/flint/ulong_extras.pxd +++ b/src/sage/libs/flint/ulong_extras.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint # distutils: depends = flint/ulong_extras.h diff --git a/src/sage/libs/flint/ulong_extras.pyx b/src/sage/libs/flint/ulong_extras.pyx index 861fb835b59..6cb909ed3b1 100644 --- a/src/sage/libs/flint/ulong_extras.pyx +++ b/src/sage/libs/flint/ulong_extras.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint def n_factor_to_list(unsigned long n, int proved): """ A wrapper around ``n_factor``. diff --git a/src/sage/matrix/all__sagemath_flint_arb.py b/src/sage/matrix/all__sagemath_flint_arb.py index 07b83b001f9..d31bae41036 100644 --- a/src/sage/matrix/all__sagemath_flint_arb.py +++ b/src/sage/matrix/all__sagemath_flint_arb.py @@ -1 +1 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint diff --git a/src/sage/matrix/matrix_complex_ball_dense.pxd b/src/sage/matrix/matrix_complex_ball_dense.pxd index 103dd4f21da..bcedd07e4bf 100644 --- a/src/sage/matrix/matrix_complex_ball_dense.pxd +++ b/src/sage/matrix/matrix_complex_ball_dense.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint from sage.libs.arb.types cimport acb_mat_t from .matrix_dense cimport Matrix_dense from sage.matrix.matrix_generic_dense cimport Matrix_generic_dense diff --git a/src/sage/matrix/matrix_complex_ball_dense.pyx b/src/sage/matrix/matrix_complex_ball_dense.pyx index 3ad61275d51..6942442b5d5 100644 --- a/src/sage/matrix/matrix_complex_ball_dense.pyx +++ b/src/sage/matrix/matrix_complex_ball_dense.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = ARB_LIBRARY r""" Arbitrary precision complex ball matrices using Arb diff --git a/src/sage/rings/all__sagemath_flint_arb.py b/src/sage/rings/all__sagemath_flint_arb.py index 07b83b001f9..d31bae41036 100644 --- a/src/sage/rings/all__sagemath_flint_arb.py +++ b/src/sage/rings/all__sagemath_flint_arb.py @@ -1 +1 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint diff --git a/src/sage/rings/complex_arb.pxd b/src/sage/rings/complex_arb.pxd index 2b4c1187390..9d22be15cc7 100644 --- a/src/sage/rings/complex_arb.pxd +++ b/src/sage/rings/complex_arb.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint from sage.libs.arb.acb cimport acb_t from sage.rings.complex_interval cimport ComplexIntervalFieldElement from sage.rings.real_arb cimport RealBall diff --git a/src/sage/rings/complex_arb.pyx b/src/sage/rings/complex_arb.pyx index c4130f54dbf..46abe213915 100644 --- a/src/sage/rings/complex_arb.pyx +++ b/src/sage/rings/complex_arb.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint r""" Arbitrary precision complex balls using Arb diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pxd b/src/sage/rings/number_field/number_field_element_quadratic.pxd index c2343de159b..14b437b43c7 100644 --- a/src/sage/rings/number_field/number_field_element_quadratic.pxd +++ b/src/sage/rings/number_field/number_field_element_quadratic.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint from sage.libs.gmp.types cimport mpz_t from sage.libs.arb.types cimport arb_t from sage.rings.integer cimport Integer diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pyx b/src/sage/rings/number_field/number_field_element_quadratic.pyx index 49448502716..197ce7b879d 100644 --- a/src/sage/rings/number_field/number_field_element_quadratic.pyx +++ b/src/sage/rings/number_field/number_field_element_quadratic.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = NTL_LIBRARIES # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/rings/padics/qadic_flint_FP.pyx b/src/sage/rings/padics/qadic_flint_FP.pyx index 99f2dfd7614..024e6c79351 100644 --- a/src/sage/rings/padics/qadic_flint_FP.pyx +++ b/src/sage/rings/padics/qadic_flint_FP.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint include "sage/libs/linkages/padics/fmpz_poly_unram.pxi" diff --git a/src/sage/rings/polynomial/evaluation_flint.pyx b/src/sage/rings/polynomial/evaluation_flint.pyx index d36b5966b9c..5453aa60ae8 100644 --- a/src/sage/rings/polynomial/evaluation_flint.pyx +++ b/src/sage/rings/polynomial/evaluation_flint.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint # distutils: libraries = flint r""" Fast evaluation of polynomials (Horner's rule) diff --git a/src/sage/rings/polynomial/polynomial_complex_arb.pxd b/src/sage/rings/polynomial/polynomial_complex_arb.pxd index 9b46c397072..7518077a737 100644 --- a/src/sage/rings/polynomial/polynomial_complex_arb.pxd +++ b/src/sage/rings/polynomial/polynomial_complex_arb.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint from sage.libs.arb.acb_poly cimport * from sage.rings.polynomial.polynomial_element cimport Polynomial diff --git a/src/sage/rings/polynomial/polynomial_complex_arb.pyx b/src/sage/rings/polynomial/polynomial_complex_arb.pyx index 574476e17bd..7feb013d785 100644 --- a/src/sage/rings/polynomial/polynomial_complex_arb.pyx +++ b/src/sage/rings/polynomial/polynomial_complex_arb.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint r""" Univariate polynomials over `\CC` with interval coefficients using Arb. diff --git a/src/sage/rings/real_arb.pxd b/src/sage/rings/real_arb.pxd index 76ffb95a98d..6eaea044b32 100644 --- a/src/sage/rings/real_arb.pxd +++ b/src/sage/rings/real_arb.pxd @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint from sage.libs.arb.arb cimport arb_t from sage.libs.mpfi.types cimport mpfi_t from sage.rings.real_mpfi cimport RealIntervalField_class, RealIntervalFieldElement diff --git a/src/sage/rings/real_arb.pyx b/src/sage/rings/real_arb.pyx index f51c5f33a70..d042775b39c 100644 --- a/src/sage/rings/real_arb.pyx +++ b/src/sage/rings/real_arb.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sagemath-flint-arb +# sage_setup: distribution = sagemath-flint r""" Arbitrary precision real balls using Arb From 01681c16cb64a809f45d1ae965eeb02a42d9f0bb Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 18:03:02 -0700 Subject: [PATCH 37/60] Fix up setup.py imports --- pkgs/sagemath-flint/setup.py | 2 +- pkgs/sagemath-gap/setup.py | 5 ++++- pkgs/sagemath-giac/setup.py | 2 +- pkgs/sagemath-homfly/setup.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/sagemath-flint/setup.py b/pkgs/sagemath-flint/setup.py index 7edf74f3f2e..dfac3a0765b 100644 --- a/pkgs/sagemath-flint/setup.py +++ b/pkgs/sagemath-flint/setup.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys from distutils import log from setuptools import setup @@ -20,7 +21,6 @@ pass # PEP 517 builds do not have . in sys.path -import sys sys.path.insert(0, os.path.dirname(__file__)) if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): diff --git a/pkgs/sagemath-gap/setup.py b/pkgs/sagemath-gap/setup.py index 50872742e74..aab5159d46d 100644 --- a/pkgs/sagemath-gap/setup.py +++ b/pkgs/sagemath-gap/setup.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys from distutils import log from setuptools import setup @@ -19,7 +20,9 @@ except ImportError: pass -import sys +# PEP 517 builds do not have . in sys.path +sys.path.insert(0, os.path.dirname(__file__)) + from sage_setup.excepthook import excepthook sys.excepthook = excepthook diff --git a/pkgs/sagemath-giac/setup.py b/pkgs/sagemath-giac/setup.py index b30a2dcafff..c4e77e12ae2 100644 --- a/pkgs/sagemath-giac/setup.py +++ b/pkgs/sagemath-giac/setup.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys from distutils import log from setuptools import setup @@ -20,7 +21,6 @@ pass # PEP 517 builds do not have . in sys.path -import sys sys.path.insert(0, os.path.dirname(__file__)) if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): diff --git a/pkgs/sagemath-homfly/setup.py b/pkgs/sagemath-homfly/setup.py index a5f750f51e2..4285ae2e5c2 100644 --- a/pkgs/sagemath-homfly/setup.py +++ b/pkgs/sagemath-homfly/setup.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys from distutils import log from setuptools import setup @@ -20,7 +21,6 @@ pass # PEP 517 builds do not have . in sys.path -import sys sys.path.insert(0, os.path.dirname(__file__)) if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): From 44bd958734b165e645972d0f5ba76d40427798a9 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 18:12:06 -0700 Subject: [PATCH 38/60] Update versions to 10.0 --- build/pkgs/sagemath_flint/install-requires.txt | 2 +- build/pkgs/sagemath_gap/install-requires.txt | 2 +- build/pkgs/sagemath_giac/install-requires.txt | 2 +- build/pkgs/sagemath_homfly/install-requires.txt | 2 +- pkgs/sagemath-flint/VERSION.txt | 2 +- pkgs/sagemath-gap/VERSION.txt | 2 +- pkgs/sagemath-giac/VERSION.txt | 2 +- pkgs/sagemath-homfly/VERSION.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/pkgs/sagemath_flint/install-requires.txt b/build/pkgs/sagemath_flint/install-requires.txt index c4018e433ca..d1e5f7052f5 100644 --- a/build/pkgs/sagemath_flint/install-requires.txt +++ b/build/pkgs/sagemath_flint/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-flint +sagemath-flint ~= 10.0 diff --git a/build/pkgs/sagemath_gap/install-requires.txt b/build/pkgs/sagemath_gap/install-requires.txt index cd272703256..228eac70b53 100644 --- a/build/pkgs/sagemath_gap/install-requires.txt +++ b/build/pkgs/sagemath_gap/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-gap +sagemath-gap ~= 10.0 diff --git a/build/pkgs/sagemath_giac/install-requires.txt b/build/pkgs/sagemath_giac/install-requires.txt index 34fe03aff44..d823b1a7807 100644 --- a/build/pkgs/sagemath_giac/install-requires.txt +++ b/build/pkgs/sagemath_giac/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-giac +sagemath-giac ~= 10.0 diff --git a/build/pkgs/sagemath_homfly/install-requires.txt b/build/pkgs/sagemath_homfly/install-requires.txt index 673190afad7..2845344e07d 100644 --- a/build/pkgs/sagemath_homfly/install-requires.txt +++ b/build/pkgs/sagemath_homfly/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-homfly +sagemath-homfly ~= 10.0 diff --git a/pkgs/sagemath-flint/VERSION.txt b/pkgs/sagemath-flint/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-flint/VERSION.txt +++ b/pkgs/sagemath-flint/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 diff --git a/pkgs/sagemath-gap/VERSION.txt b/pkgs/sagemath-gap/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-gap/VERSION.txt +++ b/pkgs/sagemath-gap/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 diff --git a/pkgs/sagemath-giac/VERSION.txt b/pkgs/sagemath-giac/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-giac/VERSION.txt +++ b/pkgs/sagemath-giac/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 diff --git a/pkgs/sagemath-homfly/VERSION.txt b/pkgs/sagemath-homfly/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-homfly/VERSION.txt +++ b/pkgs/sagemath-homfly/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 From 3e50fae6835247d647e641883d110ced75c26a03 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 19:26:58 -0700 Subject: [PATCH 39/60] Fix up MANIFEST.in --- pkgs/sagemath-flint/MANIFEST.in | 6 ++++++ pkgs/sagemath-gap/MANIFEST.in | 8 +++++++- pkgs/sagemath-giac/MANIFEST.in | 3 ++- pkgs/sagemath-giac/setup.cfg.m4 | 12 ++++++++++++ ..._sagemath_flint_arb.py => all__sagemath_flint.py} | 0 src/sage/groups/matrix_gps/all__sagemath_gap.py | 0 ..._sagemath_flint_arb.py => all__sagemath_flint.py} | 0 ..._sagemath_flint_arb.py => all__sagemath_flint.py} | 0 ..._sagemath_flint_arb.py => all__sagemath_flint.py} | 0 src/sage/rings/all__sagemath_gap.py | 0 src/sage/rings/polynomial/all__sagemath_flint.py | 0 11 files changed, 27 insertions(+), 2 deletions(-) rename src/sage/{all__sagemath_flint_arb.py => all__sagemath_flint.py} (100%) create mode 100644 src/sage/groups/matrix_gps/all__sagemath_gap.py rename src/sage/libs/{all__sagemath_flint_arb.py => all__sagemath_flint.py} (100%) rename src/sage/matrix/{all__sagemath_flint_arb.py => all__sagemath_flint.py} (100%) rename src/sage/rings/{all__sagemath_flint_arb.py => all__sagemath_flint.py} (100%) create mode 100644 src/sage/rings/all__sagemath_gap.py create mode 100644 src/sage/rings/polynomial/all__sagemath_flint.py diff --git a/pkgs/sagemath-flint/MANIFEST.in b/pkgs/sagemath-flint/MANIFEST.in index fff7a6c7141..12c9c52331e 100644 --- a/pkgs/sagemath-flint/MANIFEST.in +++ b/pkgs/sagemath-flint/MANIFEST.in @@ -6,11 +6,17 @@ global-include all__sagemath_flint.py graft sage/libs/arb graft sage/libs/flint recursive-include sage/libs/gsl *.pxd # FIXME +include sage/libs/gsl/__init__.p* # FIXME +include sage/libs/gsl/all.p* # FIXME +include sage/libs/gsl/complex/all.py # FIXME recursive-include sage/libs/mpfr *.pxd # FIXME +include sage/libs/mpfr/all.py # FIXME recursive-include sage/libs/mpfi *.pxd # FIXME +include sage/libs/mpfi/all.py # FIXME recursive-include sage/matrix *.pxd # FIXME include sage/matrix/matrix_complex_ball_dense.p* include sage/misc/binary_tree.p* # FIXME +include sage/misc/all.py # FIXME recursive-include sage/rings *.pxd # FIXME include sage/rings/complex_arb.p* include sage/rings/integer_fake.h # FIXME diff --git a/pkgs/sagemath-gap/MANIFEST.in b/pkgs/sagemath-gap/MANIFEST.in index 056b6a1fd7a..d253c9c128d 100644 --- a/pkgs/sagemath-gap/MANIFEST.in +++ b/pkgs/sagemath-gap/MANIFEST.in @@ -8,16 +8,22 @@ include sage/combinat/enumeration_mod_permgroup.p* include sage/combinat/root_system/reflection_group*.p* graft sage/data_structures # FIXME recursive-include sage/graphs *.pxd # FIXME +include sage/graphs/all.py # FIXME +include sage/graphs/base/all.py # FIXME include sage/graphs/spanning_tree.p* graft sage/groups/perm_gps include sage/groups/libgap_wrapper.p* -include sage/groups/matrix_gps/group_element.p* +include sage/groups/matrix_gps/group_element.pxd # FIXME +include sage/groups/matrix_gps/*_gap.* +include sage/groups/semimonomial_transformations/all.py # FIXME recursive-include sage/groups/semimonomial_transformations *.pxd # FIXME graft sage/libs/gap recursive-include sage/matrix *.pxd # FIXME include sage/matrix/matrix_gap.p* recursive-include sage/modules *.pxd # FIXME +include sage/modules/all.py # FIXME recursive-include sage/rings *.pxd # FIXME +include sage/rings/polynomial/all.py # FIXME include sage/sets/disjoint_set.p* global-exclude *.c diff --git a/pkgs/sagemath-giac/MANIFEST.in b/pkgs/sagemath-giac/MANIFEST.in index 5b5ef0cb3f0..8a5d5f1023c 100644 --- a/pkgs/sagemath-giac/MANIFEST.in +++ b/pkgs/sagemath-giac/MANIFEST.in @@ -4,7 +4,8 @@ prune sage global-include all__sagemath_giac.py graft sage/libs/giac -recursive-include sage/rings *.pxd # FIXME +include sage/rings/*.pxd # FIXME +include sage/rings/all.py # FIXME global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-giac/setup.cfg.m4 b/pkgs/sagemath-giac/setup.cfg.m4 index 6b102f60866..921d4d98893 100644 --- a/pkgs/sagemath-giac/setup.cfg.m4 +++ b/pkgs/sagemath-giac/setup.cfg.m4 @@ -31,3 +31,15 @@ install_requires = esyscmd(`sage-get-system-packages install-requires \ sagemath_categories \ | sed "2,\$s/^/ /;"')dnl + +packages = + sage.libs.giac + sage.rings + +[options.package_data] + +sage.libs.giac = + *.pxd + +sage.rings = + *.pxd diff --git a/src/sage/all__sagemath_flint_arb.py b/src/sage/all__sagemath_flint.py similarity index 100% rename from src/sage/all__sagemath_flint_arb.py rename to src/sage/all__sagemath_flint.py diff --git a/src/sage/groups/matrix_gps/all__sagemath_gap.py b/src/sage/groups/matrix_gps/all__sagemath_gap.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/all__sagemath_flint_arb.py b/src/sage/libs/all__sagemath_flint.py similarity index 100% rename from src/sage/libs/all__sagemath_flint_arb.py rename to src/sage/libs/all__sagemath_flint.py diff --git a/src/sage/matrix/all__sagemath_flint_arb.py b/src/sage/matrix/all__sagemath_flint.py similarity index 100% rename from src/sage/matrix/all__sagemath_flint_arb.py rename to src/sage/matrix/all__sagemath_flint.py diff --git a/src/sage/rings/all__sagemath_flint_arb.py b/src/sage/rings/all__sagemath_flint.py similarity index 100% rename from src/sage/rings/all__sagemath_flint_arb.py rename to src/sage/rings/all__sagemath_flint.py diff --git a/src/sage/rings/all__sagemath_gap.py b/src/sage/rings/all__sagemath_gap.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/rings/polynomial/all__sagemath_flint.py b/src/sage/rings/polynomial/all__sagemath_flint.py new file mode 100644 index 00000000000..e69de29bb2d From bc39798fb34328fc914e0637c590c8690b873770 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 20:21:36 -0700 Subject: [PATCH 40/60] src/sage/rings/padics/qadic_flint_*.p*: Add '# sage_setup: distribution' --- src/sage/rings/padics/all__sagemath_flint.py | 0 src/sage/rings/padics/qadic_flint_CA.pxd | 2 ++ src/sage/rings/padics/qadic_flint_CA.pyx | 2 ++ src/sage/rings/padics/qadic_flint_CR.pxd | 2 ++ src/sage/rings/padics/qadic_flint_CR.pyx | 2 ++ src/sage/rings/padics/qadic_flint_FM.pxd | 2 ++ src/sage/rings/padics/qadic_flint_FM.pyx | 2 ++ src/sage/rings/padics/qadic_flint_FP.pxd | 2 ++ 8 files changed, 14 insertions(+) create mode 100644 src/sage/rings/padics/all__sagemath_flint.py diff --git a/src/sage/rings/padics/all__sagemath_flint.py b/src/sage/rings/padics/all__sagemath_flint.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/rings/padics/qadic_flint_CA.pxd b/src/sage/rings/padics/qadic_flint_CA.pxd index 56cd4dbc03d..be524b9b302 100644 --- a/src/sage/rings/padics/qadic_flint_CA.pxd +++ b/src/sage/rings/padics/qadic_flint_CA.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-flint + from cypari2.gen cimport Gen as pari_gen from sage.libs.flint.types cimport fmpz_poly_t from sage.rings.padics.pow_computer_flint cimport PowComputer_flint_unram diff --git a/src/sage/rings/padics/qadic_flint_CA.pyx b/src/sage/rings/padics/qadic_flint_CA.pyx index 3e4d01fcad1..7faff95ce86 100644 --- a/src/sage/rings/padics/qadic_flint_CA.pyx +++ b/src/sage/rings/padics/qadic_flint_CA.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-flint + include "sage/libs/linkages/padics/fmpz_poly_unram.pxi" include "sage/libs/linkages/padics/unram_shared.pxi" include "CA_template.pxi" diff --git a/src/sage/rings/padics/qadic_flint_CR.pxd b/src/sage/rings/padics/qadic_flint_CR.pxd index 1f1765bc61c..6a6ad8d1228 100644 --- a/src/sage/rings/padics/qadic_flint_CR.pxd +++ b/src/sage/rings/padics/qadic_flint_CR.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-flint + from cypari2.gen cimport Gen as pari_gen from sage.libs.flint.types cimport fmpz_poly_t from sage.rings.padics.pow_computer_flint cimport PowComputer_flint_unram diff --git a/src/sage/rings/padics/qadic_flint_CR.pyx b/src/sage/rings/padics/qadic_flint_CR.pyx index c20fa087424..57d5d9a8007 100644 --- a/src/sage/rings/padics/qadic_flint_CR.pyx +++ b/src/sage/rings/padics/qadic_flint_CR.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-flint + include "sage/libs/linkages/padics/fmpz_poly_unram.pxi" include "sage/libs/linkages/padics/unram_shared.pxi" include "CR_template.pxi" diff --git a/src/sage/rings/padics/qadic_flint_FM.pxd b/src/sage/rings/padics/qadic_flint_FM.pxd index 7c2facd3aaa..dc2787aecbc 100644 --- a/src/sage/rings/padics/qadic_flint_FM.pxd +++ b/src/sage/rings/padics/qadic_flint_FM.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-flint + from cypari2.gen cimport Gen as pari_gen from sage.libs.flint.types cimport fmpz_poly_t from sage.rings.padics.qadic_flint_FP cimport FPElement diff --git a/src/sage/rings/padics/qadic_flint_FM.pyx b/src/sage/rings/padics/qadic_flint_FM.pyx index 0a5e0563101..819225f8f8e 100644 --- a/src/sage/rings/padics/qadic_flint_FM.pyx +++ b/src/sage/rings/padics/qadic_flint_FM.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-flint + include "sage/libs/linkages/padics/fmpz_poly_unram.pxi" include "sage/libs/linkages/padics/unram_shared.pxi" include "FM_template.pxi" diff --git a/src/sage/rings/padics/qadic_flint_FP.pxd b/src/sage/rings/padics/qadic_flint_FP.pxd index 1a25be2fc08..6137e80f35c 100644 --- a/src/sage/rings/padics/qadic_flint_FP.pxd +++ b/src/sage/rings/padics/qadic_flint_FP.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-flint + from cypari2.gen cimport Gen as pari_gen from sage.libs.flint.fmpz_poly cimport fmpz_poly_t from sage.rings.padics.pow_computer_flint cimport PowComputer_flint_unram From 7d3234d677fd968036674500f6ec636fcf4b5d36 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 20:22:54 -0700 Subject: [PATCH 41/60] pkgs/sagemath-flint: Fix up MANIFEST.in, package_data --- pkgs/sagemath-flint/MANIFEST.in | 19 +++++++---- pkgs/sagemath-flint/setup.cfg.m4 | 33 +++++++++++++++++++ .../rings/number_field/all__sagemath_flint.py | 0 3 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 src/sage/rings/number_field/all__sagemath_flint.py diff --git a/pkgs/sagemath-flint/MANIFEST.in b/pkgs/sagemath-flint/MANIFEST.in index 12c9c52331e..f91f0aa5d12 100644 --- a/pkgs/sagemath-flint/MANIFEST.in +++ b/pkgs/sagemath-flint/MANIFEST.in @@ -13,18 +13,25 @@ recursive-include sage/libs/mpfr *.pxd include sage/libs/mpfr/all.py # FIXME recursive-include sage/libs/mpfi *.pxd # FIXME include sage/libs/mpfi/all.py # FIXME +recursive-include sage/libs/pari *.pxd # FIXME +include sage/libs/pari/all.py # FIXME +graft sage/libs/linkages # FIXME recursive-include sage/matrix *.pxd # FIXME include sage/matrix/matrix_complex_ball_dense.p* include sage/misc/binary_tree.p* # FIXME include sage/misc/all.py # FIXME recursive-include sage/rings *.pxd # FIXME -include sage/rings/complex_arb.p* +include sage/rings/*_arb.p* +include sage/rings/finite_rings/*.pxd # FIXME +include sage/rings/finite_rings/integer_mod_limits.h # FIXME +include sage/rings/finite_rings/all.py # FIXME include sage/rings/integer_fake.h # FIXME -include sage/rings/number_field/number_field_element_quadratic.p* -include sage/rings/padics/qadic_flint_FP.p* -include sage/rings/polynomial/evaluation_flint.p* -include sage/rings/polynomial/polynomial_complex_arb.p* -include sage/rings/real_arb.p* +#include sage/rings/number_field/number_field_element_quadratic.p* #### this is entangled with NTL +include sage/rings/padics/*_flint_*.p* +include sage/rings/padics/*.pxd # FIXME +include sage/rings/padics/*.pxi # FIXME +include sage/rings/polynomial/*_flint.p* +include sage/rings/polynomial/*_arb.p* global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-flint/setup.cfg.m4 b/pkgs/sagemath-flint/setup.cfg.m4 index 60a29148fec..8808f33deb7 100644 --- a/pkgs/sagemath-flint/setup.cfg.m4 +++ b/pkgs/sagemath-flint/setup.cfg.m4 @@ -31,3 +31,36 @@ install_requires = esyscmd(`sage-get-system-packages install-requires \ sagemath_categories \ | sed "2,\$s/^/ /;"')dnl + +packages = + sage.libs.arb + sage.libs.flint + sage.matrix + sage.rings + sage.rings.number_field + sage.rings.padics + sage.rings.polynomial + +[options.package_data] + +sage.libs.arb = + *.pxd + +sage.libs.flint = + *.pxd + +sage.matrix = + matrix_complex_ball_dense.pxd + +sage.rings = + *_arb.pxd + +sage.rings.number_field = + number_field_element_quadratic.pxd + +sage.rings.padics = + *_flint_*.pxd + +sage.rings.polynomial = + *_flint.pxd + *_arb.pxd diff --git a/src/sage/rings/number_field/all__sagemath_flint.py b/src/sage/rings/number_field/all__sagemath_flint.py new file mode 100644 index 00000000000..e69de29bb2d From f6b241a98f7c055396481e4e56e0f8af18d63fd3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 20:51:08 -0700 Subject: [PATCH 42/60] src/sage/groups/matrix_gps/*_gap*.p*: Add '# sage_setup: distribution' --- src/sage/groups/matrix_gps/finitely_generated_gap.py | 2 ++ src/sage/groups/matrix_gps/group_element_gap.pyx | 2 ++ src/sage/groups/matrix_gps/linear_gap.py | 2 ++ src/sage/groups/matrix_gps/matrix_group_gap.py | 2 ++ src/sage/groups/matrix_gps/named_group_gap.py | 2 ++ src/sage/groups/matrix_gps/orthogonal_gap.py | 2 ++ src/sage/groups/matrix_gps/symplectic_gap.py | 2 ++ src/sage/groups/matrix_gps/unitary_gap.py | 2 ++ 8 files changed, 16 insertions(+) diff --git a/src/sage/groups/matrix_gps/finitely_generated_gap.py b/src/sage/groups/matrix_gps/finitely_generated_gap.py index a58ff05291d..e483a00b6f5 100644 --- a/src/sage/groups/matrix_gps/finitely_generated_gap.py +++ b/src/sage/groups/matrix_gps/finitely_generated_gap.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-gap + """ Finitely Generated Matrix Groups with GAP """ diff --git a/src/sage/groups/matrix_gps/group_element_gap.pyx b/src/sage/groups/matrix_gps/group_element_gap.pyx index 7aba88e9b88..5c64befa46d 100644 --- a/src/sage/groups/matrix_gps/group_element_gap.pyx +++ b/src/sage/groups/matrix_gps/group_element_gap.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-gap + r""" Matrix group elements implemented in GAP """ diff --git a/src/sage/groups/matrix_gps/linear_gap.py b/src/sage/groups/matrix_gps/linear_gap.py index 37d33d5d2be..b66a295e31b 100644 --- a/src/sage/groups/matrix_gps/linear_gap.py +++ b/src/sage/groups/matrix_gps/linear_gap.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-gap + """ Linear Groups with GAP """ diff --git a/src/sage/groups/matrix_gps/matrix_group_gap.py b/src/sage/groups/matrix_gps/matrix_group_gap.py index b4c06acbd0f..2137264bd74 100644 --- a/src/sage/groups/matrix_gps/matrix_group_gap.py +++ b/src/sage/groups/matrix_gps/matrix_group_gap.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-gap + r""" Matrix group over a ring that GAP understands """ diff --git a/src/sage/groups/matrix_gps/named_group_gap.py b/src/sage/groups/matrix_gps/named_group_gap.py index b8b1f54722c..94372fe22a2 100644 --- a/src/sage/groups/matrix_gps/named_group_gap.py +++ b/src/sage/groups/matrix_gps/named_group_gap.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-gap + """ Base for Classical Matrix Groups with GAP """ diff --git a/src/sage/groups/matrix_gps/orthogonal_gap.py b/src/sage/groups/matrix_gps/orthogonal_gap.py index 17dabb698f2..f17999f6f76 100644 --- a/src/sage/groups/matrix_gps/orthogonal_gap.py +++ b/src/sage/groups/matrix_gps/orthogonal_gap.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-gap + r""" Orthogonal Linear Groups with GAP """ diff --git a/src/sage/groups/matrix_gps/symplectic_gap.py b/src/sage/groups/matrix_gps/symplectic_gap.py index adeefea218f..62decc0370a 100644 --- a/src/sage/groups/matrix_gps/symplectic_gap.py +++ b/src/sage/groups/matrix_gps/symplectic_gap.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-gap + """ Symplectic Linear Groups with GAP """ diff --git a/src/sage/groups/matrix_gps/unitary_gap.py b/src/sage/groups/matrix_gps/unitary_gap.py index 02b0456decb..aebbd771aa7 100644 --- a/src/sage/groups/matrix_gps/unitary_gap.py +++ b/src/sage/groups/matrix_gps/unitary_gap.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-gap + r""" Unitary Groups `GU(n,q)` and `SU(n,q)` with GAP """ From 0c21fffe3e7334d8a8c335215f8f23608d1d9678 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 23 May 2023 12:35:25 -0700 Subject: [PATCH 43/60] build/pkgs/sagemath_pari, pkgs/sagemath-pari: New --- .gitignore | 3 + build/make/Makefile.in | 3 +- build/pkgs/sagemath_pari/SPKG.rst | 1 + build/pkgs/sagemath_pari/bootstrap | 1 + build/pkgs/sagemath_pari/dependencies | 1 + build/pkgs/sagemath_pari/install-requires.txt | 2 + build/pkgs/sagemath_pari/package-version.txt | 1 + build/pkgs/sagemath_pari/spkg-install | 30 +++++++++ build/pkgs/sagemath_pari/spkg-src | 24 +++++++ build/pkgs/sagemath_pari/src | 1 + build/pkgs/sagemath_pari/type | 1 + pkgs/sagemath-pari/MANIFEST.in | 66 +++++++++++++++++++ pkgs/sagemath-pari/README.rst | 30 +++++++++ pkgs/sagemath-pari/VERSION.txt | 1 + pkgs/sagemath-pari/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-pari/requirements.txt | 2 + pkgs/sagemath-pari/requirements.txt.m4 | 2 + pkgs/sagemath-pari/sage | 1 + pkgs/sagemath-pari/setup.cfg.m4 | 37 +++++++++++ pkgs/sagemath-pari/setup.py | 64 ++++++++++++++++++ pkgs/sagemath-pari/tox.ini | 64 ++++++++++++++++++ src/sage/all__sagemath_pari.py | 0 src/sage/libs/all__sagemath_pari.py | 0 src/sage/libs/pari/convert_gmp.pxd | 2 + src/sage/libs/pari/convert_gmp.pyx | 2 + src/sage/libs/pari/convert_sage.pxd | 2 + src/sage/libs/pari/convert_sage.pyx | 2 + .../libs/pari/convert_sage_real_double.pxd | 2 + .../libs/pari/convert_sage_real_double.pyx | 2 + src/sage/libs/pari/misc.pxd | 2 + src/sage/libs/pari/misc.pyx | 2 + src/sage/libs/pari/tests.py | 2 + src/sage/rings/all__sagemath_pari.py | 0 .../rings/finite_rings/all__sagemath_pari.py | 0 .../rings/finite_rings/element_pari_ffelt.pxd | 2 + .../rings/finite_rings/element_pari_ffelt.pyx | 2 + .../rings/number_field/all__sagemath_pari.py | 0 src/sage/rings/number_field/totallyreal.pyx | 2 + .../rings/number_field/totallyreal_data.pxd | 2 + .../rings/number_field/totallyreal_data.pyx | 2 + .../rings/number_field/totallyreal_rel.py | 2 + src/sage/rings/padics/all__sagemath_pari.py | 0 src/sage/rings/padics/common_conversion.pyx | 2 + .../padics/padic_capped_absolute_element.pyx | 2 + .../padics/padic_capped_relative_element.pyx | 2 + .../rings/padics/padic_fixed_mod_element.pyx | 2 + .../padics/padic_floating_point_element.pyx | 2 + src/sage/rings/power_series_pari.pxd | 2 + src/sage/rings/power_series_pari.pyx | 2 + src/sage/rings/real_mpfr.pxd | 2 + src/sage/rings/real_mpfr.pyx | 2 + 51 files changed, 396 insertions(+), 1 deletion(-) create mode 120000 build/pkgs/sagemath_pari/SPKG.rst create mode 120000 build/pkgs/sagemath_pari/bootstrap create mode 100644 build/pkgs/sagemath_pari/dependencies create mode 100644 build/pkgs/sagemath_pari/install-requires.txt create mode 120000 build/pkgs/sagemath_pari/package-version.txt create mode 100755 build/pkgs/sagemath_pari/spkg-install create mode 100755 build/pkgs/sagemath_pari/spkg-src create mode 120000 build/pkgs/sagemath_pari/src create mode 100644 build/pkgs/sagemath_pari/type create mode 100644 pkgs/sagemath-pari/MANIFEST.in create mode 100644 pkgs/sagemath-pari/README.rst create mode 100644 pkgs/sagemath-pari/VERSION.txt create mode 100644 pkgs/sagemath-pari/pyproject.toml.m4 create mode 100644 pkgs/sagemath-pari/requirements.txt create mode 100644 pkgs/sagemath-pari/requirements.txt.m4 create mode 120000 pkgs/sagemath-pari/sage create mode 100644 pkgs/sagemath-pari/setup.cfg.m4 create mode 100644 pkgs/sagemath-pari/setup.py create mode 100644 pkgs/sagemath-pari/tox.ini create mode 100644 src/sage/all__sagemath_pari.py create mode 100644 src/sage/libs/all__sagemath_pari.py create mode 100644 src/sage/rings/all__sagemath_pari.py create mode 100644 src/sage/rings/finite_rings/all__sagemath_pari.py create mode 100644 src/sage/rings/number_field/all__sagemath_pari.py create mode 100644 src/sage/rings/padics/all__sagemath_pari.py diff --git a/.gitignore b/.gitignore index 934a441ec5f..edc7d97985e 100644 --- a/.gitignore +++ b/.gitignore @@ -182,6 +182,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-gap/setup.cfg /pkgs/sagemath-giac/setup.cfg /pkgs/sagemath-homfly/setup.cfg +/pkgs/sagemath-pari/setup.cfg /pkgs/sagemath-objects/pyproject.toml /pkgs/sagemath-categories/pyproject.toml /pkgs/sagemath-environment/pyproject.toml @@ -190,6 +191,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-gap/pyproject.toml /pkgs/sagemath-giac/pyproject.toml /pkgs/sagemath-homfly/pyproject.toml +/pkgs/sagemath-pari/pyproject.toml /pkgs/sagemath-objects/requirements.txt /pkgs/sagemath-categories/requirements.txt /pkgs/sagemath-environment/requirements.txt @@ -198,6 +200,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-gap/requirements.txt /pkgs/sagemath-giac/requirements.txt /pkgs/sagemath-homfly/requirements.txt +/pkgs/sagemath-pari/pyproject.toml /pkgs/sagemath-categories/MANIFEST.in # same for old locations - before Issue #31577 diff --git a/build/make/Makefile.in b/build/make/Makefile.in index f426d15ca14..73b212d7fcd 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -137,7 +137,8 @@ PYPI_WHEEL_PACKAGES = \ sagemath_repl \ sagemath_categories \ sagemath_giac \ - sagemath_flint \ + sagemath_flint \ + sagemath_pari \ sagemath_gap \ sagemath_homfly diff --git a/build/pkgs/sagemath_pari/SPKG.rst b/build/pkgs/sagemath_pari/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_pari/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_pari/bootstrap b/build/pkgs/sagemath_pari/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_pari/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_pari/dependencies b/build/pkgs/sagemath_pari/dependencies new file mode 100644 index 00000000000..600be46ef7a --- /dev/null +++ b/build/pkgs/sagemath_pari/dependencies @@ -0,0 +1 @@ +$(PYTHON) cypari memory_allocator | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig diff --git a/build/pkgs/sagemath_pari/install-requires.txt b/build/pkgs/sagemath_pari/install-requires.txt new file mode 100644 index 00000000000..228eac70b53 --- /dev/null +++ b/build/pkgs/sagemath_pari/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-gap ~= 10.0 diff --git a/build/pkgs/sagemath_pari/package-version.txt b/build/pkgs/sagemath_pari/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_pari/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_pari/spkg-install b/build/pkgs/sagemath_pari/spkg-install new file mode 100755 index 00000000000..81355093128 --- /dev/null +++ b/build/pkgs/sagemath_pari/spkg-install @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +rm -Rf build +# First build the sdist, then build the wheel from the sdist. +# https://pypa-build.readthedocs.io/en/latest/#python--m-build +# (Important because sagemath-objects uses MANIFEST.in for filtering.) +# Do not install the wheel. +DIST_DIR="$(mktemp -d)" +python3 -m build --outdir "$DIST_DIR"/dist . || sdh_die "Failure building sdist and wheel" +ls -l "$DIST_DIR"/dist/*.tar.gz +wheel=$(cd "$DIST_DIR" && sdh_store_wheel . && echo $wheel) +ls -l "$wheel" + +if [ "$SAGE_CHECK" != no ]; then + tox -r -v -e sagepython-sagewheels-nopypi-norequirements --installpkg $wheel +fi diff --git a/build/pkgs/sagemath_pari/spkg-src b/build/pkgs/sagemath_pari/spkg-src new file mode 100755 index 00000000000..7cc272d0867 --- /dev/null +++ b/build/pkgs/sagemath_pari/spkg-src @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# +# Script to prepare an sdist tarball for sagemath-gap +# This script is not used during build. +# +# HOW TO MAKE THE TARBALL: +# ./sage --sh build/pkgs/sagemath_pari/spkg-src + +if [ -z "$SAGE_ROOT" ] ; then + echo >&2 "Error - SAGE_ROOT undefined ... exiting" + echo >&2 "Maybe run 'sage -sh'?" + exit 1 +fi + +# Exit on failure +set -e + +cd build/pkgs/sagemath_pari + +cd src +# Get rid of old *.egg-info/SOURCES.txt +rm -Rf *.egg-info + +python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_pari/src b/build/pkgs/sagemath_pari/src new file mode 120000 index 00000000000..2b27d325fb3 --- /dev/null +++ b/build/pkgs/sagemath_pari/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-pari \ No newline at end of file diff --git a/build/pkgs/sagemath_pari/type b/build/pkgs/sagemath_pari/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_pari/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-pari/MANIFEST.in b/pkgs/sagemath-pari/MANIFEST.in new file mode 100644 index 00000000000..cffdec4c335 --- /dev/null +++ b/pkgs/sagemath-pari/MANIFEST.in @@ -0,0 +1,66 @@ +prune sage + +include VERSION.txt + +global-include all__sagemath_pari.py + +graft sage/libs/pari +exclude sage/libs/pari/convert_flint.p* +exclude sage/libs/pari/convert_sage*.p* # to be added later; needs sage.rings.{integer,rational,*_double}, sage.libs.gsl.complex +include sage/rings/integer.pxd # FIXME +include sage/rings/rational.pxd # FIXME + +include sage/rings/finite_rings/element_base.p* # FIXME +include sage/rings/finite_rings/element_pari_ffelt.p* # needs sage.rings.finite_rings.element_base +include sage/rings/number_field/totallyreal*.p* # needs sage.rings.{integer,rational} + + +include sage/misc/binary_tree.pxd # FIXME +include sage/rings/polynomial/*.pxd # FIXME +include sage/rings/power_series_ring_element.pxd # FIXME +include sage/rings/power_series_pari.p* # needs sage.rings.power_series_ring_element, sage.rings.polynomial.polynomial_element + +# +# real_mpfr; could hopefully be disentangled from cypari2 later and moved to sagemath-categories. +# +include sage/rings/real_mpfr.p* # also needs sage.libs.mpmath.utils +graft sage/libs/mpfr + +# real_mpfr dependencies +include sage/libs/mpmath/utils.pxd # FIXME +include sage/rings/abc.pxd # FIXME +include sage/rings/real_double.pxd # FIXME +include sage/arith/constants.pxd # FIXME + +# +# padics using PARI. +# +include sage/rings/padics/common_conversion.p* +include sage/rings/padics/padic_capped_*_element.p* +include sage/rings/padics/padic_floating_point_element.p* +include sage/rings/padics/padic_fixed_mod_element.p* + +# pxd dependencies for padics using PARI. +# TODO: Could as well ship all of padics (except those that additionally need FLINT or NTL) here. +include sage/libs/linkages/padics/*.pxi # FIXME? +include sage/rings/padics/pow_computer.pxd # FIXME? +include sage/rings/padics/padic_generic_element.pxd # FIXME? +include sage/rings/padics/local_generic_element.pxd # FIXME? +include sage/rings/padics/*.pxi # FIXME? + +# pxd dependencies for padics using PARI. This will later come from sagemath-categories. +include sage/arith/rational_reconstruction.pxd # FIXME +include sage/rings/morphism.pxd # FIXME + + +global-exclude *.c +global-exclude *.cpp + +global-exclude __pycache__ +global-exclude *.py[co] +global-exclude *.bak +global-exclude *.so +global-exclude *~ +prune .tox +prune build +prune dist diff --git a/pkgs/sagemath-pari/README.rst b/pkgs/sagemath-pari/README.rst new file mode 100644 index 00000000000..e126e35018c --- /dev/null +++ b/pkgs/sagemath-pari/README.rst @@ -0,0 +1,30 @@ +================================================================================== + Sage: Open Source Mathematics Software: Computational Number Theory with PARI/GP +================================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2023 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +About this pip-installable source distribution +---------------------------------------------- + +This pip-installable source distribution ``sagemath-pari`` is a small +distribution that provides modules that depend on the computer algebra +system PARI/GP. diff --git a/pkgs/sagemath-pari/VERSION.txt b/pkgs/sagemath-pari/VERSION.txt new file mode 100644 index 00000000000..2f52450b31d --- /dev/null +++ b/pkgs/sagemath-pari/VERSION.txt @@ -0,0 +1 @@ +10.0 diff --git a/pkgs/sagemath-pari/pyproject.toml.m4 b/pkgs/sagemath-pari/pyproject.toml.m4 new file mode 100644 index 00000000000..811bf51663c --- /dev/null +++ b/pkgs/sagemath-pari/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + sage_setup \ + sagemath_environment \ + sagemath_categories \ + cython \ + cysignals \ + cypari \ + memory_allocator \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-pari/requirements.txt b/pkgs/sagemath-pari/requirements.txt new file mode 100644 index 00000000000..2c13e24b8dd --- /dev/null +++ b/pkgs/sagemath-pari/requirements.txt @@ -0,0 +1,2 @@ +Cython==0.29.32 +sagemath-standard==10.0 diff --git a/pkgs/sagemath-pari/requirements.txt.m4 b/pkgs/sagemath-pari/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-pari/requirements.txt.m4 @@ -0,0 +1,2 @@ +Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') +sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-pari/sage b/pkgs/sagemath-pari/sage new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-pari/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-pari/setup.cfg.m4 b/pkgs/sagemath-pari/setup.cfg.m4 new file mode 100644 index 00000000000..e7cb564a49c --- /dev/null +++ b/pkgs/sagemath-pari/setup.cfg.m4 @@ -0,0 +1,37 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-pari +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Computational Number Theory with PARI/GP +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + cypari \ + cysignals \ + memory_allocator \ + sagemath_environment \ + sagemath_categories \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-pari/setup.py b/pkgs/sagemath-pari/setup.py new file mode 100644 index 00000000000..cd21583fd2e --- /dev/null +++ b/pkgs/sagemath-pari/setup.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python + +import sys +from distutils import log +from setuptools import setup + +# Work around a Cython problem in Python 3.8.x on macOS +# https://github.com/cython/cython/issues/3262 +import os +if os.uname().sysname == 'Darwin': + import multiprocessing + multiprocessing.set_start_method('fork', force=True) + +# If build isolation is not in use and setuptools_scm is installed, +# then its file_finders entry point is invoked, which we don't need. +# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 +try: + import setuptools_scm.integration + setuptools_scm.integration.find_files = lambda _: [] +except ImportError: + pass + +# PEP 517 builds do not have . in sys.path +sys.path.insert(0, os.path.dirname(__file__)) + +from sage_setup.excepthook import excepthook +sys.excepthook = excepthook + +from sage_setup.setenv import setenv +setenv() + +import sage.env +sage.env.default_required_modules = sage.env.default_optional_modules = () + +from sage_setup.command.sage_build_cython import sage_build_cython +from sage_setup.command.sage_build_ext import sage_build_ext +import os.path + +sage_build_cython.built_distributions = ['sagemath-pari'] + +cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +from sage_setup.find import find_python_sources, find_extra_files +python_packages, python_modules, cython_modules = find_python_sources( + '.', ['sage'], distributions=['sagemath-pari']) +extra_files = find_extra_files( + '.', ['sage'], '/doesnotexist', distributions=['sagemath-pari']) +package_data = {"": [f + for pkg, files in extra_files.items() + for f in files ]} + +log.warn('python_packages = {0}'.format(python_packages)) +log.warn('python_modules = {0}'.format(python_modules)) +log.warn('cython_modules = {0}'.format(cython_modules)) +log.warn('package_data = {0}'.format(package_data)) + +setup( + cmdclass = cmdclass, + packages = python_packages, + py_modules = python_modules, + ext_modules = cython_modules, + package_data = package_data, +) diff --git a/pkgs/sagemath-pari/tox.ini b/pkgs/sagemath-pari/tox.ini new file mode 100644 index 00000000000..492c30f3252 --- /dev/null +++ b/pkgs/sagemath-pari/tox.ini @@ -0,0 +1,64 @@ +# To build and test in the tox environment: +# +# ./sage -sh -c '(cd pkgs/sagemath-gap && tox -v -v -v -e sagepython)' +# +# To test interactively: +# +# pkgs/sagemath-gap/.tox/sagepython/bin/python +# +[tox] +envlist = + sagepython-norequirements + +[testenv] +deps = + !norequirements: -rrequirements.txt + # tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576 + sagemath-repl + +extras = test + +passenv = + # Variables set by .homebrew-build-env + CPATH + LIBRARY_PATH + PKG_CONFIG_PATH + # Parallel build + SAGE_NUM_THREADS + SAGE_NUM_THREADS_PARALLEL + # SAGE_VENV only for referring to the basepython or finding the wheels + sagepython, sagewheels: SAGE_VENV + # Location of the wheels + sagewheels: SAGE_SPKG_WHEELS + +setenv = + # Sage scripts such as sage-runtests like to use $HOME/.sage + HOME={envdir} + # We supply pip options by environment variables so that they + # apply both to the installation of the dependencies and of the package + sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels} + nopypi: PIP_NO_INDEX=true + +whitelist_externals = + bash + +commands = + # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package. + # Importing sage.libs.gap.libgap does not work yet because of the runtime dep on 'sage.rings.polynomial' + # {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.libs.gap.libgap' + + +[testenv:sagepython] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 diff --git a/src/sage/all__sagemath_pari.py b/src/sage/all__sagemath_pari.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/all__sagemath_pari.py b/src/sage/libs/all__sagemath_pari.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/pari/convert_gmp.pxd b/src/sage/libs/pari/convert_gmp.pxd index e08380f571d..cc554a378da 100644 --- a/src/sage/libs/pari/convert_gmp.pxd +++ b/src/sage/libs/pari/convert_gmp.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from cypari2.types cimport GEN from cypari2.gen cimport Gen from sage.libs.gmp.types cimport mpz_t, mpq_t, mpz_ptr, mpq_ptr diff --git a/src/sage/libs/pari/convert_gmp.pyx b/src/sage/libs/pari/convert_gmp.pyx index a39caa379b4..60a86e5d9ee 100644 --- a/src/sage/libs/pari/convert_gmp.pyx +++ b/src/sage/libs/pari/convert_gmp.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + """ Convert PARI objects to/from GMP objects diff --git a/src/sage/libs/pari/convert_sage.pxd b/src/sage/libs/pari/convert_sage.pxd index 266a8204a39..4f866b7953b 100644 --- a/src/sage/libs/pari/convert_sage.pxd +++ b/src/sage/libs/pari/convert_sage.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from cypari2.gen cimport Gen from sage.rings.integer cimport Integer from sage.rings.rational cimport Rational diff --git a/src/sage/libs/pari/convert_sage.pyx b/src/sage/libs/pari/convert_sage.pyx index 1d1db834f6e..d5f43ff8725 100644 --- a/src/sage/libs/pari/convert_sage.pyx +++ b/src/sage/libs/pari/convert_sage.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + r""" Convert PARI objects to Sage types """ diff --git a/src/sage/libs/pari/convert_sage_real_double.pxd b/src/sage/libs/pari/convert_sage_real_double.pxd index 12fa7418e69..6cd0dacbd0c 100644 --- a/src/sage/libs/pari/convert_sage_real_double.pxd +++ b/src/sage/libs/pari/convert_sage_real_double.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from cypari2.gen cimport Gen from sage.rings.real_double cimport RealDoubleElement diff --git a/src/sage/libs/pari/convert_sage_real_double.pyx b/src/sage/libs/pari/convert_sage_real_double.pyx index 6d7ffe7038e..5bd92103114 100644 --- a/src/sage/libs/pari/convert_sage_real_double.pyx +++ b/src/sage/libs/pari/convert_sage_real_double.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from cypari2.convert cimport new_gen_from_double cpdef Gen new_gen_from_real_double_element(RealDoubleElement self): diff --git a/src/sage/libs/pari/misc.pxd b/src/sage/libs/pari/misc.pxd index ae89aff0b84..ee62e0fd8e4 100644 --- a/src/sage/libs/pari/misc.pxd +++ b/src/sage/libs/pari/misc.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from cypari2.gen cimport Gen cdef Gen new_t_POL_from_int_star(int* vals, unsigned long length, long varnum) diff --git a/src/sage/libs/pari/misc.pyx b/src/sage/libs/pari/misc.pyx index 1ed774d417c..f8cc4bc9cdc 100644 --- a/src/sage/libs/pari/misc.pyx +++ b/src/sage/libs/pari/misc.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from cysignals.signals cimport sig_on from cypari2.paridecl cimport * from cypari2.stack cimport new_gen diff --git a/src/sage/libs/pari/tests.py b/src/sage/libs/pari/tests.py index 97d1ec95893..63f8cd0da82 100644 --- a/src/sage/libs/pari/tests.py +++ b/src/sage/libs/pari/tests.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + r""" Tests for the Sage <-> PARI interface diff --git a/src/sage/rings/all__sagemath_pari.py b/src/sage/rings/all__sagemath_pari.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/rings/finite_rings/all__sagemath_pari.py b/src/sage/rings/finite_rings/all__sagemath_pari.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/rings/finite_rings/element_pari_ffelt.pxd b/src/sage/rings/finite_rings/element_pari_ffelt.pxd index 0b66436dcd4..97c97afe875 100644 --- a/src/sage/rings/finite_rings/element_pari_ffelt.pxd +++ b/src/sage/rings/finite_rings/element_pari_ffelt.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from cypari2.types cimport GEN from sage.rings.finite_rings.element_base cimport FinitePolyExtElement diff --git a/src/sage/rings/finite_rings/element_pari_ffelt.pyx b/src/sage/rings/finite_rings/element_pari_ffelt.pyx index 74b8ce40c7b..ff63b532102 100644 --- a/src/sage/rings/finite_rings/element_pari_ffelt.pyx +++ b/src/sage/rings/finite_rings/element_pari_ffelt.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + """ Finite field elements implemented via PARI's FFELT type diff --git a/src/sage/rings/number_field/all__sagemath_pari.py b/src/sage/rings/number_field/all__sagemath_pari.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/rings/number_field/totallyreal.pyx b/src/sage/rings/number_field/totallyreal.pyx index ecb8236260c..4c33daf92f1 100644 --- a/src/sage/rings/number_field/totallyreal.pyx +++ b/src/sage/rings/number_field/totallyreal.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + r""" Enumeration of Primitive Totally Real Fields diff --git a/src/sage/rings/number_field/totallyreal_data.pxd b/src/sage/rings/number_field/totallyreal_data.pxd index 57ab69dca8b..25bc44567e5 100644 --- a/src/sage/rings/number_field/totallyreal_data.pxd +++ b/src/sage/rings/number_field/totallyreal_data.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + cdef double eval_seq_as_poly(int *f, int n, double x) cdef double newton(int *f, int *df, int n, double x0, double eps) cdef void newton_in_intervals(int *f, int *df, int n, double *beta, double eps, double *rts) diff --git a/src/sage/rings/number_field/totallyreal_data.pyx b/src/sage/rings/number_field/totallyreal_data.pyx index adc52e6cfab..2a9bf5ea4e3 100644 --- a/src/sage/rings/number_field/totallyreal_data.pyx +++ b/src/sage/rings/number_field/totallyreal_data.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + # distutils: libraries = gmp """ Enumeration of Totally Real Fields diff --git a/src/sage/rings/number_field/totallyreal_rel.py b/src/sage/rings/number_field/totallyreal_rel.py index 07477c46f8f..66942eb37d9 100644 --- a/src/sage/rings/number_field/totallyreal_rel.py +++ b/src/sage/rings/number_field/totallyreal_rel.py @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + r""" Enumeration of Totally Real Fields: Relative Extensions diff --git a/src/sage/rings/padics/all__sagemath_pari.py b/src/sage/rings/padics/all__sagemath_pari.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/rings/padics/common_conversion.pyx b/src/sage/rings/padics/common_conversion.pyx index 4ed5570d306..b97b141b83c 100644 --- a/src/sage/rings/padics/common_conversion.pyx +++ b/src/sage/rings/padics/common_conversion.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + r""" The functions in this file are used in creating new p-adic elements. diff --git a/src/sage/rings/padics/padic_capped_absolute_element.pyx b/src/sage/rings/padics/padic_capped_absolute_element.pyx index 69d5b474f20..6111fe960a0 100644 --- a/src/sage/rings/padics/padic_capped_absolute_element.pyx +++ b/src/sage/rings/padics/padic_capped_absolute_element.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + """ `p`-adic Capped Absolute Elements diff --git a/src/sage/rings/padics/padic_capped_relative_element.pyx b/src/sage/rings/padics/padic_capped_relative_element.pyx index d393708979d..c6e1aa03ac1 100644 --- a/src/sage/rings/padics/padic_capped_relative_element.pyx +++ b/src/sage/rings/padics/padic_capped_relative_element.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + """ `p`-adic Capped Relative Elements diff --git a/src/sage/rings/padics/padic_fixed_mod_element.pyx b/src/sage/rings/padics/padic_fixed_mod_element.pyx index 2e9e9a1ed3b..7c1f4c9fafb 100644 --- a/src/sage/rings/padics/padic_fixed_mod_element.pyx +++ b/src/sage/rings/padics/padic_fixed_mod_element.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + """ `p`-adic Fixed-Mod Element diff --git a/src/sage/rings/padics/padic_floating_point_element.pyx b/src/sage/rings/padics/padic_floating_point_element.pyx index 13eb30a3abc..a1faa9c7f12 100644 --- a/src/sage/rings/padics/padic_floating_point_element.pyx +++ b/src/sage/rings/padics/padic_floating_point_element.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + r""" `p`-adic Floating Point Elements diff --git a/src/sage/rings/power_series_pari.pxd b/src/sage/rings/power_series_pari.pxd index fadf7f0fd08..cdc1b1a5550 100644 --- a/src/sage/rings/power_series_pari.pxd +++ b/src/sage/rings/power_series_pari.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from cypari2.gen cimport Gen as pari_gen from .power_series_ring_element cimport PowerSeries diff --git a/src/sage/rings/power_series_pari.pyx b/src/sage/rings/power_series_pari.pyx index 7b9c2b5c783..7bc3c3d71d7 100644 --- a/src/sage/rings/power_series_pari.pyx +++ b/src/sage/rings/power_series_pari.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + r""" Power series implemented using PARI diff --git a/src/sage/rings/real_mpfr.pxd b/src/sage/rings/real_mpfr.pxd index 3549eccfd03..2996ade8817 100644 --- a/src/sage/rings/real_mpfr.pxd +++ b/src/sage/rings/real_mpfr.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + from sage.libs.mpfr.types cimport mpfr_rnd_t, mpfr_t cimport sage.rings.ring diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx index 18d1345ec81..00bc033aa9f 100644 --- a/src/sage/rings/real_mpfr.pyx +++ b/src/sage/rings/real_mpfr.pyx @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-pari + r""" Arbitrary Precision Real Numbers From 9b0927c323cf11baa738bfb9ad1ff90ce740d5b8 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 23 May 2023 13:03:41 -0700 Subject: [PATCH 44/60] pkgs/sagemath-pari: Add sage.rings.factorint_pari --- build/pkgs/sagemath_pari/dependencies | 2 +- pkgs/sagemath-pari/MANIFEST.in | 2 +- pkgs/sagemath-pari/requirements.txt | 2 +- src/sage/rings/factorint_pari.pyx | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/pkgs/sagemath_pari/dependencies b/build/pkgs/sagemath_pari/dependencies index 600be46ef7a..b855bbb7088 100644 --- a/build/pkgs/sagemath_pari/dependencies +++ b/build/pkgs/sagemath_pari/dependencies @@ -1 +1 @@ -$(PYTHON) cypari memory_allocator | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig +$(PYTHON) cypari memory_allocator sagemath_categories | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig diff --git a/pkgs/sagemath-pari/MANIFEST.in b/pkgs/sagemath-pari/MANIFEST.in index cffdec4c335..ff9dd0093a3 100644 --- a/pkgs/sagemath-pari/MANIFEST.in +++ b/pkgs/sagemath-pari/MANIFEST.in @@ -13,7 +13,7 @@ include sage/rings/rational.pxd # FIXME include sage/rings/finite_rings/element_base.p* # FIXME include sage/rings/finite_rings/element_pari_ffelt.p* # needs sage.rings.finite_rings.element_base include sage/rings/number_field/totallyreal*.p* # needs sage.rings.{integer,rational} - +include sage/rings/factorint_pari.p* # needs sage.rings.integer include sage/misc/binary_tree.pxd # FIXME include sage/rings/polynomial/*.pxd # FIXME diff --git a/pkgs/sagemath-pari/requirements.txt b/pkgs/sagemath-pari/requirements.txt index 2c13e24b8dd..18e2114c915 100644 --- a/pkgs/sagemath-pari/requirements.txt +++ b/pkgs/sagemath-pari/requirements.txt @@ -1,2 +1,2 @@ Cython==0.29.32 -sagemath-standard==10.0 +sagemath-standard==10.1.beta0 diff --git a/src/sage/rings/factorint_pari.pyx b/src/sage/rings/factorint_pari.pyx index b94682d0deb..66437dd2bd6 100644 --- a/src/sage/rings/factorint_pari.pyx +++ b/src/sage/rings/factorint_pari.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-pari # sage.doctest: optional - sage.libs.pari r""" Integer factorization using PARI From dbee5f0550836c98b18ec6f3120896e4ac2f42fe Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 23 May 2023 15:19:30 -0700 Subject: [PATCH 45/60] build/pkgs/sagemath_ntl, pkgs/sagemath-ntl: New (WIP) --- .gitignore | 3 + build/make/Makefile.in | 3 +- build/pkgs/sagemath_ntl/SPKG.rst | 1 + build/pkgs/sagemath_ntl/bootstrap | 1 + build/pkgs/sagemath_ntl/dependencies | 1 + build/pkgs/sagemath_ntl/install-requires.txt | 2 + build/pkgs/sagemath_ntl/package-version.txt | 1 + build/pkgs/sagemath_ntl/spkg-install | 30 +++++++++ build/pkgs/sagemath_ntl/spkg-src | 24 +++++++ build/pkgs/sagemath_ntl/src | 1 + build/pkgs/sagemath_ntl/type | 1 + pkgs/sagemath-ntl/MANIFEST.in | 49 ++++++++++++++ pkgs/sagemath-ntl/README.rst | 29 +++++++++ pkgs/sagemath-ntl/VERSION.txt | 1 + pkgs/sagemath-ntl/pyproject.toml.m4 | 15 +++++ pkgs/sagemath-ntl/requirements.txt | 2 + pkgs/sagemath-ntl/requirements.txt.m4 | 2 + pkgs/sagemath-ntl/sage | 1 + pkgs/sagemath-ntl/setup.cfg.m4 | 42 ++++++++++++ pkgs/sagemath-ntl/setup.py | 64 +++++++++++++++++++ pkgs/sagemath-ntl/tox.ini | 64 +++++++++++++++++++ pkgs/sagemath-pari/MANIFEST.in | 18 ++++-- pkgs/sagemath-pari/setup.cfg.m4 | 8 +++ src/sage/all__sagemath_ntl.py | 0 src/sage/libs/all__sagemath_ntl.py | 0 src/sage/libs/ntl/GF2.pxd | 1 + src/sage/libs/ntl/GF2E.pxd | 1 + src/sage/libs/ntl/GF2EX.pxd | 1 + src/sage/libs/ntl/GF2X.pxd | 1 + src/sage/libs/ntl/ZZ.pxd | 1 + src/sage/libs/ntl/ZZX.pxd | 1 + src/sage/libs/ntl/ZZ_p.pxd | 1 + src/sage/libs/ntl/ZZ_pE.pxd | 1 + src/sage/libs/ntl/ZZ_pEX.pxd | 1 + src/sage/libs/ntl/ZZ_pX.pxd | 1 + src/sage/libs/ntl/__init__.py | 1 + src/sage/libs/ntl/all.py | 1 + src/sage/libs/ntl/conversion.pxd | 1 + src/sage/libs/ntl/convert.pxd | 1 + src/sage/libs/ntl/convert.pyx | 1 + src/sage/libs/ntl/decl.pxi | 1 + src/sage/libs/ntl/error.pyx | 1 + src/sage/libs/ntl/lzz_p.pxd | 1 + src/sage/libs/ntl/lzz_pX.pxd | 1 + src/sage/libs/ntl/mat_GF2.pxd | 1 + src/sage/libs/ntl/mat_GF2E.pxd | 1 + src/sage/libs/ntl/mat_ZZ.pxd | 1 + src/sage/libs/ntl/misc.pxi | 1 + src/sage/libs/ntl/ntl_GF2.pxd | 1 + src/sage/libs/ntl/ntl_GF2.pyx | 1 + src/sage/libs/ntl/ntl_GF2E.pxd | 1 + src/sage/libs/ntl/ntl_GF2E.pyx | 1 + src/sage/libs/ntl/ntl_GF2EContext.pxd | 1 + src/sage/libs/ntl/ntl_GF2EContext.pyx | 1 + src/sage/libs/ntl/ntl_GF2EX.pxd | 1 + src/sage/libs/ntl/ntl_GF2EX.pyx | 1 + src/sage/libs/ntl/ntl_GF2X.pxd | 1 + src/sage/libs/ntl/ntl_GF2X.pyx | 1 + src/sage/libs/ntl/ntl_GF2X_linkage.pxi | 1 + src/sage/libs/ntl/ntl_ZZ.pxd | 1 + src/sage/libs/ntl/ntl_ZZ.pyx | 1 + src/sage/libs/ntl/ntl_ZZX.pxd | 1 + src/sage/libs/ntl/ntl_ZZX.pyx | 1 + src/sage/libs/ntl/ntl_ZZ_p.pxd | 1 + src/sage/libs/ntl/ntl_ZZ_p.pyx | 1 + src/sage/libs/ntl/ntl_ZZ_pContext.pxd | 1 + src/sage/libs/ntl/ntl_ZZ_pContext.pyx | 1 + src/sage/libs/ntl/ntl_ZZ_pE.pxd | 1 + src/sage/libs/ntl/ntl_ZZ_pE.pyx | 1 + src/sage/libs/ntl/ntl_ZZ_pEContext.pxd | 1 + src/sage/libs/ntl/ntl_ZZ_pEContext.pyx | 1 + src/sage/libs/ntl/ntl_ZZ_pEX.pxd | 1 + src/sage/libs/ntl/ntl_ZZ_pEX.pyx | 1 + src/sage/libs/ntl/ntl_ZZ_pEX_linkage.pxi | 1 + src/sage/libs/ntl/ntl_ZZ_pX.pxd | 1 + src/sage/libs/ntl/ntl_ZZ_pX.pyx | 1 + src/sage/libs/ntl/ntl_lzz_p.pxd | 1 + src/sage/libs/ntl/ntl_lzz_p.pyx | 1 + src/sage/libs/ntl/ntl_lzz_pContext.pxd | 1 + src/sage/libs/ntl/ntl_lzz_pContext.pyx | 1 + src/sage/libs/ntl/ntl_lzz_pX.pxd | 1 + src/sage/libs/ntl/ntl_lzz_pX.pyx | 1 + src/sage/libs/ntl/ntl_mat_GF2.pxd | 1 + src/sage/libs/ntl/ntl_mat_GF2.pyx | 1 + src/sage/libs/ntl/ntl_mat_GF2E.pxd | 1 + src/sage/libs/ntl/ntl_mat_GF2E.pyx | 1 + src/sage/libs/ntl/ntl_mat_ZZ.pxd | 1 + src/sage/libs/ntl/ntl_mat_ZZ.pyx | 1 + src/sage/libs/ntl/ntl_tools.pxd | 1 + src/sage/libs/ntl/types.pxd | 1 + src/sage/libs/ntl/vec_GF2.pxd | 1 + src/sage/libs/ntl/vec_GF2E.pxd | 1 + src/sage/rings/all__sagemath_ntl.py | 0 src/sage/rings/number_field/S_unit_solver.py | 1 + src/sage/rings/number_field/all.py | 1 + src/sage/rings/number_field/bdd_height.py | 1 + src/sage/rings/number_field/class_group.py | 1 + src/sage/rings/number_field/galois_group.py | 1 + src/sage/rings/number_field/homset.py | 1 + src/sage/rings/number_field/maps.py | 1 + src/sage/rings/number_field/morphism.py | 1 + src/sage/rings/number_field/number_field.py | 1 + .../rings/number_field/number_field_base.pxd | 1 + .../rings/number_field/number_field_base.pyx | 1 + .../number_field/number_field_element.pxd | 1 + .../number_field/number_field_element.pyx | 1 + .../number_field_element_base.pxd | 1 + .../number_field_element_base.pyx | 1 + .../number_field_element_quadratic.pxd | 1 + .../number_field_element_quadratic.pyx | 1 + .../rings/number_field/number_field_ideal.py | 1 + .../number_field/number_field_ideal_rel.py | 1 + .../number_field/number_field_morphisms.pyx | 1 + .../rings/number_field/number_field_rel.py | 1 + src/sage/rings/number_field/order.py | 1 + src/sage/rings/number_field/selmer_group.py | 1 + .../small_primes_of_degree_one.py | 1 + .../rings/number_field/splitting_field.py | 1 + src/sage/rings/number_field/structure.py | 1 + src/sage/rings/number_field/totallyreal.pyx | 1 + .../rings/number_field/totallyreal_data.pxd | 1 + .../rings/number_field/totallyreal_data.pyx | 1 + .../rings/number_field/totallyreal_phc.py | 1 + .../rings/number_field/totallyreal_rel.py | 1 + src/sage/rings/number_field/unit_group.py | 1 + .../rings/polynomial/all__sagemath_ntl.py | 0 src/sage/schemes/all__sagemath_ntl.py | 0 .../hyperelliptic_curves/all__sagemath_ntl.py | 0 .../hyperelliptic_curves/hypellfrob.pyx | 1 + 129 files changed, 456 insertions(+), 7 deletions(-) create mode 120000 build/pkgs/sagemath_ntl/SPKG.rst create mode 120000 build/pkgs/sagemath_ntl/bootstrap create mode 100644 build/pkgs/sagemath_ntl/dependencies create mode 100644 build/pkgs/sagemath_ntl/install-requires.txt create mode 120000 build/pkgs/sagemath_ntl/package-version.txt create mode 100755 build/pkgs/sagemath_ntl/spkg-install create mode 100755 build/pkgs/sagemath_ntl/spkg-src create mode 120000 build/pkgs/sagemath_ntl/src create mode 100644 build/pkgs/sagemath_ntl/type create mode 100644 pkgs/sagemath-ntl/MANIFEST.in create mode 100644 pkgs/sagemath-ntl/README.rst create mode 100644 pkgs/sagemath-ntl/VERSION.txt create mode 100644 pkgs/sagemath-ntl/pyproject.toml.m4 create mode 100644 pkgs/sagemath-ntl/requirements.txt create mode 100644 pkgs/sagemath-ntl/requirements.txt.m4 create mode 120000 pkgs/sagemath-ntl/sage create mode 100644 pkgs/sagemath-ntl/setup.cfg.m4 create mode 100644 pkgs/sagemath-ntl/setup.py create mode 100644 pkgs/sagemath-ntl/tox.ini create mode 100644 src/sage/all__sagemath_ntl.py create mode 100644 src/sage/libs/all__sagemath_ntl.py create mode 100644 src/sage/rings/all__sagemath_ntl.py create mode 100644 src/sage/rings/polynomial/all__sagemath_ntl.py create mode 100644 src/sage/schemes/all__sagemath_ntl.py create mode 100644 src/sage/schemes/hyperelliptic_curves/all__sagemath_ntl.py diff --git a/.gitignore b/.gitignore index edc7d97985e..3e4deddde36 100644 --- a/.gitignore +++ b/.gitignore @@ -182,6 +182,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-gap/setup.cfg /pkgs/sagemath-giac/setup.cfg /pkgs/sagemath-homfly/setup.cfg +/pkgs/sagemath-ntl/setup.cfg /pkgs/sagemath-pari/setup.cfg /pkgs/sagemath-objects/pyproject.toml /pkgs/sagemath-categories/pyproject.toml @@ -191,6 +192,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-gap/pyproject.toml /pkgs/sagemath-giac/pyproject.toml /pkgs/sagemath-homfly/pyproject.toml +/pkgs/sagemath-ntl/pyproject.toml /pkgs/sagemath-pari/pyproject.toml /pkgs/sagemath-objects/requirements.txt /pkgs/sagemath-categories/requirements.txt @@ -200,6 +202,7 @@ build/bin/sage-build-env-config /pkgs/sagemath-gap/requirements.txt /pkgs/sagemath-giac/requirements.txt /pkgs/sagemath-homfly/requirements.txt +/pkgs/sagemath-ntl/pyproject.toml /pkgs/sagemath-pari/pyproject.toml /pkgs/sagemath-categories/MANIFEST.in diff --git a/build/make/Makefile.in b/build/make/Makefile.in index 73b212d7fcd..b852b238200 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -140,7 +140,8 @@ PYPI_WHEEL_PACKAGES = \ sagemath_flint \ sagemath_pari \ sagemath_gap \ - sagemath_homfly + sagemath_homfly \ + sagemath_ntl # sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) \ diff --git a/build/pkgs/sagemath_ntl/SPKG.rst b/build/pkgs/sagemath_ntl/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_ntl/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_ntl/bootstrap b/build/pkgs/sagemath_ntl/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_ntl/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_ntl/dependencies b/build/pkgs/sagemath_ntl/dependencies new file mode 100644 index 00000000000..b855bbb7088 --- /dev/null +++ b/build/pkgs/sagemath_ntl/dependencies @@ -0,0 +1 @@ +$(PYTHON) cypari memory_allocator sagemath_categories | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig diff --git a/build/pkgs/sagemath_ntl/install-requires.txt b/build/pkgs/sagemath_ntl/install-requires.txt new file mode 100644 index 00000000000..228eac70b53 --- /dev/null +++ b/build/pkgs/sagemath_ntl/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-gap ~= 10.0 diff --git a/build/pkgs/sagemath_ntl/package-version.txt b/build/pkgs/sagemath_ntl/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_ntl/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_ntl/spkg-install b/build/pkgs/sagemath_ntl/spkg-install new file mode 100755 index 00000000000..81355093128 --- /dev/null +++ b/build/pkgs/sagemath_ntl/spkg-install @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +rm -Rf build +# First build the sdist, then build the wheel from the sdist. +# https://pypa-build.readthedocs.io/en/latest/#python--m-build +# (Important because sagemath-objects uses MANIFEST.in for filtering.) +# Do not install the wheel. +DIST_DIR="$(mktemp -d)" +python3 -m build --outdir "$DIST_DIR"/dist . || sdh_die "Failure building sdist and wheel" +ls -l "$DIST_DIR"/dist/*.tar.gz +wheel=$(cd "$DIST_DIR" && sdh_store_wheel . && echo $wheel) +ls -l "$wheel" + +if [ "$SAGE_CHECK" != no ]; then + tox -r -v -e sagepython-sagewheels-nopypi-norequirements --installpkg $wheel +fi diff --git a/build/pkgs/sagemath_ntl/spkg-src b/build/pkgs/sagemath_ntl/spkg-src new file mode 100755 index 00000000000..6e653682335 --- /dev/null +++ b/build/pkgs/sagemath_ntl/spkg-src @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# +# Script to prepare an sdist tarball for sagemath-gap +# This script is not used during build. +# +# HOW TO MAKE THE TARBALL: +# ./sage --sh build/pkgs/sagemath_pari/spkg-src + +if [ -z "$SAGE_ROOT" ] ; then + echo >&2 "Error - SAGE_ROOT undefined ... exiting" + echo >&2 "Maybe run 'sage -sh'?" + exit 1 +fi + +# Exit on failure +set -e + +cd build/pkgs/sagemath_ntl + +cd src +# Get rid of old *.egg-info/SOURCES.txt +rm -Rf *.egg-info + +python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_ntl/src b/build/pkgs/sagemath_ntl/src new file mode 120000 index 00000000000..27e6a5e7035 --- /dev/null +++ b/build/pkgs/sagemath_ntl/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-ntl \ No newline at end of file diff --git a/build/pkgs/sagemath_ntl/type b/build/pkgs/sagemath_ntl/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_ntl/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-ntl/MANIFEST.in b/pkgs/sagemath-ntl/MANIFEST.in new file mode 100644 index 00000000000..44a7340e91b --- /dev/null +++ b/pkgs/sagemath-ntl/MANIFEST.in @@ -0,0 +1,49 @@ +prune sage + +include VERSION.txt + +global-include all__sagemath_ntl.py + +graft sage/libs/ntl + +graft sage/libs/mpfi # entangled with number_field_element + +graft sage/rings/number_field +exclude sage/rings/number_field/number_field_element_quadratic.p* # needs arb; will be shipped by sagemath-flint +#exclude sage/rings/number_field/number_field_base.p* # FIXME: will be shipped by sagemath-categories +#exclude sage/rings/number_field/number_field_element_base.p* # FIXME: will be shipped by sagemath-categories + +include sage/rings/bernoulli_mod_p.p* +include sage/rings/finite_rings/*_ntl_*.p* +include sage/rings/padics/padic_ext_element.p* +include sage/rings/padics/pow_computer_ext.p* +include sage/rings/polynomial/*_ntl.p* +include sage/rings/polynomial/polynomial_zz_pex.p* + +# pxd dependencies - FIXME +include sage/ext/mod_int.pxd +include sage/ext/mod_int.h +include sage/ext/cplusplus.pxd +include sage/matrix/*.pxd +include sage/matrix/*.pxi +include sage/rings/*.pxd +include sage/rings/finite_rings/*.pxd +include sage/rings/finite_rings/integer_mod_limits.h +include sage/rings/polynomial/*.pxd + + +include sage/schemes/hyperelliptic_curves/hypellfrob.p* + +global-exclude *.c +global-exclude *.cpp + +graft sage/schemes/hyperelliptic_curves/hypellfrob + +global-exclude __pycache__ +global-exclude *.py[co] +global-exclude *.bak +global-exclude *.so +global-exclude *~ +prune .tox +prune build +prune dist diff --git a/pkgs/sagemath-ntl/README.rst b/pkgs/sagemath-ntl/README.rst new file mode 100644 index 00000000000..1d441401614 --- /dev/null +++ b/pkgs/sagemath-ntl/README.rst @@ -0,0 +1,29 @@ +============================================================================== + Sage: Open Source Mathematics Software: Computational Number Theory with NTL +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2023 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +About this pip-installable source distribution +---------------------------------------------- + +This pip-installable source distribution ``sagemath-ntl`` is a small +distribution that provides modules that depend on NTL. diff --git a/pkgs/sagemath-ntl/VERSION.txt b/pkgs/sagemath-ntl/VERSION.txt new file mode 100644 index 00000000000..2f52450b31d --- /dev/null +++ b/pkgs/sagemath-ntl/VERSION.txt @@ -0,0 +1 @@ +10.0 diff --git a/pkgs/sagemath-ntl/pyproject.toml.m4 b/pkgs/sagemath-ntl/pyproject.toml.m4 new file mode 100644 index 00000000000..b6598c6ce8a --- /dev/null +++ b/pkgs/sagemath-ntl/pyproject.toml.m4 @@ -0,0 +1,15 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + sage_setup \ + sagemath_environment \ + sagemath_categories \ + sagemath_pari \ + cython \ + cysignals \ + cypari \ + memory_allocator \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-ntl/requirements.txt b/pkgs/sagemath-ntl/requirements.txt new file mode 100644 index 00000000000..18e2114c915 --- /dev/null +++ b/pkgs/sagemath-ntl/requirements.txt @@ -0,0 +1,2 @@ +Cython==0.29.32 +sagemath-standard==10.1.beta0 diff --git a/pkgs/sagemath-ntl/requirements.txt.m4 b/pkgs/sagemath-ntl/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-ntl/requirements.txt.m4 @@ -0,0 +1,2 @@ +Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') +sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-ntl/sage b/pkgs/sagemath-ntl/sage new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-ntl/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-ntl/setup.cfg.m4 b/pkgs/sagemath-ntl/setup.cfg.m4 new file mode 100644 index 00000000000..5997bb42048 --- /dev/null +++ b/pkgs/sagemath-ntl/setup.cfg.m4 @@ -0,0 +1,42 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-ntl +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Computational Number Theory with NTL +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + cypari \ + cysignals \ + memory_allocator \ + sagemath_environment \ + sagemath_categories \ + sagemath_pari \ + | sed "2,\$s/^/ /;"')dnl + +packages = + sage.libs.ntl + sage.rings.number_field diff --git a/pkgs/sagemath-ntl/setup.py b/pkgs/sagemath-ntl/setup.py new file mode 100644 index 00000000000..3b092b33c96 --- /dev/null +++ b/pkgs/sagemath-ntl/setup.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python + +import sys +from distutils import log +from setuptools import setup + +# Work around a Cython problem in Python 3.8.x on macOS +# https://github.com/cython/cython/issues/3262 +import os +if os.uname().sysname == 'Darwin': + import multiprocessing + multiprocessing.set_start_method('fork', force=True) + +# If build isolation is not in use and setuptools_scm is installed, +# then its file_finders entry point is invoked, which we don't need. +# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 +try: + import setuptools_scm.integration + setuptools_scm.integration.find_files = lambda _: [] +except ImportError: + pass + +# PEP 517 builds do not have . in sys.path +sys.path.insert(0, os.path.dirname(__file__)) + +from sage_setup.excepthook import excepthook +sys.excepthook = excepthook + +from sage_setup.setenv import setenv +setenv() + +import sage.env +sage.env.default_required_modules = sage.env.default_optional_modules = () + +from sage_setup.command.sage_build_cython import sage_build_cython +from sage_setup.command.sage_build_ext import sage_build_ext +import os.path + +sage_build_cython.built_distributions = ['sagemath-ntl'] + +cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +from sage_setup.find import find_python_sources, find_extra_files +python_packages, python_modules, cython_modules = find_python_sources( + '.', ['sage'], distributions=['sagemath-ntl']) +extra_files = find_extra_files( + '.', ['sage'], '/doesnotexist', distributions=['sagemath-ntl']) +package_data = {"": [f + for pkg, files in extra_files.items() + for f in files ]} + +log.warn('python_packages = {0}'.format(python_packages)) +log.warn('python_modules = {0}'.format(python_modules)) +log.warn('cython_modules = {0}'.format(cython_modules)) +log.warn('package_data = {0}'.format(package_data)) + +setup( + cmdclass = cmdclass, + packages = python_packages, + py_modules = python_modules, + ext_modules = cython_modules, + package_data = package_data, +) diff --git a/pkgs/sagemath-ntl/tox.ini b/pkgs/sagemath-ntl/tox.ini new file mode 100644 index 00000000000..492c30f3252 --- /dev/null +++ b/pkgs/sagemath-ntl/tox.ini @@ -0,0 +1,64 @@ +# To build and test in the tox environment: +# +# ./sage -sh -c '(cd pkgs/sagemath-gap && tox -v -v -v -e sagepython)' +# +# To test interactively: +# +# pkgs/sagemath-gap/.tox/sagepython/bin/python +# +[tox] +envlist = + sagepython-norequirements + +[testenv] +deps = + !norequirements: -rrequirements.txt + # tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576 + sagemath-repl + +extras = test + +passenv = + # Variables set by .homebrew-build-env + CPATH + LIBRARY_PATH + PKG_CONFIG_PATH + # Parallel build + SAGE_NUM_THREADS + SAGE_NUM_THREADS_PARALLEL + # SAGE_VENV only for referring to the basepython or finding the wheels + sagepython, sagewheels: SAGE_VENV + # Location of the wheels + sagewheels: SAGE_SPKG_WHEELS + +setenv = + # Sage scripts such as sage-runtests like to use $HOME/.sage + HOME={envdir} + # We supply pip options by environment variables so that they + # apply both to the installation of the dependencies and of the package + sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels} + nopypi: PIP_NO_INDEX=true + +whitelist_externals = + bash + +commands = + # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package. + # Importing sage.libs.gap.libgap does not work yet because of the runtime dep on 'sage.rings.polynomial' + # {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.libs.gap.libgap' + + +[testenv:sagepython] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-sagewheels] +basepython = {env:SAGE_VENV}/bin/python3 + +[testenv:sagepython-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 diff --git a/pkgs/sagemath-pari/MANIFEST.in b/pkgs/sagemath-pari/MANIFEST.in index ff9dd0093a3..978b42dc6db 100644 --- a/pkgs/sagemath-pari/MANIFEST.in +++ b/pkgs/sagemath-pari/MANIFEST.in @@ -7,18 +7,24 @@ global-include all__sagemath_pari.py graft sage/libs/pari exclude sage/libs/pari/convert_flint.p* exclude sage/libs/pari/convert_sage*.p* # to be added later; needs sage.rings.{integer,rational,*_double}, sage.libs.gsl.complex -include sage/rings/integer.pxd # FIXME -include sage/rings/rational.pxd # FIXME - -include sage/rings/finite_rings/element_base.p* # FIXME include sage/rings/finite_rings/element_pari_ffelt.p* # needs sage.rings.finite_rings.element_base -include sage/rings/number_field/totallyreal*.p* # needs sage.rings.{integer,rational} include sage/rings/factorint_pari.p* # needs sage.rings.integer +include sage/rings/power_series_pari.p* # needs sage.rings.power_series_ring_element, sage.rings.polynomial.polynomial_element +# pxd dependencies include sage/misc/binary_tree.pxd # FIXME +include sage/rings/integer.pxd # FIXME +include sage/rings/finite_rings/element_base.p* # FIXME include sage/rings/polynomial/*.pxd # FIXME include sage/rings/power_series_ring_element.pxd # FIXME -include sage/rings/power_series_pari.p* # needs sage.rings.power_series_ring_element, sage.rings.polynomial.polynomial_element +include sage/rings/rational.pxd # FIXME + + +# We could but don't currently include this +# -- rather we ship all of sage.rings.number_field in sagemath-ntl (which currently depends on sagemath-pari) +# include sage/rings/number_field/totallyreal*.p* # needs sage.rings.{integer,rational} + + # # real_mpfr; could hopefully be disentangled from cypari2 later and moved to sagemath-categories. diff --git a/pkgs/sagemath-pari/setup.cfg.m4 b/pkgs/sagemath-pari/setup.cfg.m4 index e7cb564a49c..df4d0b304f7 100644 --- a/pkgs/sagemath-pari/setup.cfg.m4 +++ b/pkgs/sagemath-pari/setup.cfg.m4 @@ -35,3 +35,11 @@ install_requires = sagemath_environment \ sagemath_categories \ | sed "2,\$s/^/ /;"')dnl + +packages = + sage.libs.pari + sage.libs.mpfr + +[options.package_data] +sage.libs.pari = *.pxd +sage.libs.mpfr = *.pxd diff --git a/src/sage/all__sagemath_ntl.py b/src/sage/all__sagemath_ntl.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/all__sagemath_ntl.py b/src/sage/libs/all__sagemath_ntl.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/ntl/GF2.pxd b/src/sage/libs/ntl/GF2.pxd index 9443f143dcf..55b8db01f39 100644 --- a/src/sage/libs/ntl/GF2.pxd +++ b/src/sage/libs/ntl/GF2.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2_c diff --git a/src/sage/libs/ntl/GF2E.pxd b/src/sage/libs/ntl/GF2E.pxd index 352e35330fc..54d32d3ff0c 100644 --- a/src/sage/libs/ntl/GF2E.pxd +++ b/src/sage/libs/ntl/GF2E.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2E_c, GF2X_c, GF2_c, GF2XModulus_c, ZZ_c diff --git a/src/sage/libs/ntl/GF2EX.pxd b/src/sage/libs/ntl/GF2EX.pxd index c9d272f1c5a..3947aa5cf0d 100644 --- a/src/sage/libs/ntl/GF2EX.pxd +++ b/src/sage/libs/ntl/GF2EX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2EX_c diff --git a/src/sage/libs/ntl/GF2X.pxd b/src/sage/libs/ntl/GF2X.pxd index 1539a37c93c..7f8154a79ed 100644 --- a/src/sage/libs/ntl/GF2X.pxd +++ b/src/sage/libs/ntl/GF2X.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2X_c, GF2_c, GF2XModulus_c, vec_GF2_c, ZZ_c diff --git a/src/sage/libs/ntl/ZZ.pxd b/src/sage/libs/ntl/ZZ.pxd index 2ac00565e78..2567d03a9f6 100644 --- a/src/sage/libs/ntl/ZZ.pxd +++ b/src/sage/libs/ntl/ZZ.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from .types cimport ZZ_c diff --git a/src/sage/libs/ntl/ZZX.pxd b/src/sage/libs/ntl/ZZX.pxd index d46fce4bbb9..9183002e3d3 100644 --- a/src/sage/libs/ntl/ZZX.pxd +++ b/src/sage/libs/ntl/ZZX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from sage.libs.gmp.types cimport mpz_t diff --git a/src/sage/libs/ntl/ZZ_p.pxd b/src/sage/libs/ntl/ZZ_p.pxd index 0bee7b282b9..3f0e1e9acc5 100644 --- a/src/sage/libs/ntl/ZZ_p.pxd +++ b/src/sage/libs/ntl/ZZ_p.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from .types cimport ZZ_c, ZZ_p_c diff --git a/src/sage/libs/ntl/ZZ_pE.pxd b/src/sage/libs/ntl/ZZ_pE.pxd index 7d92bae4479..5efcab4d255 100644 --- a/src/sage/libs/ntl/ZZ_pE.pxd +++ b/src/sage/libs/ntl/ZZ_pE.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from .types cimport ZZ_c, ZZ_p_c, ZZ_pX_c, ZZ_pE_c diff --git a/src/sage/libs/ntl/ZZ_pEX.pxd b/src/sage/libs/ntl/ZZ_pEX.pxd index 7e2dc5626cd..f86c9a8165e 100644 --- a/src/sage/libs/ntl/ZZ_pEX.pxd +++ b/src/sage/libs/ntl/ZZ_pEX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from .types cimport (ZZ_c, ZZ_p_c, ZZ_pContext_c, ZZ_pE_c, vec_ZZ_p_c, diff --git a/src/sage/libs/ntl/ZZ_pX.pxd b/src/sage/libs/ntl/ZZ_pX.pxd index a48e815d018..c685c3175d8 100644 --- a/src/sage/libs/ntl/ZZ_pX.pxd +++ b/src/sage/libs/ntl/ZZ_pX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from .types cimport (ZZ_c, ZZX_c, ZZ_p_c, vec_ZZ_p_c, ZZ_pContext_c, diff --git a/src/sage/libs/ntl/__init__.py b/src/sage/libs/ntl/__init__.py index 5cdc57e0122..534bdd8eac9 100644 --- a/src/sage/libs/ntl/__init__.py +++ b/src/sage/libs/ntl/__init__.py @@ -1,2 +1,3 @@ +# sage_setup: distribution = sagemath-ntl from .error import setup_NTL_error_callback setup_NTL_error_callback() diff --git a/src/sage/libs/ntl/all.py b/src/sage/libs/ntl/all.py index e9d4271879a..5634f89fd99 100644 --- a/src/sage/libs/ntl/all.py +++ b/src/sage/libs/ntl/all.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Victor Shoup's NTL C++ Library diff --git a/src/sage/libs/ntl/conversion.pxd b/src/sage/libs/ntl/conversion.pxd index dfd7647a6c4..9bb5c204973 100644 --- a/src/sage/libs/ntl/conversion.pxd +++ b/src/sage/libs/ntl/conversion.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Inline conversions between NTL and Sage diff --git a/src/sage/libs/ntl/convert.pxd b/src/sage/libs/ntl/convert.pxd index aa733329dce..fc548c81e95 100644 --- a/src/sage/libs/ntl/convert.pxd +++ b/src/sage/libs/ntl/convert.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport ZZ_c from sage.libs.gmp.types cimport mpz_t, mpz_srcptr diff --git a/src/sage/libs/ntl/convert.pyx b/src/sage/libs/ntl/convert.pyx index d06270d5077..1de6c675a19 100644 --- a/src/sage/libs/ntl/convert.pyx +++ b/src/sage/libs/ntl/convert.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h # distutils: libraries = NTL_LIBRARIES gmp # distutils: extra_compile_args = NTL_CFLAGS diff --git a/src/sage/libs/ntl/decl.pxi b/src/sage/libs/ntl/decl.pxi index ae4eb5500f5..79b9592d199 100644 --- a/src/sage/libs/ntl/decl.pxi +++ b/src/sage/libs/ntl/decl.pxi @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from sage.libs.ntl.types cimport * from sage.libs.ntl.ZZ cimport * from sage.libs.ntl.ZZ_pX cimport * diff --git a/src/sage/libs/ntl/error.pyx b/src/sage/libs/ntl/error.pyx index ac6cef82910..3040457f117 100644 --- a/src/sage/libs/ntl/error.pyx +++ b/src/sage/libs/ntl/error.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = ntl gmp # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/lzz_p.pxd b/src/sage/libs/ntl/lzz_p.pxd index a7f8d5c52b6..a5ca61c57b6 100644 --- a/src/sage/libs/ntl/lzz_p.pxd +++ b/src/sage/libs/ntl/lzz_p.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from .types cimport zz_p_c diff --git a/src/sage/libs/ntl/lzz_pX.pxd b/src/sage/libs/ntl/lzz_pX.pxd index 65995a5c4d2..c8a2ab84f24 100644 --- a/src/sage/libs/ntl/lzz_pX.pxd +++ b/src/sage/libs/ntl/lzz_pX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from .types cimport ZZ_c, zz_p_c, zz_pX_c, zz_pX_Modulus_c diff --git a/src/sage/libs/ntl/mat_GF2.pxd b/src/sage/libs/ntl/mat_GF2.pxd index 89c8252c046..b168735c691 100644 --- a/src/sage/libs/ntl/mat_GF2.pxd +++ b/src/sage/libs/ntl/mat_GF2.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport mat_GF2_c, vec_GF2_c, GF2_c diff --git a/src/sage/libs/ntl/mat_GF2E.pxd b/src/sage/libs/ntl/mat_GF2E.pxd index 61250702247..ead17fc20b7 100644 --- a/src/sage/libs/ntl/mat_GF2E.pxd +++ b/src/sage/libs/ntl/mat_GF2E.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport mat_GF2E_c, vec_GF2E_c, GF2E_c diff --git a/src/sage/libs/ntl/mat_ZZ.pxd b/src/sage/libs/ntl/mat_ZZ.pxd index b40e51d53de..f569606ca58 100644 --- a/src/sage/libs/ntl/mat_ZZ.pxd +++ b/src/sage/libs/ntl/mat_ZZ.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport mat_ZZ_c, ZZ_c, ZZX_c diff --git a/src/sage/libs/ntl/misc.pxi b/src/sage/libs/ntl/misc.pxi index e9dcd9807b0..3f6a69149d2 100644 --- a/src/sage/libs/ntl/misc.pxi +++ b/src/sage/libs/ntl/misc.pxi @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h from cysignals.memory cimport sig_free diff --git a/src/sage/libs/ntl/ntl_GF2.pxd b/src/sage/libs/ntl/ntl_GF2.pxd index 0eff25dd32c..3edd0d30672 100644 --- a/src/sage/libs/ntl/ntl_GF2.pxd +++ b/src/sage/libs/ntl/ntl_GF2.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2_c cdef class ntl_GF2(): diff --git a/src/sage/libs/ntl/ntl_GF2.pyx b/src/sage/libs/ntl/ntl_GF2.pyx index d6ada6cb100..dbdc3a14576 100644 --- a/src/sage/libs/ntl/ntl_GF2.pyx +++ b/src/sage/libs/ntl/ntl_GF2.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_GF2E.pxd b/src/sage/libs/ntl/ntl_GF2E.pxd index 8977f711078..b4e1d8146c5 100644 --- a/src/sage/libs/ntl/ntl_GF2E.pxd +++ b/src/sage/libs/ntl/ntl_GF2E.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2E_c from .ntl_GF2EContext cimport ntl_GF2EContext_class diff --git a/src/sage/libs/ntl/ntl_GF2E.pyx b/src/sage/libs/ntl/ntl_GF2E.pyx index 54c7eef492a..b833b9845dc 100644 --- a/src/sage/libs/ntl/ntl_GF2E.pyx +++ b/src/sage/libs/ntl/ntl_GF2E.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_GF2EContext.pxd b/src/sage/libs/ntl/ntl_GF2EContext.pxd index 44ab9891713..e1917ce7b3a 100644 --- a/src/sage/libs/ntl/ntl_GF2EContext.pxd +++ b/src/sage/libs/ntl/ntl_GF2EContext.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2EContext_c from .ntl_GF2X cimport ntl_GF2X diff --git a/src/sage/libs/ntl/ntl_GF2EContext.pyx b/src/sage/libs/ntl/ntl_GF2EContext.pyx index 11d06893505..31a1cd80226 100644 --- a/src/sage/libs/ntl/ntl_GF2EContext.pyx +++ b/src/sage/libs/ntl/ntl_GF2EContext.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_GF2EX.pxd b/src/sage/libs/ntl/ntl_GF2EX.pxd index 70e06122753..ee46805173d 100644 --- a/src/sage/libs/ntl/ntl_GF2EX.pxd +++ b/src/sage/libs/ntl/ntl_GF2EX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2EX_c from .ntl_GF2EContext cimport ntl_GF2EContext_class from .ntl_GF2E cimport ntl_GF2E diff --git a/src/sage/libs/ntl/ntl_GF2EX.pyx b/src/sage/libs/ntl/ntl_GF2EX.pyx index e9dfbab4668..6028c2dfad4 100644 --- a/src/sage/libs/ntl/ntl_GF2EX.pyx +++ b/src/sage/libs/ntl/ntl_GF2EX.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_GF2X.pxd b/src/sage/libs/ntl/ntl_GF2X.pxd index 5af874d0b9e..5b4e9a2f3e6 100644 --- a/src/sage/libs/ntl/ntl_GF2X.pxd +++ b/src/sage/libs/ntl/ntl_GF2X.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport GF2X_c cdef class ntl_GF2X(): diff --git a/src/sage/libs/ntl/ntl_GF2X.pyx b/src/sage/libs/ntl/ntl_GF2X.pyx index d4581467952..3475f648bf0 100644 --- a/src/sage/libs/ntl/ntl_GF2X.pyx +++ b/src/sage/libs/ntl/ntl_GF2X.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_GF2X_linkage.pxi b/src/sage/libs/ntl/ntl_GF2X_linkage.pxi index b67fc23c3a4..ab8fc33c4fb 100644 --- a/src/sage/libs/ntl/ntl_GF2X_linkage.pxi +++ b/src/sage/libs/ntl/ntl_GF2X_linkage.pxi @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Linkage for arithmetic with NTL's GF2X elements. diff --git a/src/sage/libs/ntl/ntl_ZZ.pxd b/src/sage/libs/ntl/ntl_ZZ.pxd index 31a23b29d46..37ce1f2904c 100644 --- a/src/sage/libs/ntl/ntl_ZZ.pxd +++ b/src/sage/libs/ntl/ntl_ZZ.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from sage.libs.ntl.types cimport ZZ_c cdef class ntl_ZZ(): diff --git a/src/sage/libs/ntl/ntl_ZZ.pyx b/src/sage/libs/ntl/ntl_ZZ.pyx index 8786675e6b9..c3bba0bc0eb 100644 --- a/src/sage/libs/ntl/ntl_ZZ.pyx +++ b/src/sage/libs/ntl/ntl_ZZ.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_ZZX.pxd b/src/sage/libs/ntl/ntl_ZZX.pxd index c15a3f2d1e4..1222691f7a0 100644 --- a/src/sage/libs/ntl/ntl_ZZX.pxd +++ b/src/sage/libs/ntl/ntl_ZZX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport ZZX_c cdef class ntl_ZZX(): diff --git a/src/sage/libs/ntl/ntl_ZZX.pyx b/src/sage/libs/ntl/ntl_ZZX.pyx index e369f7152e4..0ebf505775f 100644 --- a/src/sage/libs/ntl/ntl_ZZX.pyx +++ b/src/sage/libs/ntl/ntl_ZZX.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_ZZ_p.pxd b/src/sage/libs/ntl/ntl_ZZ_p.pxd index 4863afeb2c2..9ae18c06869 100644 --- a/src/sage/libs/ntl/ntl_ZZ_p.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_p.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport ZZ_p_c from .ntl_ZZ_pContext cimport ntl_ZZ_pContext_class diff --git a/src/sage/libs/ntl/ntl_ZZ_p.pyx b/src/sage/libs/ntl/ntl_ZZ_p.pyx index b5511abb891..2f9f405d573 100644 --- a/src/sage/libs/ntl/ntl_ZZ_p.pyx +++ b/src/sage/libs/ntl/ntl_ZZ_p.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_ZZ_pContext.pxd b/src/sage/libs/ntl/ntl_ZZ_pContext.pxd index 171776d85d7..1ba433cc900 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pContext.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pContext.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport ZZ_pContext_c from .ntl_ZZ cimport ntl_ZZ from .types cimport ZZ_c diff --git a/src/sage/libs/ntl/ntl_ZZ_pContext.pyx b/src/sage/libs/ntl/ntl_ZZ_pContext.pyx index dbcc8af1441..bdb79b8c135 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pContext.pyx +++ b/src/sage/libs/ntl/ntl_ZZ_pContext.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_ZZ_pE.pxd b/src/sage/libs/ntl/ntl_ZZ_pE.pxd index 267608a016d..e0563440b41 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pE.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pE.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport ZZ_pE_c from .ntl_ZZ_pEContext cimport ntl_ZZ_pEContext_class from .ntl_ZZ_pX cimport ntl_ZZ_pX diff --git a/src/sage/libs/ntl/ntl_ZZ_pE.pyx b/src/sage/libs/ntl/ntl_ZZ_pE.pyx index ed45e34f0be..fa196380fc0 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pE.pyx +++ b/src/sage/libs/ntl/ntl_ZZ_pE.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd b/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd index 72c9ec42eab..d4f6b03221b 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport ZZ_pContext_c, ZZ_pEContext_c from .ntl_ZZ_pContext cimport ntl_ZZ_pContext_class from .ntl_ZZ_pX cimport ntl_ZZ_pX diff --git a/src/sage/libs/ntl/ntl_ZZ_pEContext.pyx b/src/sage/libs/ntl/ntl_ZZ_pEContext.pyx index b6ff3c66b01..5cebd9701e8 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEContext.pyx +++ b/src/sage/libs/ntl/ntl_ZZ_pEContext.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_ZZ_pEX.pxd b/src/sage/libs/ntl/ntl_ZZ_pEX.pxd index b00e87bbcec..455bef5af54 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEX.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pEX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport ZZ_pEX_c from .ntl_ZZ_pEContext cimport ntl_ZZ_pEContext_class diff --git a/src/sage/libs/ntl/ntl_ZZ_pEX.pyx b/src/sage/libs/ntl/ntl_ZZ_pEX.pyx index d5f10218a77..14e39166d2b 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEX.pyx +++ b/src/sage/libs/ntl/ntl_ZZ_pEX.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_ZZ_pEX_linkage.pxi b/src/sage/libs/ntl/ntl_ZZ_pEX_linkage.pxi index caf74e6c64f..ed07db73a5b 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEX_linkage.pxi +++ b/src/sage/libs/ntl/ntl_ZZ_pEX_linkage.pxi @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Linkage for arithmetic with NTL's ZZ_pEX elements. diff --git a/src/sage/libs/ntl/ntl_ZZ_pX.pxd b/src/sage/libs/ntl/ntl_ZZ_pX.pxd index 6dfed011120..b7d0e006607 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pX.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .ZZ_pX cimport * from sage.libs.ntl.ntl_ZZ_pContext cimport ntl_ZZ_pContext_class diff --git a/src/sage/libs/ntl/ntl_ZZ_pX.pyx b/src/sage/libs/ntl/ntl_ZZ_pX.pyx index 5021846b1e0..9cc8f349a07 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pX.pyx +++ b/src/sage/libs/ntl/ntl_ZZ_pX.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_lzz_p.pxd b/src/sage/libs/ntl/ntl_lzz_p.pxd index ec74b46d447..696de4a0a28 100644 --- a/src/sage/libs/ntl/ntl_lzz_p.pxd +++ b/src/sage/libs/ntl/ntl_lzz_p.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .lzz_p cimport * from .ntl_lzz_pContext cimport ntl_zz_pContext_class diff --git a/src/sage/libs/ntl/ntl_lzz_p.pyx b/src/sage/libs/ntl/ntl_lzz_p.pyx index 983e3056404..0ae7ea7ca9f 100644 --- a/src/sage/libs/ntl/ntl_lzz_p.pyx +++ b/src/sage/libs/ntl/ntl_lzz_p.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_lzz_pContext.pxd b/src/sage/libs/ntl/ntl_lzz_pContext.pxd index 058d2842ecc..891f7b7bc59 100644 --- a/src/sage/libs/ntl/ntl_lzz_pContext.pxd +++ b/src/sage/libs/ntl/ntl_lzz_pContext.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport zz_pContext_c cdef class ntl_zz_pContext_class(): diff --git a/src/sage/libs/ntl/ntl_lzz_pContext.pyx b/src/sage/libs/ntl/ntl_lzz_pContext.pyx index 0cb0a69642a..efc6cc105ae 100644 --- a/src/sage/libs/ntl/ntl_lzz_pContext.pyx +++ b/src/sage/libs/ntl/ntl_lzz_pContext.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_lzz_pX.pxd b/src/sage/libs/ntl/ntl_lzz_pX.pxd index 3ab79084299..5684627847d 100644 --- a/src/sage/libs/ntl/ntl_lzz_pX.pxd +++ b/src/sage/libs/ntl/ntl_lzz_pX.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from sage.libs.ntl.lzz_p cimport * from sage.libs.ntl.lzz_pX cimport * diff --git a/src/sage/libs/ntl/ntl_lzz_pX.pyx b/src/sage/libs/ntl/ntl_lzz_pX.pyx index 98bd0d58658..eea4147c644 100644 --- a/src/sage/libs/ntl/ntl_lzz_pX.pyx +++ b/src/sage/libs/ntl/ntl_lzz_pX.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_mat_GF2.pxd b/src/sage/libs/ntl/ntl_mat_GF2.pxd index b900d2f9e3f..546f8bc87a4 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2.pxd +++ b/src/sage/libs/ntl/ntl_mat_GF2.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport mat_GF2_c from .ntl_GF2 cimport ntl_GF2 diff --git a/src/sage/libs/ntl/ntl_mat_GF2.pyx b/src/sage/libs/ntl/ntl_mat_GF2.pyx index ee90bf17fce..e66dfd030f2 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2.pyx +++ b/src/sage/libs/ntl/ntl_mat_GF2.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_mat_GF2E.pxd b/src/sage/libs/ntl/ntl_mat_GF2E.pxd index 5c8aacd5cef..dde49e8a6f4 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2E.pxd +++ b/src/sage/libs/ntl/ntl_mat_GF2E.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport mat_GF2E_c from .ntl_GF2EContext cimport ntl_GF2EContext_class from .ntl_GF2E cimport ntl_GF2E diff --git a/src/sage/libs/ntl/ntl_mat_GF2E.pyx b/src/sage/libs/ntl/ntl_mat_GF2E.pyx index f88f20c63c6..8729b0c80c4 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2E.pyx +++ b/src/sage/libs/ntl/ntl_mat_GF2E.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_mat_ZZ.pxd b/src/sage/libs/ntl/ntl_mat_ZZ.pxd index f766e82c187..6f4afc92dc2 100644 --- a/src/sage/libs/ntl/ntl_mat_ZZ.pxd +++ b/src/sage/libs/ntl/ntl_mat_ZZ.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport mat_ZZ_c cdef class ntl_mat_ZZ(): diff --git a/src/sage/libs/ntl/ntl_mat_ZZ.pyx b/src/sage/libs/ntl/ntl_mat_ZZ.pyx index fb1769db352..ab106043398 100644 --- a/src/sage/libs/ntl/ntl_mat_ZZ.pyx +++ b/src/sage/libs/ntl/ntl_mat_ZZ.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES gmp m # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/libs/ntl/ntl_tools.pxd b/src/sage/libs/ntl/ntl_tools.pxd index 3cb8c0567f2..ae88c987f42 100644 --- a/src/sage/libs/ntl/ntl_tools.pxd +++ b/src/sage/libs/ntl/ntl_tools.pxd @@ -1,2 +1,3 @@ +# sage_setup: distribution = sagemath-ntl cdef extern from "NTL/tools.h" namespace "NTL": void (*ErrorMsgCallback)(const char *) except * diff --git a/src/sage/libs/ntl/types.pxd b/src/sage/libs/ntl/types.pxd index 22e16968943..ed7f61beddb 100644 --- a/src/sage/libs/ntl/types.pxd +++ b/src/sage/libs/ntl/types.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/vec_GF2.pxd b/src/sage/libs/ntl/vec_GF2.pxd index fa606dc176a..5b1fa1c6c69 100644 --- a/src/sage/libs/ntl/vec_GF2.pxd +++ b/src/sage/libs/ntl/vec_GF2.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport vec_GF2_c, GF2_c diff --git a/src/sage/libs/ntl/vec_GF2E.pxd b/src/sage/libs/ntl/vec_GF2E.pxd index 1cfdd7109fa..251a47a2ccc 100644 --- a/src/sage/libs/ntl/vec_GF2E.pxd +++ b/src/sage/libs/ntl/vec_GF2E.pxd @@ -1 +1,2 @@ +# sage_setup: distribution = sagemath-ntl from .types cimport vec_GF2E_c diff --git a/src/sage/rings/all__sagemath_ntl.py b/src/sage/rings/all__sagemath_ntl.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/rings/number_field/S_unit_solver.py b/src/sage/rings/number_field/S_unit_solver.py index af226730584..87910850766 100644 --- a/src/sage/rings/number_field/S_unit_solver.py +++ b/src/sage/rings/number_field/S_unit_solver.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Solve S-unit equation x + y = 1 diff --git a/src/sage/rings/number_field/all.py b/src/sage/rings/number_field/all.py index 5c56f8cff58..0b4f3317e6f 100644 --- a/src/sage/rings/number_field/all.py +++ b/src/sage/rings/number_field/all.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from .number_field import (NumberField, NumberFieldTower, CyclotomicField, QuadraticField, is_fundamental_discriminant, is_real_place) diff --git a/src/sage/rings/number_field/bdd_height.py b/src/sage/rings/number_field/bdd_height.py index d0f37a2b192..eab6932ad51 100644 --- a/src/sage/rings/number_field/bdd_height.py +++ b/src/sage/rings/number_field/bdd_height.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Elements of bounded height in number fields diff --git a/src/sage/rings/number_field/class_group.py b/src/sage/rings/number_field/class_group.py index 32b00310b85..3ed6e1e4d28 100644 --- a/src/sage/rings/number_field/class_group.py +++ b/src/sage/rings/number_field/class_group.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # -*- coding: utf-8 -*- r""" Class Groups of Number Fields diff --git a/src/sage/rings/number_field/galois_group.py b/src/sage/rings/number_field/galois_group.py index 1bf6189b7d9..722b252c21a 100644 --- a/src/sage/rings/number_field/galois_group.py +++ b/src/sage/rings/number_field/galois_group.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # -*- coding: utf-8 -*- """ Galois Groups of Number Fields diff --git a/src/sage/rings/number_field/homset.py b/src/sage/rings/number_field/homset.py index 6353353afe1..29b03f8045e 100644 --- a/src/sage/rings/number_field/homset.py +++ b/src/sage/rings/number_field/homset.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl """ Sets of homomorphisms between number fields """ diff --git a/src/sage/rings/number_field/maps.py b/src/sage/rings/number_field/maps.py index 68d03c73af3..9c8c0207857 100644 --- a/src/sage/rings/number_field/maps.py +++ b/src/sage/rings/number_field/maps.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Structure maps for number fields diff --git a/src/sage/rings/number_field/morphism.py b/src/sage/rings/number_field/morphism.py index 174252dad61..49b5ccaa5be 100644 --- a/src/sage/rings/number_field/morphism.py +++ b/src/sage/rings/number_field/morphism.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Morphisms between number fields diff --git a/src/sage/rings/number_field/number_field.py b/src/sage/rings/number_field/number_field.py index 1627b841c30..6da213f4510 100644 --- a/src/sage/rings/number_field/number_field.py +++ b/src/sage/rings/number_field/number_field.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # -*- coding: utf-8 -*- r""" Number Fields diff --git a/src/sage/rings/number_field/number_field_base.pxd b/src/sage/rings/number_field/number_field_base.pxd index ba6a8e98143..6b4681b08bb 100644 --- a/src/sage/rings/number_field/number_field_base.pxd +++ b/src/sage/rings/number_field/number_field_base.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from sage.rings.ring cimport Field cdef class NumberField(Field): diff --git a/src/sage/rings/number_field/number_field_base.pyx b/src/sage/rings/number_field/number_field_base.pyx index dd9a8b9d550..5f30e49c00b 100644 --- a/src/sage/rings/number_field/number_field_base.pyx +++ b/src/sage/rings/number_field/number_field_base.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl """ Base class for all number fields diff --git a/src/sage/rings/number_field/number_field_element.pxd b/src/sage/rings/number_field/number_field_element.pxd index 9b6917223a0..ebe058e3ccb 100644 --- a/src/sage/rings/number_field/number_field_element.pxd +++ b/src/sage/rings/number_field/number_field_element.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl cimport sage.structure.element from sage.libs.gmp.types cimport mpz_t from sage.rings.integer cimport Integer diff --git a/src/sage/rings/number_field/number_field_element.pyx b/src/sage/rings/number_field/number_field_element.pyx index d80c87ea00c..9c24ff1b17f 100644 --- a/src/sage/rings/number_field/number_field_element.pyx +++ b/src/sage/rings/number_field/number_field_element.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: libraries = NTL_LIBRARIES # distutils: extra_compile_args = NTL_CFLAGS # distutils: include_dirs = NTL_INCDIR diff --git a/src/sage/rings/number_field/number_field_element_base.pxd b/src/sage/rings/number_field/number_field_element_base.pxd index 060f0c754c4..3a5feccecc1 100644 --- a/src/sage/rings/number_field/number_field_element_base.pxd +++ b/src/sage/rings/number_field/number_field_element_base.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl from sage.structure.element cimport FieldElement diff --git a/src/sage/rings/number_field/number_field_element_base.pyx b/src/sage/rings/number_field/number_field_element_base.pyx index 5385833f1d4..2d1483fc48c 100644 --- a/src/sage/rings/number_field/number_field_element_base.pyx +++ b/src/sage/rings/number_field/number_field_element_base.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Number field elements (abstract base class) """ diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pxd b/src/sage/rings/number_field/number_field_element_quadratic.pxd index 14b437b43c7..e37abfc4a48 100644 --- a/src/sage/rings/number_field/number_field_element_quadratic.pxd +++ b/src/sage/rings/number_field/number_field_element_quadratic.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # sage_setup: distribution = sagemath-flint from sage.libs.gmp.types cimport mpz_t from sage.libs.arb.types cimport arb_t diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pyx b/src/sage/rings/number_field/number_field_element_quadratic.pyx index 197ce7b879d..21d9146126f 100644 --- a/src/sage/rings/number_field/number_field_element_quadratic.pyx +++ b/src/sage/rings/number_field/number_field_element_quadratic.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # sage_setup: distribution = sagemath-flint # distutils: libraries = NTL_LIBRARIES # distutils: extra_compile_args = NTL_CFLAGS diff --git a/src/sage/rings/number_field/number_field_ideal.py b/src/sage/rings/number_field/number_field_ideal.py index afdf29c52f5..8b9b13f1644 100644 --- a/src/sage/rings/number_field/number_field_ideal.py +++ b/src/sage/rings/number_field/number_field_ideal.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl """ Number Field Ideals diff --git a/src/sage/rings/number_field/number_field_ideal_rel.py b/src/sage/rings/number_field/number_field_ideal_rel.py index 1292219f843..ea2f292849d 100644 --- a/src/sage/rings/number_field/number_field_ideal_rel.py +++ b/src/sage/rings/number_field/number_field_ideal_rel.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Relative Number Field Ideals diff --git a/src/sage/rings/number_field/number_field_morphisms.pyx b/src/sage/rings/number_field/number_field_morphisms.pyx index 34a51a97c62..81571c4ab6a 100644 --- a/src/sage/rings/number_field/number_field_morphisms.pyx +++ b/src/sage/rings/number_field/number_field_morphisms.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Embeddings into ambient fields diff --git a/src/sage/rings/number_field/number_field_rel.py b/src/sage/rings/number_field/number_field_rel.py index 88284bf8ed0..2035b43d010 100644 --- a/src/sage/rings/number_field/number_field_rel.py +++ b/src/sage/rings/number_field/number_field_rel.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Relative Number Fields diff --git a/src/sage/rings/number_field/order.py b/src/sage/rings/number_field/order.py index 288e4dc83c5..53a271f4fe9 100644 --- a/src/sage/rings/number_field/order.py +++ b/src/sage/rings/number_field/order.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl """ Orders in Number Fields diff --git a/src/sage/rings/number_field/selmer_group.py b/src/sage/rings/number_field/selmer_group.py index 487550ef4d5..52da9e1ed35 100644 --- a/src/sage/rings/number_field/selmer_group.py +++ b/src/sage/rings/number_field/selmer_group.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # -*- coding: utf-8 -*- r""" `p`-Selmer groups of number fields diff --git a/src/sage/rings/number_field/small_primes_of_degree_one.py b/src/sage/rings/number_field/small_primes_of_degree_one.py index facd5207a1c..0efffef8c71 100644 --- a/src/sage/rings/number_field/small_primes_of_degree_one.py +++ b/src/sage/rings/number_field/small_primes_of_degree_one.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Small primes of degree one diff --git a/src/sage/rings/number_field/splitting_field.py b/src/sage/rings/number_field/splitting_field.py index 933660d629a..65c0f81da12 100644 --- a/src/sage/rings/number_field/splitting_field.py +++ b/src/sage/rings/number_field/splitting_field.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl """ Splitting fields of polynomials over number fields diff --git a/src/sage/rings/number_field/structure.py b/src/sage/rings/number_field/structure.py index 52e6ed6d503..b9a579da1f5 100644 --- a/src/sage/rings/number_field/structure.py +++ b/src/sage/rings/number_field/structure.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Helper classes for structural embeddings and isomorphisms of number fields diff --git a/src/sage/rings/number_field/totallyreal.pyx b/src/sage/rings/number_field/totallyreal.pyx index 4c33daf92f1..80337225aec 100644 --- a/src/sage/rings/number_field/totallyreal.pyx +++ b/src/sage/rings/number_field/totallyreal.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # sage_setup: distribution = sagemath-pari r""" diff --git a/src/sage/rings/number_field/totallyreal_data.pxd b/src/sage/rings/number_field/totallyreal_data.pxd index 25bc44567e5..783a088f53f 100644 --- a/src/sage/rings/number_field/totallyreal_data.pxd +++ b/src/sage/rings/number_field/totallyreal_data.pxd @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # sage_setup: distribution = sagemath-pari cdef double eval_seq_as_poly(int *f, int n, double x) diff --git a/src/sage/rings/number_field/totallyreal_data.pyx b/src/sage/rings/number_field/totallyreal_data.pyx index 2a9bf5ea4e3..4b42425b293 100644 --- a/src/sage/rings/number_field/totallyreal_data.pyx +++ b/src/sage/rings/number_field/totallyreal_data.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # sage_setup: distribution = sagemath-pari # distutils: libraries = gmp diff --git a/src/sage/rings/number_field/totallyreal_phc.py b/src/sage/rings/number_field/totallyreal_phc.py index 59467e5af40..68a583d536d 100644 --- a/src/sage/rings/number_field/totallyreal_phc.py +++ b/src/sage/rings/number_field/totallyreal_phc.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl """ Enumeration of Totally Real Fields: PHC interface diff --git a/src/sage/rings/number_field/totallyreal_rel.py b/src/sage/rings/number_field/totallyreal_rel.py index 66942eb37d9..ba41517ea2f 100644 --- a/src/sage/rings/number_field/totallyreal_rel.py +++ b/src/sage/rings/number_field/totallyreal_rel.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # sage_setup: distribution = sagemath-pari r""" diff --git a/src/sage/rings/number_field/unit_group.py b/src/sage/rings/number_field/unit_group.py index d8f9b7a9c2f..22ff7ab195a 100644 --- a/src/sage/rings/number_field/unit_group.py +++ b/src/sage/rings/number_field/unit_group.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl r""" Unit and S-unit groups of Number Fields diff --git a/src/sage/rings/polynomial/all__sagemath_ntl.py b/src/sage/rings/polynomial/all__sagemath_ntl.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/schemes/all__sagemath_ntl.py b/src/sage/schemes/all__sagemath_ntl.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/schemes/hyperelliptic_curves/all__sagemath_ntl.py b/src/sage/schemes/hyperelliptic_curves/all__sagemath_ntl.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/schemes/hyperelliptic_curves/hypellfrob.pyx b/src/sage/schemes/hyperelliptic_curves/hypellfrob.pyx index 50730d1081f..a524f5d21df 100644 --- a/src/sage/schemes/hyperelliptic_curves/hypellfrob.pyx +++ b/src/sage/schemes/hyperelliptic_curves/hypellfrob.pyx @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-ntl # distutils: language = c++ # distutils: sources = sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.cpp # distutils: depends = sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.h sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.h From d3c16101c6dd9a17577001e8c17503da7331a44b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 28 May 2023 05:48:47 -0700 Subject: [PATCH 46/60] pkgs/sagemath-ntl: Add sage.lib.mpfr --- pkgs/sagemath-ntl/MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/sagemath-ntl/MANIFEST.in b/pkgs/sagemath-ntl/MANIFEST.in index 44a7340e91b..fb69e31c70f 100644 --- a/pkgs/sagemath-ntl/MANIFEST.in +++ b/pkgs/sagemath-ntl/MANIFEST.in @@ -24,6 +24,7 @@ include sage/rings/polynomial/polynomial_zz_pex.p* include sage/ext/mod_int.pxd include sage/ext/mod_int.h include sage/ext/cplusplus.pxd +include sage/libs/mpfr/*.pxd include sage/matrix/*.pxd include sage/matrix/*.pxi include sage/rings/*.pxd From d03cb2eaa09b0b832c295c6bdc0b3cf6bda1e6ce Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 12 Jun 2023 14:35:16 -0700 Subject: [PATCH 47/60] .gitignore: Fix up --- .gitignore | 4 ++-- pkgs/sagemath-ntl/requirements.txt | 2 -- pkgs/sagemath-pari/requirements.txt | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 pkgs/sagemath-ntl/requirements.txt delete mode 100644 pkgs/sagemath-pari/requirements.txt diff --git a/.gitignore b/.gitignore index 3e4deddde36..724c4b9470f 100644 --- a/.gitignore +++ b/.gitignore @@ -202,8 +202,8 @@ build/bin/sage-build-env-config /pkgs/sagemath-gap/requirements.txt /pkgs/sagemath-giac/requirements.txt /pkgs/sagemath-homfly/requirements.txt -/pkgs/sagemath-ntl/pyproject.toml -/pkgs/sagemath-pari/pyproject.toml +/pkgs/sagemath-ntl/requirements.txt +/pkgs/sagemath-pari/requirements.txt /pkgs/sagemath-categories/MANIFEST.in # same for old locations - before Issue #31577 diff --git a/pkgs/sagemath-ntl/requirements.txt b/pkgs/sagemath-ntl/requirements.txt deleted file mode 100644 index 18e2114c915..00000000000 --- a/pkgs/sagemath-ntl/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cython==0.29.32 -sagemath-standard==10.1.beta0 diff --git a/pkgs/sagemath-pari/requirements.txt b/pkgs/sagemath-pari/requirements.txt deleted file mode 100644 index 18e2114c915..00000000000 --- a/pkgs/sagemath-pari/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cython==0.29.32 -sagemath-standard==10.1.beta0 From bf20fd599f03a244a84187da757b94b94984680e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 12 Jun 2023 14:40:11 -0700 Subject: [PATCH 48/60] pkgs/sagemath-ntl: Fix up --- pkgs/sagemath-ntl/MANIFEST.in | 2 +- src/sage/matrix/all__sagemath_ntl.py | 0 src/sage/misc/all__sagemath_ntl.py | 0 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/sage/matrix/all__sagemath_ntl.py create mode 100644 src/sage/misc/all__sagemath_ntl.py diff --git a/pkgs/sagemath-ntl/MANIFEST.in b/pkgs/sagemath-ntl/MANIFEST.in index fb69e31c70f..8d7d1dbe57c 100644 --- a/pkgs/sagemath-ntl/MANIFEST.in +++ b/pkgs/sagemath-ntl/MANIFEST.in @@ -31,7 +31,7 @@ include sage/rings/*.pxd include sage/rings/finite_rings/*.pxd include sage/rings/finite_rings/integer_mod_limits.h include sage/rings/polynomial/*.pxd - +include sage/misc/binary_tree.pxd include sage/schemes/hyperelliptic_curves/hypellfrob.p* diff --git a/src/sage/matrix/all__sagemath_ntl.py b/src/sage/matrix/all__sagemath_ntl.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/misc/all__sagemath_ntl.py b/src/sage/misc/all__sagemath_ntl.py new file mode 100644 index 00000000000..e69de29bb2d From 83dbfe0165b5e02f932c58cee0f0208a2f9382e9 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 12 Jun 2023 19:14:00 -0700 Subject: [PATCH 49/60] pkgs/sagemath-ntl: Exclude totallyreal --- pkgs/sagemath-ntl/MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/sagemath-ntl/MANIFEST.in b/pkgs/sagemath-ntl/MANIFEST.in index 8d7d1dbe57c..216113461d6 100644 --- a/pkgs/sagemath-ntl/MANIFEST.in +++ b/pkgs/sagemath-ntl/MANIFEST.in @@ -12,6 +12,7 @@ graft sage/rings/number_field exclude sage/rings/number_field/number_field_element_quadratic.p* # needs arb; will be shipped by sagemath-flint #exclude sage/rings/number_field/number_field_base.p* # FIXME: will be shipped by sagemath-categories #exclude sage/rings/number_field/number_field_element_base.p* # FIXME: will be shipped by sagemath-categories +exclude sage/rings/number_field/totallyreal*.p* # cimports cypari2 include sage/rings/bernoulli_mod_p.p* include sage/rings/finite_rings/*_ntl_*.p* From 73b9b4dc59a36d42942689a3203567f45f3f797d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 12 Jun 2023 21:39:37 -0700 Subject: [PATCH 50/60] build/pkgs/sagemath_ntl/dependencies: Add ntl --- build/pkgs/sagemath_ntl/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sagemath_ntl/dependencies b/build/pkgs/sagemath_ntl/dependencies index b855bbb7088..4880f118b59 100644 --- a/build/pkgs/sagemath_ntl/dependencies +++ b/build/pkgs/sagemath_ntl/dependencies @@ -1 +1 @@ -$(PYTHON) cypari memory_allocator sagemath_categories | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig +$(PYTHON) cypari memory_allocator sagemath_categories ntl | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig From 6d0447a24ae1edc34d31a6eb6d4e3196c820b782 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 12 Jun 2023 21:44:47 -0700 Subject: [PATCH 51/60] pkgs/sagemath-standard/setup.py: Add sagemath-pari --- pkgs/sagemath-standard/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/sagemath-standard/setup.py b/pkgs/sagemath-standard/setup.py index f7040529487..83716888dbf 100755 --- a/pkgs/sagemath-standard/setup.py +++ b/pkgs/sagemath-standard/setup.py @@ -81,6 +81,7 @@ 'sagemath-gap', 'sagemath-giac', 'sagemath-homfly', + 'sagemath-pari', ] from sage.misc.package import is_package_installed_and_updated optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib', From b8fed5ea1e70ca25899386b0a3f00c2424bba5f0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 13 Jun 2023 09:57:59 -0700 Subject: [PATCH 52/60] pkgs/sagemath-flint: Add sage-conf as build dependency --- build/pkgs/sagemath_flint/dependencies | 2 +- pkgs/sagemath-flint/pyproject.toml.m4 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/pkgs/sagemath_flint/dependencies b/build/pkgs/sagemath_flint/dependencies index 8dfbe4108bf..58b27a7f55a 100644 --- a/build/pkgs/sagemath_flint/dependencies +++ b/build/pkgs/sagemath_flint/dependencies @@ -1 +1 @@ -$(PYTHON) sagemath_categories flint arb | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sagemath_categories flint arb | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig sage_conf diff --git a/pkgs/sagemath-flint/pyproject.toml.m4 b/pkgs/sagemath-flint/pyproject.toml.m4 index 87a5ef21aa9..27f72042fab 100644 --- a/pkgs/sagemath-flint/pyproject.toml.m4 +++ b/pkgs/sagemath-flint/pyproject.toml.m4 @@ -1,10 +1,12 @@ [build-system] # Minimum requirements for the build system to execute. +# sage_conf is needed for library name of the flint library. requires = [ esyscmd(`sage-get-system-packages install-requires-toml \ setuptools \ wheel \ sage_setup \ + sage_conf \ sagemath_environment \ sagemath_categories \ cython \ From e0d12208fbffef446526ae46c57ad0bf6258cc71 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 15 Jun 2023 12:26:52 -0700 Subject: [PATCH 53/60] build/pkgs/sagemath_ntl/install-requires.txt: Fixup --- build/pkgs/sagemath_ntl/install-requires.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sagemath_ntl/install-requires.txt b/build/pkgs/sagemath_ntl/install-requires.txt index 228eac70b53..fb858bda9ac 100644 --- a/build/pkgs/sagemath_ntl/install-requires.txt +++ b/build/pkgs/sagemath_ntl/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-gap ~= 10.0 +sagemath-ntl ~= 10.0 From 11491c293328e9aac9f31a470e294feb201944a4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 15 Jun 2023 23:08:17 -0700 Subject: [PATCH 54/60] pkgs/sagemath-gap: Fixups --- pkgs/sagemath-gap/MANIFEST.in | 3 ++- src/sage/all__sagemath_gap.py | 2 ++ src/sage/combinat/all__sagemath_gap.py | 0 src/sage/combinat/root_system/all__sagemath_gap.py | 0 src/sage/ext_data/all__sagemath_gap.py | 0 src/sage/ext_data/gap/__init__.py | 0 src/sage/groups/all__sagemath_gap.py | 2 ++ src/sage/{sets => interfaces}/all__sagemath_gap.py | 0 8 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 src/sage/combinat/all__sagemath_gap.py create mode 100644 src/sage/combinat/root_system/all__sagemath_gap.py create mode 100644 src/sage/ext_data/all__sagemath_gap.py create mode 100644 src/sage/ext_data/gap/__init__.py rename src/sage/{sets => interfaces}/all__sagemath_gap.py (100%) diff --git a/pkgs/sagemath-gap/MANIFEST.in b/pkgs/sagemath-gap/MANIFEST.in index d253c9c128d..4366b989c53 100644 --- a/pkgs/sagemath-gap/MANIFEST.in +++ b/pkgs/sagemath-gap/MANIFEST.in @@ -12,11 +12,13 @@ include sage/graphs/all.py # FIXME include sage/graphs/base/all.py # FIXME include sage/graphs/spanning_tree.p* graft sage/groups/perm_gps +prune sage/groups/perm_gps/partn_ref # sagemath-categories include sage/groups/libgap_wrapper.p* include sage/groups/matrix_gps/group_element.pxd # FIXME include sage/groups/matrix_gps/*_gap.* include sage/groups/semimonomial_transformations/all.py # FIXME recursive-include sage/groups/semimonomial_transformations *.pxd # FIXME +include sage/interfaces/gap*.p* graft sage/libs/gap recursive-include sage/matrix *.pxd # FIXME include sage/matrix/matrix_gap.p* @@ -24,7 +26,6 @@ recursive-include sage/modules *.pxd # FIXME include sage/modules/all.py # FIXME recursive-include sage/rings *.pxd # FIXME include sage/rings/polynomial/all.py # FIXME -include sage/sets/disjoint_set.p* global-exclude *.c global-exclude *.cpp diff --git a/src/sage/all__sagemath_gap.py b/src/sage/all__sagemath_gap.py index dd59a6da735..874dee7da10 100644 --- a/src/sage/all__sagemath_gap.py +++ b/src/sage/all__sagemath_gap.py @@ -1 +1,3 @@ # sage_setup: distribution = sagemath-gap + +import sage.libs.gap.element diff --git a/src/sage/combinat/all__sagemath_gap.py b/src/sage/combinat/all__sagemath_gap.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/combinat/root_system/all__sagemath_gap.py b/src/sage/combinat/root_system/all__sagemath_gap.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/ext_data/all__sagemath_gap.py b/src/sage/ext_data/all__sagemath_gap.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/ext_data/gap/__init__.py b/src/sage/ext_data/gap/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/groups/all__sagemath_gap.py b/src/sage/groups/all__sagemath_gap.py index dd59a6da735..c971c17d54c 100644 --- a/src/sage/groups/all__sagemath_gap.py +++ b/src/sage/groups/all__sagemath_gap.py @@ -1 +1,3 @@ # sage_setup: distribution = sagemath-gap + +from .perm_gps.all import * diff --git a/src/sage/sets/all__sagemath_gap.py b/src/sage/interfaces/all__sagemath_gap.py similarity index 100% rename from src/sage/sets/all__sagemath_gap.py rename to src/sage/interfaces/all__sagemath_gap.py From a97f975e36a84bb7800b051a22774a2a5d5a0774 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 15 Jun 2023 12:41:56 -0700 Subject: [PATCH 55/60] src/sage/graphs/spanning_tree.pyx: Remove faulty 'sage_setup: distribution' --- src/sage/graphs/spanning_tree.pyx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sage/graphs/spanning_tree.pyx b/src/sage/graphs/spanning_tree.pyx index 5b493908b83..179625ab743 100644 --- a/src/sage/graphs/spanning_tree.pyx +++ b/src/sage/graphs/spanning_tree.pyx @@ -1,4 +1,3 @@ -# sage_setup: distribution = sagemath-gap # cython: binding=True r""" Spanning trees From 011decdb9e175f9929d27440b5debc92fc8bc84f Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 15 Jun 2023 23:24:33 -0700 Subject: [PATCH 56/60] pkgs/sagemath-gap: Add sage.interfaces.gap* --- src/sage/interfaces/gap.py | 2 +- src/sage/interfaces/gap_workspace.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sage/interfaces/gap.py b/src/sage/interfaces/gap.py index 44900d525c8..a0b5539f68f 100644 --- a/src/sage/interfaces/gap.py +++ b/src/sage/interfaces/gap.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# sage_setup: distribution = sagemath-gap r""" Interface to GAP diff --git a/src/sage/interfaces/gap_workspace.py b/src/sage/interfaces/gap_workspace.py index 03b40be6856..4bc9f3033b5 100644 --- a/src/sage/interfaces/gap_workspace.py +++ b/src/sage/interfaces/gap_workspace.py @@ -1,3 +1,4 @@ +# sage_setup: distribution = sagemath-gap r""" Support for (lib)GAP workspace files """ From 7dfaf0755219ad632191467fe1cdaba84a773aba Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 20 Jun 2023 13:22:50 -0700 Subject: [PATCH 57/60] bootstrap: Write m4/sage_spkg_versions_toml.m4 and use it in pkgs/*/pyproject.toml.m4 --- pkgs/sagemath-flint/pyproject.toml.m4 | 24 ++++++++++++------------ pkgs/sagemath-gap/pyproject.toml.m4 | 24 ++++++++++++------------ pkgs/sagemath-giac/pyproject.toml.m4 | 20 ++++++++++---------- pkgs/sagemath-homfly/pyproject.toml.m4 | 18 +++++++++--------- pkgs/sagemath-ntl/pyproject.toml.m4 | 22 +++++++++++----------- pkgs/sagemath-pari/pyproject.toml.m4 | 20 ++++++++++---------- 6 files changed, 64 insertions(+), 64 deletions(-) diff --git a/pkgs/sagemath-flint/pyproject.toml.m4 b/pkgs/sagemath-flint/pyproject.toml.m4 index 27f72042fab..88276609a96 100644 --- a/pkgs/sagemath-flint/pyproject.toml.m4 +++ b/pkgs/sagemath-flint/pyproject.toml.m4 @@ -1,17 +1,17 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. # sage_conf is needed for library name of the flint library. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - wheel \ - sage_setup \ - sage_conf \ - sagemath_environment \ - sagemath_categories \ - cython \ - gmpy2 \ - cypari \ - cysignals \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_wheel + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sage_conf + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagemath_categories + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_gmpy2 + SPKG_INSTALL_REQUIRES_cypari + SPKG_INSTALL_REQUIRES_cysignals +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-gap/pyproject.toml.m4 b/pkgs/sagemath-gap/pyproject.toml.m4 index 71cd99a5b4f..f7381ea1e0a 100644 --- a/pkgs/sagemath-gap/pyproject.toml.m4 +++ b/pkgs/sagemath-gap/pyproject.toml.m4 @@ -1,16 +1,16 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - wheel \ - sage_setup \ - sagemath_environment \ - sagemath_categories \ - cython \ - gmpy2 \ - cysignals \ - cypari \ - memory_allocator \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_wheel + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagemath_categories + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_gmpy2 + SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_cypari + SPKG_INSTALL_REQUIRES_memory_allocator +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-giac/pyproject.toml.m4 b/pkgs/sagemath-giac/pyproject.toml.m4 index b7a4f7cb1ed..c4ba6105c8d 100644 --- a/pkgs/sagemath-giac/pyproject.toml.m4 +++ b/pkgs/sagemath-giac/pyproject.toml.m4 @@ -1,14 +1,14 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - wheel \ - sage_setup \ - sagemath_environment \ - sagemath_categories \ - cython \ - gmpy2 \ - cysignals \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_wheel + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagemath_categories + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_gmpy2 + SPKG_INSTALL_REQUIRES_cysignals +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-homfly/pyproject.toml.m4 b/pkgs/sagemath-homfly/pyproject.toml.m4 index 09b583ac3ac..121eed8ece7 100644 --- a/pkgs/sagemath-homfly/pyproject.toml.m4 +++ b/pkgs/sagemath-homfly/pyproject.toml.m4 @@ -1,13 +1,13 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - wheel \ - sage_setup \ - sagemath_environment \ - sagemath_objects \ - cython \ - cysignals \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_wheel + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagemath_objects + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_cysignals +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-ntl/pyproject.toml.m4 b/pkgs/sagemath-ntl/pyproject.toml.m4 index b6598c6ce8a..a41c970951b 100644 --- a/pkgs/sagemath-ntl/pyproject.toml.m4 +++ b/pkgs/sagemath-ntl/pyproject.toml.m4 @@ -1,15 +1,15 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - sage_setup \ - sagemath_environment \ - sagemath_categories \ - sagemath_pari \ - cython \ - cysignals \ - cypari \ - memory_allocator \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagemath_categories + SPKG_INSTALL_REQUIRES_sagemath_pari + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_cypari + SPKG_INSTALL_REQUIRES_memory_allocator +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-pari/pyproject.toml.m4 b/pkgs/sagemath-pari/pyproject.toml.m4 index 811bf51663c..c1426962e7d 100644 --- a/pkgs/sagemath-pari/pyproject.toml.m4 +++ b/pkgs/sagemath-pari/pyproject.toml.m4 @@ -1,14 +1,14 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - sage_setup \ - sagemath_environment \ - sagemath_categories \ - cython \ - cysignals \ - cypari \ - memory_allocator \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagemath_categories + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_cypari + SPKG_INSTALL_REQUIRES_memory_allocator +] build-backend = "setuptools.build_meta" From 703dfc51bfde4da51e5e2bb33dfb70333b8099b8 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 19 Jun 2023 10:20:50 -0700 Subject: [PATCH 58/60] Use m4/setup_cfg_metadata.m4 in setup.cfg files to reduce boilerplate --- pkgs/sagemath-flint/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-gap/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-giac/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-homfly/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-ntl/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-pari/setup.cfg.m4 | 20 +------------------- 6 files changed, 6 insertions(+), 114 deletions(-) diff --git a/pkgs/sagemath-flint/setup.cfg.m4 b/pkgs/sagemath-flint/setup.cfg.m4 index 8808f33deb7..6fba530b144 100644 --- a/pkgs/sagemath-flint/setup.cfg.m4 +++ b/pkgs/sagemath-flint/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Fast computations with FLINT and arb long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-gap/setup.cfg.m4 b/pkgs/sagemath-gap/setup.cfg.m4 index 966019e0b2e..18965daf0a8 100644 --- a/pkgs/sagemath-gap/setup.cfg.m4 +++ b/pkgs/sagemath-gap/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Computational Group Theory with GAP long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-giac/setup.cfg.m4 b/pkgs/sagemath-giac/setup.cfg.m4 index 921d4d98893..3624832b18d 100644 --- a/pkgs/sagemath-giac/setup.cfg.m4 +++ b/pkgs/sagemath-giac/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with giac long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-homfly/setup.cfg.m4 b/pkgs/sagemath-homfly/setup.cfg.m4 index ddca453ed11..7f084f63569 100644 --- a/pkgs/sagemath-homfly/setup.cfg.m4 +++ b/pkgs/sagemath-homfly/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Homfly polynomials of knots/links with libhomfly long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-ntl/setup.cfg.m4 b/pkgs/sagemath-ntl/setup.cfg.m4 index 5997bb42048..f14e1cfd045 100644 --- a/pkgs/sagemath-ntl/setup.cfg.m4 +++ b/pkgs/sagemath-ntl/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Computational Number Theory with NTL long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-pari/setup.cfg.m4 b/pkgs/sagemath-pari/setup.cfg.m4 index df4d0b304f7..63f3142c0c0 100644 --- a/pkgs/sagemath-pari/setup.cfg.m4 +++ b/pkgs/sagemath-pari/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Computational Number Theory with PARI/GP long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 From abcee7ee29b91326dcac5945a9a01806740d34ea Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 8 Jul 2023 19:23:19 -0700 Subject: [PATCH 59/60] pkgs/sagemath-{flint,gap,giac,homfly,pari}: Update from #35095 --- pkgs/sagemath-flint/MANIFEST.in | 4 +++- pkgs/sagemath-flint/setup.cfg.m4 | 6 ++---- pkgs/sagemath-flint/tox.ini | 13 +++++++------ pkgs/sagemath-gap/setup.cfg.m4 | 22 ++++++++++++++-------- pkgs/sagemath-gap/tox.ini | 9 +++++---- pkgs/sagemath-giac/setup.cfg.m4 | 6 ++---- pkgs/sagemath-giac/tox.ini | 13 +++++++------ pkgs/sagemath-homfly/setup.cfg.m4 | 6 ++---- pkgs/sagemath-homfly/tox.ini | 9 +++++---- pkgs/sagemath-pari/setup.cfg.m4 | 14 ++++++-------- pkgs/sagemath-pari/tox.ini | 13 +++++++------ 11 files changed, 60 insertions(+), 55 deletions(-) diff --git a/pkgs/sagemath-flint/MANIFEST.in b/pkgs/sagemath-flint/MANIFEST.in index f91f0aa5d12..3fd11749d81 100644 --- a/pkgs/sagemath-flint/MANIFEST.in +++ b/pkgs/sagemath-flint/MANIFEST.in @@ -1,7 +1,6 @@ include VERSION.txt prune sage -global-include all__sagemath_flint.py graft sage/libs/arb graft sage/libs/flint @@ -33,6 +32,9 @@ include sage/rings/padics/*.pxi include sage/rings/polynomial/*_flint.p* include sage/rings/polynomial/*_arb.p* +global-exclude all__sagemath_*.p* +global-include all__sagemath_flint.py + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-flint/setup.cfg.m4 b/pkgs/sagemath-flint/setup.cfg.m4 index 6fba530b144..ca717450b75 100644 --- a/pkgs/sagemath-flint/setup.cfg.m4 +++ b/pkgs/sagemath-flint/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-flint version = file: VERSION.txt @@ -10,9 +10,7 @@ include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - sagemath_categories \ - | sed "2,\$s/^/ /;"')dnl + SPKG_INSTALL_REQUIRES_sagemath_categories packages = sage.libs.arb diff --git a/pkgs/sagemath-flint/tox.ini b/pkgs/sagemath-flint/tox.ini index 4d4d9f20f19..dc26c91e35e 100644 --- a/pkgs/sagemath-flint/tox.ini +++ b/pkgs/sagemath-flint/tox.ini @@ -1,14 +1,14 @@ # To build and test in the tox environment: # -# ./sage -sh -c '(cd pkgs/sagemath-homfly && tox -v -v -v -e sagepython)' +# ./sage -sh -c '(cd pkgs/sagemath-flint && tox -v -v -v -e sagepython)' # # To test interactively: # -# pkgs/sagemath-homfly/.tox/sagepython/bin/python +# pkgs/sagemath-flint/.tox/sagepython/bin/python # [tox] envlist = - sagepython-norequirements + sagepython-sagewheels-nopypi-norequirements [testenv] deps = @@ -54,11 +54,12 @@ basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-sagewheels-nopypi] basepython = {env:SAGE_VENV}/bin/python3 -[testenv:sagepython-sagewheels-nopypi-norequirements] -basepython = {env:SAGE_VENV}/bin/python3 - [testenv:sagepython-sagewheels] basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-norequirements] basepython = {env:SAGE_VENV}/bin/python3 + + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 diff --git a/pkgs/sagemath-gap/setup.cfg.m4 b/pkgs/sagemath-gap/setup.cfg.m4 index 18965daf0a8..44d3dd61802 100644 --- a/pkgs/sagemath-gap/setup.cfg.m4 +++ b/pkgs/sagemath-gap/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-gap version = file: VERSION.txt @@ -10,10 +10,16 @@ include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - cypari \ - cysignals \ - memory_allocator \ - sagemath_environment \ - sagemath_categories \ - | sed "2,\$s/^/ /;"')dnl + SPKG_INSTALL_REQUIRES_cypari + SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_memory_allocator + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagemath_categories + +[options.package_data] + +sage.libs.gap = + sage.gaprc + +sage.ext_data = + * diff --git a/pkgs/sagemath-gap/tox.ini b/pkgs/sagemath-gap/tox.ini index 492c30f3252..aea88292c88 100644 --- a/pkgs/sagemath-gap/tox.ini +++ b/pkgs/sagemath-gap/tox.ini @@ -8,7 +8,7 @@ # [tox] envlist = - sagepython-norequirements + sagepython-sagewheels-nopypi-norequirements [testenv] deps = @@ -54,11 +54,12 @@ basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-sagewheels-nopypi] basepython = {env:SAGE_VENV}/bin/python3 -[testenv:sagepython-sagewheels-nopypi-norequirements] -basepython = {env:SAGE_VENV}/bin/python3 - [testenv:sagepython-sagewheels] basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-norequirements] basepython = {env:SAGE_VENV}/bin/python3 + + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 diff --git a/pkgs/sagemath-giac/setup.cfg.m4 b/pkgs/sagemath-giac/setup.cfg.m4 index 3624832b18d..3fc506ffd04 100644 --- a/pkgs/sagemath-giac/setup.cfg.m4 +++ b/pkgs/sagemath-giac/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-giac version = file: VERSION.txt @@ -10,9 +10,7 @@ include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - sagemath_categories \ - | sed "2,\$s/^/ /;"')dnl + SPKG_INSTALL_REQUIRES_sagemath_categories packages = sage.libs.giac diff --git a/pkgs/sagemath-giac/tox.ini b/pkgs/sagemath-giac/tox.ini index 536e83cf685..448288688b7 100644 --- a/pkgs/sagemath-giac/tox.ini +++ b/pkgs/sagemath-giac/tox.ini @@ -1,14 +1,14 @@ # To build and test in the tox environment: # -# ./sage -sh -c '(cd pkgs/sagemath-homfly && tox -v -v -v -e sagepython)' +# ./sage -sh -c '(cd pkgs/sagemath-giac && tox -v -v -v -e sagepython)' # # To test interactively: # -# pkgs/sagemath-homfly/.tox/sagepython/bin/python +# pkgs/sagemath-giac/.tox/sagepython/bin/python # [tox] envlist = - sagepython-norequirements + sagepython-sagewheels-nopypi-norequirements [testenv] deps = @@ -54,11 +54,12 @@ basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-sagewheels-nopypi] basepython = {env:SAGE_VENV}/bin/python3 -[testenv:sagepython-sagewheels-nopypi-norequirements] -basepython = {env:SAGE_VENV}/bin/python3 - [testenv:sagepython-sagewheels] basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-norequirements] basepython = {env:SAGE_VENV}/bin/python3 + + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 diff --git a/pkgs/sagemath-homfly/setup.cfg.m4 b/pkgs/sagemath-homfly/setup.cfg.m4 index 7f084f63569..f2934b06d52 100644 --- a/pkgs/sagemath-homfly/setup.cfg.m4 +++ b/pkgs/sagemath-homfly/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-homfly version = file: VERSION.txt @@ -10,6 +10,4 @@ include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - cysignals \ - | sed "2,\$s/^/ /;"')dnl + SPKG_INSTALL_REQUIRES_cysignals diff --git a/pkgs/sagemath-homfly/tox.ini b/pkgs/sagemath-homfly/tox.ini index fea5497b2a5..99778958109 100644 --- a/pkgs/sagemath-homfly/tox.ini +++ b/pkgs/sagemath-homfly/tox.ini @@ -8,7 +8,7 @@ # [tox] envlist = - sagepython-norequirements + sagepython-sagewheels-nopypi-norequirements [testenv] deps = @@ -53,11 +53,12 @@ basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-sagewheels-nopypi] basepython = {env:SAGE_VENV}/bin/python3 -[testenv:sagepython-sagewheels-nopypi-norequirements] -basepython = {env:SAGE_VENV}/bin/python3 - [testenv:sagepython-sagewheels] basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-norequirements] basepython = {env:SAGE_VENV}/bin/python3 + + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 diff --git a/pkgs/sagemath-pari/setup.cfg.m4 b/pkgs/sagemath-pari/setup.cfg.m4 index 63f3142c0c0..46245352c4f 100644 --- a/pkgs/sagemath-pari/setup.cfg.m4 +++ b/pkgs/sagemath-pari/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-pari version = file: VERSION.txt @@ -10,13 +10,11 @@ include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - cypari \ - cysignals \ - memory_allocator \ - sagemath_environment \ - sagemath_categories \ - | sed "2,\$s/^/ /;"')dnl + SPKG_INSTALL_REQUIRES_cypari + SPKG_INSTALL_REQUIRES_cysignals + SPKG_INSTALL_REQUIRES_memory_allocator + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagemath_categories packages = sage.libs.pari diff --git a/pkgs/sagemath-pari/tox.ini b/pkgs/sagemath-pari/tox.ini index 492c30f3252..4ae06955a88 100644 --- a/pkgs/sagemath-pari/tox.ini +++ b/pkgs/sagemath-pari/tox.ini @@ -1,14 +1,14 @@ # To build and test in the tox environment: # -# ./sage -sh -c '(cd pkgs/sagemath-gap && tox -v -v -v -e sagepython)' +# ./sage -sh -c '(cd pkgs/sagemath-pari && tox -v -v -v -e sagepython)' # # To test interactively: # -# pkgs/sagemath-gap/.tox/sagepython/bin/python +# pkgs/sagemath-pari/.tox/sagepython/bin/python # [tox] envlist = - sagepython-norequirements + sagepython-sagewheels-nopypi-norequirements [testenv] deps = @@ -54,11 +54,12 @@ basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-sagewheels-nopypi] basepython = {env:SAGE_VENV}/bin/python3 -[testenv:sagepython-sagewheels-nopypi-norequirements] -basepython = {env:SAGE_VENV}/bin/python3 - [testenv:sagepython-sagewheels] basepython = {env:SAGE_VENV}/bin/python3 [testenv:sagepython-norequirements] basepython = {env:SAGE_VENV}/bin/python3 + + +[testenv:sagepython-sagewheels-nopypi-norequirements] +basepython = {env:SAGE_VENV}/bin/python3 From da3510af5eefde5c0f289fa88e06bc8b7782426b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 8 Jul 2023 23:04:36 -0700 Subject: [PATCH 60/60] src/sage/features/sagemath.py: Remove spkg from features sage.libs.{flint,ntl,pari} for now to suppress warning --- src/sage/features/sagemath.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sage/features/sagemath.py b/src/sage/features/sagemath.py index 580be376237..c867596f40c 100644 --- a/src/sage/features/sagemath.py +++ b/src/sage/features/sagemath.py @@ -185,7 +185,7 @@ def __init__(self): JoinFeature.__init__(self, 'sage.libs.flint', [PythonModule('sage.libs.flint.flint'), PythonModule('sage.libs.arb.arith')], - spkg='sagemath_flint', type='standard') + type='standard') class sage__libs__ntl(JoinFeature): @@ -209,7 +209,7 @@ def __init__(self): """ JoinFeature.__init__(self, 'sage.libs.ntl', [PythonModule('sage.libs.ntl.convert')], - spkg='sagemath_ntl', type='standard') + type='standard') class sage__libs__pari(JoinFeature): @@ -232,7 +232,7 @@ def __init__(self): """ JoinFeature.__init__(self, 'sage.libs.pari', [PythonModule('sage.libs.pari.convert_sage')], - spkg='sagemath_pari', type='standard') + type='standard') class sage__modules(JoinFeature):