Skip to content

Commit

Permalink
Merge branch 'ship-init' into meson-win
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasdiez authored Dec 16, 2024
2 parents d4924b0 + 4568979 commit fc3e84c
Show file tree
Hide file tree
Showing 252 changed files with 3,376 additions and 1,146 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,6 @@ jobs:

- name: Upload coverage to codecov
if: (success() || failure()) && steps.container.outcome == 'success'
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
directory: .coverage/coverage-report
2 changes: 1 addition & 1 deletion .github/workflows/ci-meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
key: ${{ runner.os }}-meson-${{ matrix.python }}

- name: Setup Conda environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: ${{ matrix.python }}
miniforge-version: latest
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ title: SageMath
abstract: SageMath is a free open-source mathematics software system.
authors:
- name: "The SageMath Developers"
version: 10.6.beta0
version: 10.6.beta1
doi: 10.5281/zenodo.8042260
date-released: 2024-12-08
date-released: 2024-12-15
repository-code: "https://github.com/sagemath/sage"
url: "https://www.sagemath.org/"
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 10.6.beta0, Release Date: 2024-12-08
SageMath version 10.6.beta1, Release Date: 2024-12-15
4 changes: 2 additions & 2 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tarball=configure-VERSION.tar.gz
sha1=ca942ace2e5104f3ae9e57946c8228b0bdb580c5
sha256=99c0a76943170a85d2eb868d72dd673c6b0df529d99b808458bdb3b285dec8fe
sha1=ebc4bd50c332f06ad5b2a4ce6217ec65790655ab
sha256=a2fa7623b406a7937ebfbe3cc6d9e17bcf0c219dec2646320b7266326d789b56
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d129e08e85a0c6530fa140dfc04c86ac0b74e05e
a72ae6d615ddfd3e49b36c200aaf14c24a265916
1 change: 1 addition & 0 deletions build/pkgs/execnet/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-execnet
1 change: 1 addition & 0 deletions build/pkgs/execnet/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-execnet
1 change: 1 addition & 0 deletions build/pkgs/execnet/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-execnet
1 change: 1 addition & 0 deletions build/pkgs/execnet/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/execnet
1 change: 1 addition & 0 deletions build/pkgs/execnet/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-execnet
1 change: 1 addition & 0 deletions build/pkgs/execnet/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAGE_SPKG_CONFIGURE([execnet], [SAGE_PYTHON_PACKAGE_CHECK([execnet])])
1 change: 1 addition & 0 deletions build/pkgs/iniconfig/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-iniconfig
1 change: 1 addition & 0 deletions build/pkgs/iniconfig/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-iniconfig
1 change: 1 addition & 0 deletions build/pkgs/iniconfig/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-iniconfig
1 change: 1 addition & 0 deletions build/pkgs/iniconfig/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/iniconfig
1 change: 1 addition & 0 deletions build/pkgs/iniconfig/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-iniconfig
1 change: 1 addition & 0 deletions build/pkgs/iniconfig/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAGE_SPKG_CONFIGURE([iniconfig], [SAGE_PYTHON_PACKAGE_CHECK([iniconfig])])
2 changes: 1 addition & 1 deletion build/pkgs/planarity/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SAGE_SPKG_CONFIGURE([planarity], [
AC_LANG_PUSH([C])
AC_CHECK_HEADER([planarity/planarity.h], [
AC_CHECK_HEADER([planarity/graph.h], [
AC_CHECK_LIB([planarity], [gp_InitGraph], [
AC_MSG_CHECKING([for planarity version 3.0 or later])
AC_COMPILE_IFELSE(
Expand Down
1 change: 1 addition & 0 deletions build/pkgs/pyproject_api/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-pyproject-api
1 change: 1 addition & 0 deletions build/pkgs/pyproject_api/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-pyproject-api
1 change: 1 addition & 0 deletions build/pkgs/pyproject_api/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-pyproject-api
1 change: 1 addition & 0 deletions build/pkgs/pyproject_api/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/pyproject-api
1 change: 1 addition & 0 deletions build/pkgs/pyproject_api/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-pyproject-api
1 change: 1 addition & 0 deletions build/pkgs/pyproject_hooks/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-pyproject-hooks
1 change: 1 addition & 0 deletions build/pkgs/pyproject_hooks/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-pyproject-hooks
1 change: 1 addition & 0 deletions build/pkgs/pyproject_hooks/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-pyproject-hooks
1 change: 1 addition & 0 deletions build/pkgs/pyproject_hooks/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/pyproject-hooks
1 change: 1 addition & 0 deletions build/pkgs/pyproject_hooks/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-pyproject-hooks
1 change: 1 addition & 0 deletions build/pkgs/pyproject_hooks/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAGE_SPKG_CONFIGURE([pyproject_hooks], [SAGE_PYTHON_PACKAGE_CHECK([pyproject_hooks])])
1 change: 1 addition & 0 deletions build/pkgs/pyproject_metadata/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-pyproject-metadata
1 change: 1 addition & 0 deletions build/pkgs/pyproject_metadata/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-pyproject-metadata
1 change: 1 addition & 0 deletions build/pkgs/pyproject_metadata/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-pyproject-metadata
2 changes: 1 addition & 1 deletion build/pkgs/sage_conf/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-conf ~= 10.6b0
sage-conf ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sage_docbuild/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-docbuild ~= 10.6b0
sage-docbuild ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sage_setup/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-setup ~= 10.6b0
sage-setup ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sage_sws2rst/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-sws2rst ~= 10.6b0
sage-sws2rst ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-standard ~= 10.6b0
sagemath-standard ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_bliss/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-bliss ~= 10.6b0
sagemath-bliss ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_categories/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-categories ~= 10.6b0
sagemath-categories ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_coxeter3/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-coxeter3 ~= 10.6b0
sagemath-coxeter3 ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_environment/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-environment ~= 10.6b0
sagemath-environment ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_mcqd/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-mcqd ~= 10.6b0
sagemath-mcqd ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_meataxe/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-meataxe ~= 10.6b0
sagemath-meataxe ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_objects/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-objects ~= 10.6b0
sagemath-objects ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_repl/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-repl ~= 10.6b0
sagemath-repl ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_sirocco/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-sirocco ~= 10.6b0
sagemath-sirocco ~= 10.6b1
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_tdlib/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-tdlib ~= 10.6b0
sagemath-tdlib ~= 10.6b1
2 changes: 1 addition & 1 deletion pkgs/sage-conf/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sage-conf_conda/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sage-conf_pypi/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sage-docbuild/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sage-setup/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sage-sws2rst/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-bliss/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-categories/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-coxeter3/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-environment/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-mcqd/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-meataxe/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-objects/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-repl/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-sirocco/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion pkgs/sagemath-tdlib/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
2 changes: 1 addition & 1 deletion src/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.beta0
10.6.beta1
6 changes: 3 additions & 3 deletions src/bin/sage-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# which stops "setup.py develop" from rewriting it as a Python file.
:
# This file is auto-generated by the sage-update-version script, do not edit!
SAGE_VERSION='10.6.beta0'
SAGE_RELEASE_DATE='2024-12-08'
SAGE_VERSION_BANNER='SageMath version 10.6.beta0, Release Date: 2024-12-08'
SAGE_VERSION='10.6.beta1'
SAGE_RELEASE_DATE='2024-12-15'
SAGE_VERSION_BANNER='SageMath version 10.6.beta1, Release Date: 2024-12-15'
21 changes: 10 additions & 11 deletions src/doc/en/developer/coding_in_cython.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ up-to-date information or check out the
to get started immediately.


Writing cython code in Sage
Writing Cython code in Sage
===========================

There are several ways to create and build Cython code in Sage.

#. In the Sage Notebook, begin any cell with ``%cython``. When you
evaluate that cell,
#. In the Sage notebook or the Sage command line, begin any cell with
a line containing ``%%cython``. When you evaluate that cell,

#. It is saved to a file.

Expand All @@ -53,22 +53,21 @@ There are several ways to create and build Cython code in Sage.
program that was compiled to create the ``.so`` file.

#. A ``cpdef`` or ``def`` function, say ``testfunction``, defined in
a ``%cython`` cell in a worksheet can be imported and made available
in a different ``%cython`` cell within the same worksheet by
a ``%%cython`` cell in a worksheet can be imported and made available
in a different ``%%cython`` cell within the same worksheet by
importing it as shown below::

%cython
%%cython
from __main__ import testfunction

#. Create an ``.spyx`` file and attach or load it from the command
line. This is similar to creating a ``%cython`` cell in the
notebook but works completely from the command line (and not from
the notebook).
Refer to :meth:`sage.repl.ipython_extension.SageMagics.cython`.

#. Create an ``.spyx`` file and attach or load it
from the command line.

#. Create a ``.pyx`` file and add it to the Sage library.
Then run ``sage -b`` to rebuild Sage.


Attaching or loading .spyx files
================================

Expand Down
11 changes: 11 additions & 0 deletions src/doc/en/reference/references/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,10 @@ REFERENCES:
.. [Ap1997] \T. Apostol, Modular functions and Dirichlet series in
number theory, Springer, 1997 (2nd ed), section 3.7--3.9.

.. [AP2024] William Atherton, Dmitrii V. Pasechnik, *Decline and Fall of the
ICALP 2008 Modular Decomposition algorithm*, 2024.
:arxiv:`2404.14049`.

.. [APR2001] George E. Andrews, Peter Paule, Axel Riese,
*MacMahon's partition analysis: the Omega package*,
European J. Combin. 22 (2001), no. 7, 887--904.
Expand Down Expand Up @@ -496,6 +500,9 @@ REFERENCES:
.. [BeBo2009] Olivier Bernardi and Nicolas Bonichon, *Intervals in Catalan
lattices and realizers of triangulations*, JCTA 116 (2009)

.. [Best2021] Alex J. Best: Tools and Techniques for Rational Points on Curves.
PhD Thesis, Boston University, 2021.

.. [BBGL2008] \A. Blondin Massé, S. Brlek, A. Garon, and S. Labbé,
Combinatorial properties of f -palindromes in the
Thue-Morse sequence. Pure Math. Appl.,
Expand Down Expand Up @@ -970,6 +977,10 @@ REFERENCES:
Anal. Appl. 15 (1994) 804-823.
:doi:`10.1137/S0895479892230031`

.. [BL1995] W. Bosma, H.W. Lenstra: Complete Systems of Two Addition Laws for
Elliptic Curves. Journal of Number Theory, volume 53, issue 2,
pages 229-240. 1995.

.. [BHMPW20a] Tom Braden, June Huh, Jacob P. Matherne, Nicholas Proudfoot,
and Botong Wang, *A semi-small decomposition of the Chow
ring of a matroid*, :arxiv:`2002.03341` (2020).
Expand Down
6 changes: 4 additions & 2 deletions src/doc/en/reference/repl/index.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
.. _section-command-line:

The Sage Command Line
=====================

The Sage Read-Eval-Print-Loop (REPL) is based on IPython. In this
document, you'll find how the IPython integration works. You should
also be familiar with the documentation for IPython.

For more details about using the Sage command line, see the Sage
tutorial.
For more details about using the Sage command line, see `the Sage
tutorial <../../tutorial/index.html>`_.

Running Sage
------------
Expand Down
1 change: 0 additions & 1 deletion src/doc/en/thematic_tutorials/coercion_and_categories.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ This base class provides a lot more methods than a general parent::
'is_commutative',
'is_field',
'krull_dimension',
'localization',
'ngens',
'one',
'order',
Expand Down
2 changes: 0 additions & 2 deletions src/doc/en/tutorial/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.

.. _tutorial:

========================
Welcome to Sage Tutorial
========================
Expand Down
1 change: 1 addition & 0 deletions src/sage/algebras/finite_dimensional_algebras/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'all.py',
'finite_dimensional_algebra.py',
'finite_dimensional_algebra_element.pxd',
Expand Down
1 change: 1 addition & 0 deletions src/sage/algebras/fusion_rings/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'all.py',
'f_matrix.py',
'fast_parallel_fmats_methods.pxd',
Expand Down
1 change: 1 addition & 0 deletions src/sage/algebras/letterplace/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'all.py',
'free_algebra_element_letterplace.pxd',
'free_algebra_letterplace.pxd',
Expand Down
1 change: 1 addition & 0 deletions src/sage/algebras/lie_algebras/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'abelian.py',
'affine_lie_algebra.py',
'all.py',
Expand Down
1 change: 1 addition & 0 deletions src/sage/algebras/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'affine_nil_temperley_lieb.py',
'algebra.py',
'all.py',
Expand Down
1 change: 1 addition & 0 deletions src/sage/algebras/quatalg/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'all.py',
'quaternion_algebra.py',
'quaternion_algebra_element.pxd',
Expand Down
1 change: 1 addition & 0 deletions src/sage/arith/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'all.py',
'all__sagemath_objects.py',
'constants.pxd',
Expand Down
Loading

0 comments on commit fc3e84c

Please sign in to comment.