Skip to content

Commit 05362d5

Browse files
kwankyukwankyu
authored
Merge branch 'develop' into fix/34794/run-doc-server-along-with-jupyter
2 parents 5ba43b8 + f449b14 commit 05362d5

File tree

354 files changed

+12495
-1976
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+12495
-1976
lines changed

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Documentation for all configuration options:
2+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
# Maintain dependencies for GitHub Actions
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
/config.status
2020
/configure
2121
/conftest*
22+
/confdefs.h
2223

2324
/m4/sage_spkg_configures.m4
2425

‎.zenodo.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 10.0.beta1",
5-
"version": "10.0.beta1",
4+
"title": "sagemath/sage: 10.0.beta4",
5+
"version": "10.0.beta4",
66
"upload_type": "software",
7-
"publication_date": "2023-02-19",
7+
"publication_date": "2023-03-12",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta1",
18+
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta4",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,20 @@ in the Installation Guide.
394394
or JupyterLab installation, as described in [section
395395
"Launching SageMath"](https://doc.sagemath.org/html/en/installation/launching.html)
396396
in the installation manual.
397+
398+
Alternative Installation using PyPI
399+
---------------
400+
401+
For installation of `sage` in python using `pip` you need to install `sagemath-standard`. First, activate your python virtual environment and follow these steps:
402+
403+
$ python3 -m pip install sage_conf
404+
$ ls $(sage-config SAGE_SPKG_WHEELS)
405+
$ python3 -m pip install $(sage-config SAGE_SPKG_WHEELS)/*.whl
406+
$ python3 -m pip install sagemath-standard
407+
408+
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`.
409+
410+
**NOTE:** You can find `sage` and `sagemath` pip packages but with these packages, you will encounter `ModuleNotFoundError`.
397411

398412
Troubleshooting
399413
---------------

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.0.beta1, Release Date: 2023-02-19
1+
SageMath version 10.0.beta4, Release Date: 2023-03-12

‎build/pkgs/configure/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=0897c667d1327d2a51ea3d3bd1d9e1a3f5ca2606
3-
md5=a1f271e5ffcf558d054028839296a072
4-
cksum=437557471
2+
sha1=d8ef4b8b0d227b2530cff20c65911eb9587828a3
3+
md5=f58322981d5c5e26b1d9eadf3c2a9132
4+
cksum=3821522607

‎build/pkgs/configure/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
08185d786047228caff879eba88a1f8148a49020
1+
d6c38e59d84f0dcb7c08110445050c1c370f7440

‎build/pkgs/eclib/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=eclib-VERSION.tar.bz2
2-
sha1=2e86bc02e43edfb43473ecb1ae8e7b67cfe87e3c
3-
md5=bb6fc7cb57c01c45a033276e1a94028f
4-
cksum=3974905173
2+
sha1=7c8b64bd9a1b8f4f489690a53c1f329afc953f2c
3+
md5=03a87ae2b490f11b81ec6b305cbc8087
4+
cksum=111064162
55
upstream_url=https://github.com/JohnCremona/eclib/releases/download/VERSION/eclib-VERSION.tar.bz2

‎build/pkgs/eclib/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20220621
1+
20221012

‎build/pkgs/eclib/spkg-configure.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SAGE_SPKG_CONFIGURE([eclib], [
22
SAGE_SPKG_DEPCHECK([ntl pari flint], [
33
dnl Trac #31443, #34029: use existing eclib only if the version reported by pkg-config is correct
4-
m4_pushdef([SAGE_ECLIB_VER],["20220621"])
4+
m4_pushdef([SAGE_ECLIB_VER],["20221012"])
55
PKG_CHECK_MODULES([ECLIB], [eclib = SAGE_ECLIB_VER], [
66
AC_CACHE_CHECK([for mwrank version == SAGE_ECLIB_VER], [ac_cv_path_MWRANK], [
77
AC_PATH_PROGS_FEATURE_CHECK([MWRANK], [mwrank], [

0 commit comments

Comments
 (0)