From 86097389c2f992966b58b4c30bcc7856d96c18de Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 5 Jan 2025 16:59:35 -0800 Subject: [PATCH 1/4] tests: Replace import from sage.all --- tests/test_arithmetic_field.py | 2 +- tests/test_builtin_circuit.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_arithmetic_field.py b/tests/test_arithmetic_field.py index 1d76a73..eaf0d1e 100644 --- a/tests/test_arithmetic_field.py +++ b/tests/test_arithmetic_field.py @@ -1,5 +1,5 @@ from circkit.arithmetic import ArithmeticCircuit -from sage.all import GF +from sage.rings.finite_rings.finite_field_constructor import GF import random K = GF(2**8) diff --git a/tests/test_builtin_circuit.py b/tests/test_builtin_circuit.py index 1d76a73..eaf0d1e 100644 --- a/tests/test_builtin_circuit.py +++ b/tests/test_builtin_circuit.py @@ -1,5 +1,5 @@ from circkit.arithmetic import ArithmeticCircuit -from sage.all import GF +from sage.rings.finite_rings.finite_field_constructor import GF import random K = GF(2**8) From 71b2dcb5632cacc68e7c8fdb50e8264b6fe024a1 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 5 Jan 2025 17:00:04 -0800 Subject: [PATCH 2/4] setup.cfg: Remove upper bound on pytest --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index e12b96d..b212af5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,7 +23,7 @@ python_requires = >=3.7 [options.extras_require] test = - pytest>=5.4,<6 + pytest>=5.4 coverage>=5.2,<6 docs = nbsphinx==0.8.8 From 455bd3f61d9a375a9802b65e18fd50000d461f43 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 5 Jan 2025 17:00:25 -0800 Subject: [PATCH 3/4] setup.cfg: Declare extra 'passagemath' --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index b212af5..4e3eff9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,4 +29,5 @@ docs = nbsphinx==0.8.8 sphinxcontrib-napoleon==0.7 sphinx-rtd-theme==1.0.0 - +passagemath = + passagemath-pari From 9f9174f71a25fe5c61c109b53d1da845728f8ebb Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 5 Jan 2025 17:01:32 -0800 Subject: [PATCH 4/4] tox.ini: New --- tox.ini | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tox.ini diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..17b83e7 --- /dev/null +++ b/tox.ini @@ -0,0 +1,18 @@ +[tox] +envlist = passagemath + +[testenv:.pkg] +passenv = + CPATH + LIBRARY_PATH + +[testenv:passagemath] +usedevelop = True +extras = passagemath, test + +passenv = + CPATH + LIBRARY_PATH + +commands = + pytest tests