Skip to content

Commit bf6edbb

Browse files
committed
Merge branch 'develop' into quasimodform_implement_basis_of_weight
2 parents 2829d51 + f449b14 commit bf6edbb

File tree

656 files changed

+13636
-2794
lines changed

Some content is hidden

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

656 files changed

+13636
-2794
lines changed

.devcontainer/portability-updateContent.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# The script assumes that it is run from SAGE_ROOT.
66
#
77
# If "config.log" or "logs" are symlinks (for example, created by 'tox -e local-...',
8-
# or after https://trac.sagemath.org/ticket/33262), they might point outside of
8+
# or after https://github.com/sagemath/sage/issues/33262), they might point outside of
99
# the dev container, so remove them. Likewise for upstream.
1010
for f in config.log logs upstream; do
1111
if [ -L $f ]; then
1212
rm -f $f
1313
fi
1414
done
15-
# If possible (ensured after https://trac.sagemath.org/ticket/33262), keep the
15+
# If possible (ensured after https://github.com/sagemath/sage/issues/33262), keep the
1616
# logs in the container.
1717
if [ ! -d logs ]; then
1818
ln -s /sage/logs logs

.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"

.github/workflows/ci-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
matrix:
3939
stage: ["1", "2", "2-optional-0-o", "2-optional-p-z", "2-experimental-0-o", "2-experimental-p-z"]
4040
# python3_xcode is only accepted if enough packages are available from the system
41-
# --> to test "minimal", we would need https://trac.sagemath.org/ticket/30949
41+
# --> to test "minimal", we would need https://github.com/sagemath/sage/issues/30949
4242
tox_env: [homebrew-macos-usrlocal-minimal, homebrew-macos-usrlocal-standard, homebrew-macos-usrlocal-maximal, homebrew-macos-usrlocal-python3_xcode-standard, conda-forge-macos-minimal, conda-forge-macos-standard, conda-forge-macos-maximal]
4343
xcode_version_factor: [default]
4444
os: [ macos-11, macos-12 ]

.github/workflows/ci-wsl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
windows:
1414
runs-on: windows-latest
1515
name: Ubuntu 20.04
16-
# Following https://trac.sagemath.org/ticket/25206#comment:63
16+
# Following https://github.com/sagemath/sage/issues/25206#comment:63
1717
steps:
1818
- name: Configure git
1919
run: git config --global core.symlinks true

.gitignore

Lines changed: 2 additions & 1 deletion
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

@@ -187,7 +188,7 @@ build/bin/sage-build-env-config
187188
/pkgs/sagemath-repl/requirements.txt
188189
/pkgs/sagemath-categories/MANIFEST.in
189190

190-
# same for old locations - before Trac #31577
191+
# same for old locations - before Issue #31577
191192
/build/pkgs/*/src/build
192193
/build/pkgs/*/src/dist
193194
/build/pkgs/*/src/MANIFEST

.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.beta0",
5-
"version": "10.0.beta0",
4+
"title": "sagemath/sage: 10.0.beta4",
5+
"version": "10.0.beta4",
66
"upload_type": "software",
7-
"publication_date": "2023-02-12",
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.beta0",
18+
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta4",
1919
"relation": "isSupplementTo"
2020
},
2121
{

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SAGE_ROOT_LOGS = logs
3131

3232
# The --stop flag below is just a random flag to induce graceful
3333
# breakage with non-GNU versions of make.
34-
# See https://trac.sagemath.org/ticket/24617
34+
# See https://github.com/sagemath/sage/issues/24617
3535

3636
# Defer unknown targets to build/make/Makefile
3737
%::
@@ -259,8 +259,8 @@ TEST_FILES = --all
259259
TEST_FLAGS =
260260

261261
# When the documentation is installed, "optional" also includes all tests marked 'sagemath_doc_html',
262-
# see https://trac.sagemath.org/ticket/25345, https://trac.sagemath.org/ticket/26110, and
263-
# https://trac.sagemath.org/ticket/32759
262+
# see https://github.com/sagemath/sage/issues/25345, https://github.com/sagemath/sage/issues/26110, and
263+
# https://github.com/sagemath/sage/issues/32759
264264
TEST_OPTIONAL = sage,optional
265265

266266
# Keep track of the top-level *test* Makefile target for logging.

README.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ in the Installation Guide.
329329
manager.
330330

331331
For a large [list of Sage
332-
packages](https://trac.sagemath.org/ticket/27330), Sage is able to
332+
packages](https://github.com/sagemath/sage/issues/27330), Sage is able to
333333
detect whether an installed system package is suitable for use with
334334
Sage; in that case, Sage will not build another copy from source.
335335

@@ -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.beta0, Release Date: 2023-02-12
1+
SageMath version 10.0.beta4, Release Date: 2023-03-12

bootstrap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [y
4747
done
4848
# --enable-SPKG options
4949
for pkgname in $(sage-package list :optional: :experimental: | sort); do
50-
# Trac #29629: Temporary solution for Sage 9.1: Do not provide
50+
# Issue #29629: Temporary solution for Sage 9.1: Do not provide
5151
# --enable-SPKG options for installing pip packages
5252
if [ ! -f build/pkgs/$pkgname/requirements.txt ]; then
5353
pkgtype="$(cat build/pkgs/$pkgname/type)"
54-
# Trac #29124: Do not provide --enable-_recommended and similar
54+
# Issue #29124: Do not provide --enable-_recommended and similar
5555
case "$pkgname" in
5656
_*) ;;
5757
*) spkg_configures="$spkg_configures
5858
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])"
5959
if [ -f build/pkgs/$pkgname/spkg-install -o -f build/pkgs/$pkgname/spkg-install.in ]; then
60-
# Trac #31163: Not just an optional dummy package
60+
# Issue #31163: Not just an optional dummy package
6161
spkg_configures="$spkg_configures
6262
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(grep -v ^= build/pkgs/$pkgname/SPKG.rst | head -n1 2>/dev/null || echo $pkgname)])"
6363
fi

0 commit comments

Comments
 (0)