Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge tag '9.5.beta3' into t/32610/deprecate_is_realfield__is_complex…
Browse files Browse the repository at this point in the history
…field__is_realdoublefield__is_complexdoublefield

SageMath version 9.5.beta3, Release Date: 2021-10-11
  • Loading branch information
Matthias Koeppe committed Oct 13, 2021
2 parents 355dbcb + c896669 commit fb56937
Show file tree
Hide file tree
Showing 700 changed files with 10,262 additions and 8,357 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/tox-experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ jobs:
matrix:
# This list is different from the one in tox.yml:
# Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
tox_system_factor: [ubuntu-trusty-gcc_spkg, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17-gcc_spkg, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-gcc_spkg]
# Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
tox_packages_factor: [maximal]
targets_pattern: [0-g, h-o, p, q-z]
env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tox-optional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ jobs:
matrix:
# This list is different from the one in tox.yml:
# Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
tox_system_factor: [ubuntu-trusty-gcc_spkg, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17-gcc_spkg, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-gcc_spkg]
# Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
tox_packages_factor: [maximal]
targets_pattern: [0-g, h-o, p, q-z]
env:
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: 9.5.beta2",
"version": "9.5.beta2",
"title": "sagemath/sage: 9.5.beta3",
"version": "9.5.beta3",
"upload_type": "software",
"publication_date": "2021-09-26",
"publication_date": "2021-10-11",
"creators": [
{
"affiliation": "SageMath.org",
Expand All @@ -15,7 +15,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta2",
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta3",
"relation": "isSupplementTo"
},
{
Expand Down
1 change: 0 additions & 1 deletion COPYING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ the licenses of the components of Sage are included below as well.
SOFTWARE LICENSE
-----------------------------------------------------------------------
arb GPLv2+
atlas Modified BSD
boehm_gc MIT-like license (see below)
backports_ssl_match_hostname Python License
boost_cropped Boost Software License (see below)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ Simplified directory layout (only essential files/directories):
SAGE_ROOT Root directory (sage-x.y.z in Sage tarball)
├── build
│ └── pkgs Every package is a subdirectory here
│ ├── atlas
│ ├── 4ti2
│ …
│ └── zn_poly
├── configure Top-level configure script
Expand Down Expand Up @@ -381,9 +381,9 @@ SAGE_ROOT Root directory (sage-x.y.z in Sage tarball)
│ ├── dochtml.log Log of the documentation build
│ ├── install.log Full install log
│ └── pkgs Build logs of individual packages
│ ├── atlas-3.10.1.p7.log
│ ├── alabaster-0.7.12.log
│ …
│ └── zn_poly-0.9.p11.log
│ └── zn_poly-0.9.2.log
├── m4 M4 macros for configure
│ └── *.m4
├── Makefile Running "make" uses this file
Expand All @@ -394,9 +394,9 @@ SAGE_ROOT Root directory (sage-x.y.z in Sage tarball)
│ ├── doc Sage documentation sources
│ └── sage The Sage library source code
├── upstream Source tarballs of packages
│ ├── atlas-3.10.1.tar.bz2
│ ├── Babel-2.9.1.tar.gz
│ …
│ └── zn_poly-0.9.tar.bz2
│ └── zn_poly-0.9.2.tar.gz
└── VERSION.txt
```
For more details see [our Developer's Guide](https://doc.sagemath.org/html/en/developer/coding_basics.html#files-and-directory-structure).
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.5.beta2, Release Date: 2021-09-26
SageMath version 9.5.beta3, Release Date: 2021-10-11
1 change: 0 additions & 1 deletion build/bin/sage-package
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
# $ sage-package list | sort
# 4ti2
# arb
# atlas
# autotools
# [...]
# zn_poly
Expand Down
2 changes: 1 addition & 1 deletion build/make/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SPKG_INST_RELDIR = var/lib/sage/installed
TOOLCHAIN = @SAGE_TOOLCHAIN@
PYTHON = python3
MP_LIBRARY = @SAGE_MP_LIBRARY@
BLAS = @SAGE_BLAS@
BLAS = openblas

# pkgconfig files generated/installed at build time
PCFILES = @SAGE_SYSTEM_FACADE_PC_FILES@
Expand Down
1 change: 1 addition & 0 deletions build/pkgs/4ti2/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4ti2
1 change: 1 addition & 0 deletions build/pkgs/4ti2/distros/cygwin.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lib4ti2-devel
1 change: 1 addition & 0 deletions build/pkgs/4ti2/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4ti2
1 change: 1 addition & 0 deletions build/pkgs/4ti2/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4ti2
1 change: 1 addition & 0 deletions build/pkgs/4ti2/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
math/4ti2
1 change: 1 addition & 0 deletions build/pkgs/4ti2/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sci-mathematics/4ti2
32 changes: 32 additions & 0 deletions build/pkgs/4ti2/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
SAGE_SPKG_CONFIGURE([4ti2], [
SAGE_SPKG_DEPCHECK([gmp mpir glpk zlib], [
dnl Debian installs these programs with an executable prefix "4ti2-",
dnl OpenSUSE uses the prefix "4ti2_".
dnl Singular checks for unprefixed and prefixed with "4ti2-".
dnl Polymake does not check for prefixed binaries.
m4_foreach([prog], [hilbert,markov,graver,zsolve,qsolve,rays,ppi,circuits,groebner], [
AC_CHECK_PROGS([FOURTITWO_]m4_toupper(prog), prog [4ti2-]prog [4ti2_]prog)
AS_VAR_IF([FOURTITWO_]m4_toupper(prog), [""], [sage_spkg_install_4ti2=yes])
AC_SUBST([FOURTITWO_]m4_toupper(prog))
])
dnl Adapted from https://github.com/latte-int/latte/blob/master/m4/4ti2-check.m4
AC_MSG_CHECKING(for library 4ti2gmp)
BACKUP_CXXFLAGS=${CXXFLAGS}
BACKUP_LIBS=${LIBS}
FORTYTWO_CXXFLAGS="-D__STDC_LIMIT_MACROS -D_4ti2_GMP_"
FORTYTWO_LIBS="-l4ti2gmp -lzsolve"
CXXFLAGS="${BACKUP_CXXFLAGS} ${FORTYTWO_CXXFLAGS} ${GMP_CFLAGS}"
LIBS="${BACKUP_LIBS} ${FORTYTWO_LIBS} ${GMP_LIBS}"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include "4ti2/4ti2.h"
]], [[ _4ti2_rays_create_state(_4ti2_PREC_INT_ARB);
]])],[
AC_MSG_RESULT([yes])
],[
AC_MSG_RESULT([no])
sage_spkg_install_4ti2=yes
])
CXXFLAGS=${BACKUP_CXXFLAGS}
LIBS=${BACKUP_LIBS}
])
])
2 changes: 1 addition & 1 deletion build/pkgs/_bootstrap/distros/void.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Packages needed for ./bootstrap
gettext autoconf automake libtool pkg-config
gettext autoconf automake libtool
gettext-devel
xtools mk-configure
1 change: 1 addition & 0 deletions build/pkgs/_prereq/distros/void.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ binutils
make
m4
perl
pkg-config
python3
tar
bc
Expand Down
1 change: 1 addition & 0 deletions build/pkgs/arb/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
arb-devel
18 changes: 18 additions & 0 deletions build/pkgs/argcomplete/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
argcomplete: Bash tab completion for argparse
=============================================

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

Bash tab completion for argparse

License
-------

Apache Software License

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

https://pypi.org/project/argcomplete/

5 changes: 5 additions & 0 deletions build/pkgs/argcomplete/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tarball=argcomplete-VERSION.tar.gz
sha1=bd6b35aee6fc44c82d02772b054b5c5ff1bc5983
md5=ded03f9c5d41c193dfe5869634d78211
cksum=3352024634
upstream_url=https://pypi.io/packages/source/a/argcomplete/argcomplete-VERSION.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ $(PYTHON) | $(PYTHON_TOOLCHAIN)

----------
All lines of this file are ignored except the first.
It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
1 change: 1 addition & 0 deletions build/pkgs/argcomplete/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
argcomplete
1 change: 1 addition & 0 deletions build/pkgs/argcomplete/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.12.3
2 changes: 2 additions & 0 deletions build/pkgs/argcomplete/spkg-install.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cd src
sdh_pip_install .
File renamed without changes.
107 changes: 0 additions & 107 deletions build/pkgs/atlas/SPKG.rst

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/atlas/checksums.ini

This file was deleted.

Loading

0 comments on commit fb56937

Please sign in to comment.