Skip to content

Commit

Permalink
Merge branch 'develop' into tachyon
Browse files Browse the repository at this point in the history
  • Loading branch information
dimpase authored Feb 7, 2023
2 parents 55c0462 + 66b319b commit 7c8ffc2
Show file tree
Hide file tree
Showing 772 changed files with 13,286 additions and 4,175 deletions.
4 changes: 1 addition & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
Unfortunately we are not accepting issues on GitHub yet. To report an issue,
please head over to https://trac.sagemath.org, log in with your GitHub account,
and create a ticket there :)
Details to be added shortly, meanwhile feel free to open issues and PRs
6 changes: 1 addition & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
Thanks for contributing to Sage! Unfortunately we are not accepting pull
requests on GitHub yet. To propose a change to Sage, please log in with your
GitHub account at https://trac.sagemath.org, create a ticket, and push your
changes to that ticket as explained in our
[Developer's Guide](https://doc.sagemath.org/html/en/developer/manual_git.html).
Thanks for contributing to Sage! Detailed instructions to be added shortly.

Please make sure to also have a look at our
[Code Style Conventions](https://doc.sagemath.org/html/en/developer/coding_basics.html).
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build & Test

on:
pull_request:
push:
workflow_dispatch:
# Allow to run manually
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-conda.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Build & Test using Conda

on:
pull_request:
types: [opened, synchronize]
push:
tags:
- '*'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-cygwin-minimal.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: CI cygwin-minimal

on:
pull_request:
types: [opened, synchronize]
push:
tags:
- '*'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-cygwin-standard.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: CI cygwin-standard

on:
pull_request:
types: [opened, synchronize]
push:
tags:
- '*'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ name: CI Linux
#on: [push, pull_request]

on:
pull_request:
types: [opened, synchronize]
push:
tags:
- '*'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ name: CI macOS
#on: [push, pull_request]

on:
pull_request:
types: [opened, synchronize]
push:
tags:
- '*'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-wsl.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Build & Test WSL

on:
pull_request:
types: [opened, synchronize]
push:
tags:
- '*'
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build documentation

on:
pull_request:
push:
workflow_dispatch:
# Allow to run manually
Expand All @@ -14,7 +15,8 @@ jobs:
build-docs:
runs-on: ubuntu-latest
container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
if: github.repository == 'sagemath/sagetrac-mirror'
env:
CAN_DEPLOY: ${{ secrets.NETLIFY_AUTH_TOKEN != '' }}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -32,6 +34,7 @@ jobs:
SAGE_NUM_THREADS: 2

- name: Copy docs
if: env.CAN_DEPLOY == 'true'
run: |
# For some reason the deploy step below cannot find /sage/...
# So copy everything from there to local folder
Expand All @@ -41,7 +44,7 @@ jobs:
- name: Deploy to Netlify preview
id: preview-netlify
if: github.ref != 'refs/heads/develop'
if: env.CAN_DEPLOY == 'true' && github.ref != 'refs/heads/develop'
uses: netlify/actions/cli@master
with:
args: deploy --dir=docs --alias="${NETLIFY_ALIAS}"
Expand All @@ -59,7 +62,7 @@ jobs:

- name: Deploy to Netlify production
id: deploy-netlify
if: github.ref == 'refs/heads/develop'
if: env.CAN_DEPLOY == 'true' && github.ref == 'refs/heads/develop'
uses: netlify/actions/cli@master
with:
args: deploy --dir=docs --prod
Expand All @@ -68,5 +71,6 @@ jobs:
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

- name: Report deployment url
if: env.CAN_DEPLOY == 'true'
run: |
echo "::notice::The documentation has being automatically deployed to Netlify. %0A ✅ Preview: ${{ steps.preview-netlify.outputs.NETLIFY_URL || steps.deploy-netlify.outputs.NETLIFY_URL }}"
4 changes: 4 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ on:
"ubuntu-focal",
"ubuntu-jammy",
"ubuntu-kinetic",
"ubuntu-lunar",
"debian-buster",
"debian-bullseye",
"debian-bookworm",
Expand All @@ -32,6 +33,7 @@ on:
"linuxmint-20.2",
"linuxmint-20.3",
"linuxmint-21",
"linuxmint-21.1",
"fedora-29-python3.8",
"fedora-30-python3.8",
"fedora-31",
Expand All @@ -41,11 +43,13 @@ on:
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"centos-7-devtoolset-gcc_11",
"centos-stream-8-python3.9",
"centos-stream-9-python3.9",
"gentoo-python3.9",
"gentoo-python3.10",
"gentoo-python3.11",
"archlinux-latest",
"opensuse-15.3-gcc_11-python3.9",
"opensuse-15.4-gcc_11-python3.10",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install relint
run: pip install tox relint
- name: Lint using relint
run: tox -e relint src/sage/
run: tox -e relint -- src/sage/
lint-rst:
name: Validate docstring markup as RST
runs-on: ubuntu-latest
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/ticket.yaml

This file was deleted.

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: 9.8.beta6",
"version": "9.8.beta6",
"title": "sagemath/sage: 9.8.rc1",
"version": "9.8.rc1",
"upload_type": "software",
"publication_date": "2022-12-21",
"publication_date": "2023-02-05",
"creators": [
{
"affiliation": "SageMath.org",
Expand All @@ -15,7 +15,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "/~https://github.com/sagemath/sage/tree/9.8.beta6",
"identifier": "/~https://github.com/sagemath/sage/tree/9.8.rc1",
"relation": "isSupplementTo"
},
{
Expand Down
37 changes: 29 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,37 @@ in the Installation Guide.
(If the bootstrapping prerequisites are not installed, this command will
download a package providing pre-built bootstrap output instead.)

6. [macOS with homebrew] Set required environment variables for the build:
6. Sanitize the build environment. Use the command

$ source ./.homebrew-build-env
$ env

This is to make some of Homebrew's packages (so-called keg-only packages)
available for the build. Run it once to apply the suggestions for the current
terminal session. You may need to repeat this command before you rebuild Sage
from a new terminal session, or after installing additional homebrew packages.
(You can also add it to your shell profile so that it gets run automatically
in all future sessions.)
to inspect the current environment variables, in particular `PATH`,
`PKG_CONFIG_PATH`, `LD_LIBRARY_PATH`, `CFLAGS`, `CPPFLAGS`, `CXXFLAGS`,
and `LDFLAGS` (if set).

Remove items from these (colon-separated) environment variables
that Sage should not use for its own build. In particular, remove
items if they refer to a previous Sage installation.

- [WSL] In particular, WSL imports many items from the Windows
`PATH` variable into the Linux environment, which can lead to
confusing build errors. These items typically start with `/mnt/c`.
It is best to remove all of them from the environment variables.
For example, you can set `PATH` using the command:

$ export PATH=/usr/sbin/:/sbin/:/bin/:/usr/lib/wsl/lib/

- [macOS with homebrew] Set required environment variables for the build:

$ source ./.homebrew-build-env

This is to make some of Homebrew's packages (so-called keg-only
packages) available for the build. Run it once to apply the
suggestions for the current terminal session. You may need to
repeat this command before you rebuild Sage from a new terminal
session, or after installing additional homebrew packages. (You
can also add it to your shell profile so that it gets run
automatically in all future sessions.)

7. Optionally, decide on the installation prefix (`SAGE_LOCAL`):

Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 9.8.beta6, Release Date: 2022-12-21
SageMath version 9.8.rc1, Release Date: 2023-02-05
6 changes: 3 additions & 3 deletions build/pkgs/babel/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=Babel-VERSION.tar.gz
sha1=1ce15f82eba5184cabe6ac1491cb58262e27adfd
md5=7166099733d78aa857d74fa50d8ff58c
cksum=1695340328
sha1=75baeb68d7481a67ba203191aa460c56b0221fda
md5=9ee7784fd452d456206ecd3a12694010
cksum=227595701
upstream_url=https://pypi.io/packages/source/b/babel/Babel-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/babel/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.9.1
2.11.0
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=03fa7a341ddf380aa4fe54a85b0c41debd2ffe7e
md5=6fdfcb62364de0e8c8d57f5d3a38c909
cksum=3919137984
sha1=6e536cb217dd823f547403263fc7d1b21578eaef
md5=83b833531d8bf1689f3368c47374f5e1
cksum=2145026758
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7819a59980b78950a0eb4aa18c529efa380d687b
2d3c71b03b2c11caceac69da380dab3ef4374519
2 changes: 1 addition & 1 deletion build/pkgs/contourpy/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(PYTHON) | $(PYTHON_TOOLCHAIN) pybind11
$(PYTHON) numpy | $(PYTHON_TOOLCHAIN) pybind11

----------
All lines of this file are ignored except the first.
2 changes: 1 addition & 1 deletion build/pkgs/cython/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.29.32.p1
0.29.32.p2
11 changes: 9 additions & 2 deletions build/pkgs/cython/patches/trashcan.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
See /~https://github.com/cython/cython/pull/2842

and /~https://github.com/cython/cython/pull/4475

commit c47c4ef735c4b7f1863b21bbe6f112b06c4aad05
Author: Jeroen Demeyer <J.Demeyer@UGent.be>
Date: Thu Feb 14 10:02:41 2019 +0100
Expand Down Expand Up @@ -128,7 +130,7 @@ diff --git a/Cython/Utility/ExtensionTypes.c b/Cython/Utility/ExtensionTypes.c
index 50d0e21..ca2adbe 100644
--- a/Cython/Utility/ExtensionTypes.c
+++ b/Cython/Utility/ExtensionTypes.c
@@ -74,6 +74,49 @@ static int __Pyx_PyType_Ready(PyTypeObject *t) {
@@ -74,6 +74,54 @@ static int __Pyx_PyType_Ready(PyTypeObject *t) {
return r;
}

Expand All @@ -140,7 +142,12 @@ index 50d0e21..ca2adbe 100644
+
+// This requires CPython version >= 2.7.4
+// (or >= 3.2.4 but we don't support such old Python 3 versions anyway)
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x02070400
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03080000
+// /~https://github.com/python/cpython/pull/11841 merged so Cython reimplementation
+// is no longer necessary
+#define __Pyx_TRASHCAN_BEGIN Py_TRASHCAN_BEGIN
+#define __Pyx_TRASHCAN_END Py_TRASHCAN_END
+#elif CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x02070400
+#define __Pyx_TRASHCAN_BEGIN_CONDITION(op, cond) \
+ do { \
+ PyThreadState *_tstate = NULL; \
Expand Down
27 changes: 27 additions & 0 deletions build/pkgs/dsdp/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
dsdp: Semidefinite programming solver
=====================================

Description
-----------

Implementation of an interior-point method for semidefinite
programming. It provides primal and dual solutions, exploits low-rank
structure and sparsity in the data, and has relatively low memory
requirements for an interior-point method. It allows feasible and
infeasible starting points and provides approximate certificates of
infeasibility when no feasible solution exists. The dual-scaling
algorithm implemented in this package has a convergence proof and
worst-case polynomial complexity under mild assumptions on the data.


License
-------

Permissive open source license
https://www.mcs.anl.gov/hs/software/DSDP/Copyright.txt


Upstream Contact
----------------

https://www.mcs.anl.gov/hs/software/DSDP/
5 changes: 5 additions & 0 deletions build/pkgs/dsdp/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tarball=dsdp_VERSION.orig.tar.gz
sha1=d80b072acf5396561809266ff1c93e7927697aeb
md5=7f49a35f3fe7b5802d29ee2435fdb67e
cksum=955095458
upstream_url=http://deb.debian.org/debian/pool/main/d/dsdp/dsdp_VERSION.orig.tar.gz
1 change: 1 addition & 0 deletions build/pkgs/dsdp/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$(BLAS) | cmake
1 change: 1 addition & 0 deletions build/pkgs/dsdp/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dsdp
1 change: 1 addition & 0 deletions build/pkgs/dsdp/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dsdp
1 change: 1 addition & 0 deletions build/pkgs/dsdp/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libdsdp-dev
1 change: 1 addition & 0 deletions build/pkgs/dsdp/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DSDP-devel
1 change: 1 addition & 0 deletions build/pkgs/dsdp/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
math/dsdp
1 change: 1 addition & 0 deletions build/pkgs/dsdp/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sci-libs/dsdp
1 change: 1 addition & 0 deletions build/pkgs/dsdp/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DSDP
1 change: 1 addition & 0 deletions build/pkgs/dsdp/distros/repology.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dsdp
1 change: 1 addition & 0 deletions build/pkgs/dsdp/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.8
Loading

0 comments on commit 7c8ffc2

Please sign in to comment.