Skip to content

Commit

Permalink
Merge branch 'develop' into fix/34794/run-doc-server-along-with-jupyter
Browse files Browse the repository at this point in the history
  • Loading branch information
kwankyu authored Mar 18, 2023
2 parents 5ba43b8 + f449b14 commit 05362d5
Show file tree
Hide file tree
Showing 354 changed files with 12,495 additions and 1,976 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
/config.status
/configure
/conftest*
/confdefs.h

/m4/sage_spkg_configures.m4

Expand Down
8 changes: 4 additions & 4 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"description": "Mirror of the Sage https://sagemath.org/ source tree",
"license": "other-open",
"title": "sagemath/sage: 10.0.beta1",
"version": "10.0.beta1",
"title": "sagemath/sage: 10.0.beta4",
"version": "10.0.beta4",
"upload_type": "software",
"publication_date": "2023-02-19",
"publication_date": "2023-03-12",
"creators": [
{
"affiliation": "SageMath.org",
Expand All @@ -15,7 +15,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta1",
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta4",
"relation": "isSupplementTo"
},
{
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,20 @@ in the Installation Guide.
or JupyterLab installation, as described in [section
"Launching SageMath"](https://doc.sagemath.org/html/en/installation/launching.html)
in the installation manual.

Alternative Installation using PyPI
---------------

For installation of `sage` in python using `pip` you need to install `sagemath-standard`. First, activate your python virtual environment and follow these steps:

$ python3 -m pip install sage_conf
$ ls $(sage-config SAGE_SPKG_WHEELS)
$ python3 -m pip install $(sage-config SAGE_SPKG_WHEELS)/*.whl
$ python3 -m pip install sagemath-standard

You need to install `sage_conf`, a wheelhouse of various python packages. You can list the wheels using `ls $(sage-config SAGE_SPKG_WHEELS)`. After manual installation of these wheels, you can install the sage library, `sagemath-standard`.

**NOTE:** You can find `sage` and `sagemath` pip packages but with these packages, you will encounter `ModuleNotFoundError`.

Troubleshooting
---------------
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 10.0.beta1, Release Date: 2023-02-19
SageMath version 10.0.beta4, Release Date: 2023-03-12
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=0897c667d1327d2a51ea3d3bd1d9e1a3f5ca2606
md5=a1f271e5ffcf558d054028839296a072
cksum=437557471
sha1=d8ef4b8b0d227b2530cff20c65911eb9587828a3
md5=f58322981d5c5e26b1d9eadf3c2a9132
cksum=3821522607
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
08185d786047228caff879eba88a1f8148a49020
d6c38e59d84f0dcb7c08110445050c1c370f7440
6 changes: 3 additions & 3 deletions build/pkgs/eclib/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=eclib-VERSION.tar.bz2
sha1=2e86bc02e43edfb43473ecb1ae8e7b67cfe87e3c
md5=bb6fc7cb57c01c45a033276e1a94028f
cksum=3974905173
sha1=7c8b64bd9a1b8f4f489690a53c1f329afc953f2c
md5=03a87ae2b490f11b81ec6b305cbc8087
cksum=111064162
upstream_url=https://github.com/JohnCremona/eclib/releases/download/VERSION/eclib-VERSION.tar.bz2
2 changes: 1 addition & 1 deletion build/pkgs/eclib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20220621
20221012
2 changes: 1 addition & 1 deletion build/pkgs/eclib/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SAGE_SPKG_CONFIGURE([eclib], [
SAGE_SPKG_DEPCHECK([ntl pari flint], [
dnl Trac #31443, #34029: use existing eclib only if the version reported by pkg-config is correct
m4_pushdef([SAGE_ECLIB_VER],["20220621"])
m4_pushdef([SAGE_ECLIB_VER],["20221012"])
PKG_CHECK_MODULES([ECLIB], [eclib = SAGE_ECLIB_VER], [
AC_CACHE_CHECK([for mwrank version == SAGE_ECLIB_VER], [ac_cv_path_MWRANK], [
AC_PATH_PROGS_FEATURE_CHECK([MWRANK], [mwrank], [
Expand Down
1 change: 0 additions & 1 deletion build/pkgs/giac/checksums.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ tarball=giac-VERSION.tar.bz2
sha1=78c15badd19b49b7d111ac204b611a4378ce3d15
md5=8fbd43a5c60848b6813b7fc8698a0199
cksum=1923149665
upstream_url=https://trac.sagemath.org/raw-attachment/ticket/31563/giac-VERSION.tar.bz2
1 change: 0 additions & 1 deletion build/pkgs/iml/checksums.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ tarball=iml-VERSION.tar.bz2
sha1=8aba468a62e6fb0584be9b014350b734663c0670
md5=a8083e70c0c4378f69eb772c1eeed6f0
cksum=2793221462
upstream_url=https://trac.sagemath.org/raw-attachment/ticket/33195/iml-1.0.4p2.tar.bz2
1 change: 0 additions & 1 deletion build/pkgs/mathjax/checksums.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ tarball=mathjax-VERSION.tar.gz
sha1=3f7abecf8cacd7f5d7f9ae6c3baca7739101c17d
md5=ba1a65ab58aaad6c84f39735c619bc34
cksum=1142131398
upstream_url=https://trac.sagemath.org/raw-attachment/ticket/25833/mathjax-3.2.0.tar.gz
1 change: 0 additions & 1 deletion build/pkgs/msolve/checksums.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ tarball=msolve-VERSION.tar.gz
sha1=5b227de8b222bfe8d143e1d7ea77ad71cd209dc8
md5=2f34bd9ccb089688ae169201281108dc
cksum=941373315
upstream_url=https://trac.sagemath.org/raw-attachment/ticket/31664/msolve-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/sage_conf/install-requires.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.0b1
sage-conf ~= 10.0b4
2 changes: 1 addition & 1 deletion build/pkgs/sage_docbuild/install-requires.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.0b1
sage-docbuild ~= 10.0b4
2 changes: 1 addition & 1 deletion build/pkgs/sage_setup/install-requires.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.0b1
sage-setup ~= 10.0b4
2 changes: 1 addition & 1 deletion build/pkgs/sage_sws2rst/install-requires.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.0b1
sage-sws2rst ~= 10.0b4
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/install-requires.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
sagelib ~= 10.0b1
sagelib ~= 10.0b4
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_categories/install-requires.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.0b1
sagemath-categories ~= 10.0b4
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_environment/install-requires.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.0b1
sagemath-environment ~= 10.0b4
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_objects/install-requires.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.0b1
sagemath-objects ~= 10.0b4
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_repl/install-requires.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.0b1
sagemath-repl ~= 10.0b4
2 changes: 1 addition & 1 deletion pkgs/sage-conf/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
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.0.beta1
10.0.beta4
2 changes: 1 addition & 1 deletion pkgs/sage-docbuild/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
2 changes: 1 addition & 1 deletion pkgs/sage-setup/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
2 changes: 1 addition & 1 deletion pkgs/sage-sws2rst/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
2 changes: 1 addition & 1 deletion pkgs/sagemath-categories/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
2 changes: 1 addition & 1 deletion pkgs/sagemath-environment/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
2 changes: 1 addition & 1 deletion pkgs/sagemath-objects/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
2 changes: 1 addition & 1 deletion pkgs/sagemath-repl/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
2 changes: 1 addition & 1 deletion src/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.beta1
10.0.beta4
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.0.beta1'
SAGE_RELEASE_DATE='2023-02-19'
SAGE_VERSION_BANNER='SageMath version 10.0.beta1, Release Date: 2023-02-19'
SAGE_VERSION='10.0.beta4'
SAGE_RELEASE_DATE='2023-03-12'
SAGE_VERSION_BANNER='SageMath version 10.0.beta4, Release Date: 2023-03-12'
1 change: 1 addition & 0 deletions src/doc/en/reference/combinat/module_list.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Comprehensive Module List
sage/combinat/alternating_sign_matrix
sage/combinat/backtrack
sage/combinat/baxter_permutations
sage/combinat/bijectionist
sage/combinat/binary_recurrence_sequences
sage/combinat/binary_tree
sage/combinat/blob_algebra
Expand Down
1 change: 1 addition & 0 deletions src/doc/en/reference/drinfeld_modules/conf.py
42 changes: 42 additions & 0 deletions src/doc/en/reference/drinfeld_modules/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
Drinfeld modules
====================================

SageMath include facilities to manipulate Drinfeld modules and their morphisms. The
main entry point is the class
:class:`sage.rings.function_field.drinfeld_modules.drinfeld_module.DrinfeldModule`.

Drinfeld modules
----------------

.. toctree::
:maxdepth: 2

sage/rings/function_field/drinfeld_modules/drinfeld_module
sage/rings/function_field/drinfeld_modules/finite_drinfeld_module

Morphisms and isogenies
-----------------------

.. toctree::
:maxdepth: 2

sage/rings/function_field/drinfeld_modules/morphism
sage/rings/function_field/drinfeld_modules/homset

The module action induced by a Drinfeld module
----------------------------------------------

.. toctree::
:maxdepth: 2

sage/rings/function_field/drinfeld_modules/action

The category of Drinfeld modules
--------------------------------

.. toctree::
:maxdepth: 2

sage/categories/drinfeld_modules

.. include:: ../footer.txt
1 change: 1 addition & 0 deletions src/doc/en/reference/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ Number Fields, Function Fields, and Valuations
* :doc:`Number Fields <number_fields/index>`
* :doc:`Function Fields <function_fields/index>`
* :doc:`Discrete Valuations <valuations/index>`
* :doc:`Drinfeld Modules <drinfeld_modules/index>`

Number Theory
-------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ whereas others have multiple bases.

sage/rings/polynomial/polynomial_compiled
sage/rings/polynomial/polynomial_fateman

sage/rings/polynomial/integer_valued_polynomials
Loading

0 comments on commit 05362d5

Please sign in to comment.