[arch-commits] Commit in sagemath-doc/trunk (6 files)
Date: Friday, December 15, 2017 @ 23:13:50
Author: arojas
Revision: 274543
Sync with sagemath package
Added:
sagemath-doc/trunk/pari-stackwarn.patch
sagemath-doc/trunk/sagemath-doc-no-sagenb.patch
sagemath-doc/trunk/sagemath-lrs.patch
sagemath-doc/trunk/sagemath-matplotlib2.patch
sagemath-doc/trunk/sagemath-scipy-1.0.patch
Modified:
sagemath-doc/trunk/PKGBUILD
--+
PKGBUILD | 33 -
pari-stackwarn.patch | 23 +++
sagemath-doc-no-sagenb.patch | 28
sagemath-lrs.patch | 22 +++
sagemath-matplotlib2.patch | 253 +
sagemath-scipy-1.0.patch | 16 ++
6 files changed, 368 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-15 22:33:08 UTC (rev 274542)
+++ PKGBUILD2017-12-15 23:13:50 UTC (rev 274543)
@@ -4,16 +4,18 @@
pkgbase=sagemath-doc
pkgname=(sagemath-doc sagemath-src)
pkgver=8.1
-pkgrel=1
+pkgrel=2
arch=(any)
url="http://www.sagemath.org";
license=(GPL)
-makedepends=(sagemath sage-notebook python2-pyzmq python2-pillow
python2-docutils tachyon
+makedepends=(sage-notebook python2-pyzmq python2-pillow python2-docutils
tachyon
python2-jupyter_client python2-pkgconfig cython2 thebe
python2-sphinx python2-ipywidgets)
source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz";
sagemath-env.patch package.patch latte-count.patch jupyter-path.patch
sagemath-python3-notebook.patch test-optional.patch
-r-no-readline.patch fes02.patch sagemath-threejs.patch
sagemath-detect-igraph.patch
-sagemath-networkx2.patch sagemath-linbox-1.5.patch
sagemath-pynac-0.7.14.patch docbuild_main.patch)
+r-no-readline.patch fes02.patch sagemath-threejs.patch
sagemath-detect-igraph.patch pari-stackwarn.patch
+sagemath-detect-igraph.patch sagemath-networkx2.patch
sagemath-linbox-1.5.patch sagemath-pynac-0.7.14.patch
+sagemath-matplotlib2.patch sagemath-scipy-1.0.patch sagemath-lrs.patch
+docbuild_main.patch sagemath-doc-no-sagenb.patch)
sha256sums=('a42b55c2c8ac244535dc9b87171b7d4dd7e1d498099518ab253354fbe2eaaa7b'
'6dc9b101310f80381c61c0312a3e5c648771bfe0de2e94ac46fafe7282a3e0ee'
'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107'
@@ -25,10 +27,16 @@
'7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94'
'514135b920a43f999571a15e97b41e14f5bed59f65b19643864dc23555a7b830'
'28d7789b8d777922ab8871ca43b6afab751428cae875c0343d3962e6a2030b88'
+'bfd2a20a33ab19a8a8b216a77d07f62e809fe1e1879c4f171ce5dca62fd482e9'
+'28d7789b8d777922ab8871ca43b6afab751428cae875c0343d3962e6a2030b88'
'37c5c1e694a2aca06c0f1c7d99622ff81fd2bc6a51e8745762294889fa4673f6'
'a52d03e04c9d64bb957a1f8dcdae3280ebb9450a7fd76aaf5ae5de5c6f74774f'
'538f7b279d72f4b67edb445d386d267f3f7022c1079031ca7ea06f6ce392c906'
-'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b')
+'b9ab2bb5f381ea425e8763b81b8b3a108a3951c594fb1f37f7df921e7c77e26d'
+'17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a'
+'c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c'
+'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
+'261bdb5c24e67fb34f537e29bdf35af655162de3fea7d05abc72f85a864720fe')
prepare() {
cd sage-$pkgver
@@ -53,10 +61,16 @@
-i src/sage/databases/cremona.py
# fix python-igraph detection
patch -p1 -i ../sagemath-detect-igraph.patch
+# fix lrs detection
+ patch -p1 -i ../sagemath-lrs.patch
# adapt to networkx 2 changes
patch -p1 -i ../sagemath-networkx2.patch
# fix three.js plotting backend
patch -p1 -i ../sagemath-threejs.patch
+# don't show PARI stack size increase warnings during doctesting (Debian)
+ patch -p1 -i ../pari-stackwarn.patch
+# remove deprecated scipy parameters
+ patch -p1 -i ../sagemath-scipy-1.0.patch
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -65,6 +79,10 @@
patch -p1 -i ../sagemath-linbox-1.5.patch
# fix build with pynac 0.7.14 https://trac.sagemath.org/ticket/24329
patch -p1 -i ../sagemath-pynac-0.7.14.patch
+# port away from deprecated and removed functions in matplotlib 2
https://trac.sagemath.org/ticket/23696
+ patch -p1 -i ../sagemath-matplotlib2.patch
+# drop sage-notebook dependency from sagemath-doc
https://trac.sagemath.org/ticket/24250
+ patch -p1 -i ../sagemath-doc-no-sagenb.patch
# fix relative imports
patch -p0 -i ../docbuild_main.patch
@@ -72,6 +90,7 @@
# use python2
sed -e 's|cython %s %s|cython2 %s %s|' -e 's|python setup.py|python2
setup.py|' -i src/sage/misc/cython.py
+# use sage_setup imports from sagemath source, but use system sa
[arch-commits] Commit in sagemath-doc/trunk (6 files)
Date: Saturday, March 25, 2017 @ 17:42:55
Author: arojas
Revision: 218968
Update to 7.6
Added:
sagemath-doc/trunk/increase-rtol.patch
sagemath-doc/trunk/r-no-readline.patch
sagemath-doc/trunk/sagemath-planarity3.patch
sagemath-doc/trunk/sagemath-singular-4.1.0.p2.patch
sagemath-doc/trunk/sagemath-sphinx-1.5.patch
Modified:
sagemath-doc/trunk/PKGBUILD
--+
PKGBUILD | 45 ++-
increase-rtol.patch | 37 +
r-no-readline.patch | 11 ++
sagemath-planarity3.patch| 113
sagemath-singular-4.1.0.p2.patch | 33
sagemath-sphinx-1.5.patch| 149 +
6 files changed, 370 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-25 17:32:00 UTC (rev 218967)
+++ PKGBUILD2017-03-25 17:42:55 UTC (rev 218968)
@@ -3,24 +3,27 @@
pkgbase=sagemath-doc
pkgname=(sagemath-doc sagemath-src)
-pkgver=7.5
-pkgrel=3
+pkgver=7.6
+pkgrel=1
arch=(any)
url="http://www.sagemath.org";
license=(GPL)
-makedepends=(sagemath sage-notebook python2-pyzmq python2-pillow
python2-docutils
- python2-jupyter_client python2-pkgconfig cython2 thebe) #
python2-sphinx
-makedepends+=(python2-imagesize python2-sphinx-alabaster-theme) # remove when
we can use system sphinx again
+makedepends=(sagemath sage-notebook python2-pyzmq python2-pillow
python2-docutils tachyon
+ python2-jupyter_client python2-pkgconfig cython2 thebe
python2-sphinx python2-ipywidgets)
source=("$pkgbase-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz";
-"https://pypi.io/packages/source/S/Sphinx/Sphinx-1.4.9.tar.gz";
- package.patch disable-fes.patch docbuild_main.patch
is-package-installed.patch ecm-7.patch)
-md5sums=('bff1fb8793ebc2934d14cf1efdcfbea3'
- '6c7472d3630835113ee9cc251cc36c31'
- 'ccfd5b1bc4796f414f1531be52504dd7'
- '06a67e611d10aa2381efe1f08ea4ffd9'
- 'f3bf3fa4e11e5af2bd0573cf2620e1f8'
- '409b0a2c520eb33281b5f262afcb6c76'
- '0c9a57d35de80c2cd418ebec912efbbb')
+ package.patch disable-fes.patch docbuild_main.patch
is-package-installed.patch ecm-7.patch increase-rtol.patch
+r-no-readline.patch sagemath-planarity3.patch
sagemath-singular-4.1.0.p2.patch sagemath-sphinx-1.5.patch)
+sha256sums=('e6e0729ab25446e7c922058db0eee4b0b294b32c196e34842e843ea9fae41423'
+'4a2297e4d9d28f0b3a1f58e1b463e332affcb109eafde44837b1657e309c8212'
+'7ab53d30b877dabb6835fbe67a208bef65fa0aaf40221b4d0b58e4b7086bc47a'
+'187b75d3ce202126012ff20b6316277b0a003ffdd7f15b820d3b88459d2753c8'
+'d60fb0fbd27991ce9496ca035a54b03334b5b53f244227a8d6e13f3327ce75d2'
+'65ad84c83d5f956fde8eab961f2caad56d64044324c4abc0e56bcd9f44061cb6'
+'be925eefeac3f28e639794ddc20d64e6faafd7181804e29417a510224d19ccc7'
+'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
+'a1c562ebe4538d672404ca3ac2e954a3c955afeb7463f7b4fe6eaa6fa74fe5c7'
+'e1912afec58b834fac3b9161c2d5a1794bb618126c6bd7a4be85c834231360e7'
+'0ffbccdd65ba8dfe84222e62d9e43663735d4f33276f7ec7b2e44ed53d1f24d0')
prepare() {
cd sage-$pkgver
@@ -30,6 +33,14 @@
patch -p0 -i ../package.patch
# fix regressions with ECM 7
patch -p1 -i ../ecm-7.patch
+# increase numerical tolerance, needed by scipy 0.18
+ patch -p1 -i ../increase-rtol.patch
+# fix freezes in R interface with readline 7 (Debian)
+ patch -p1 -i ../r-no-readline.patch
+# fix build with planarity 3 (Debian)
+ patch -p2 -i ../sagemath-planarity3.patch
+# fix build with Singular 4.1.0-p2
+ patch -p0 -i ../sagemath-singular-4.1.0.p2.patch
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -38,12 +49,11 @@
patch -p0 -i ../disable-fes.patch
# replace is_package_installed usage http://trac.sagemath.org/ticket/20377
patch -p1 -i ../is-package-installed.patch
+# fix doc build with sphinx 1.5 https://trac.sagemath.org/ticket/22252
+ patch -p1 -i ../sagemath-sphinx-1.5.patch
# fix relative imports
patch -p0 -i ../docbuild_main.patch
-# fix thebe.js link
- rm src/doc/common/themes/sage/static/thebe.js
- ln -s /usr/share/thebe/thebe.js src/doc/common/themes/sage/static/thebe.js
# use python2
sed -e 's|cython %s %s|cython2 %s %s|' -e 's|python setup.py|python2
setup.py|' -i src/sage/misc/cython.py
@@ -50,7 +60,6 @@
mkdir -p local-python
ln -sr src/sage_setup local-python
- cp -r "$srcdir"/Sphinx-1.4.9/* local-python
}
build() {
Added: increase-rtol.patch
===
--- increase-rtol.patch (rev 0)
+++ increase-rtol.patch 2017-03-25 17:42:55 UTC (rev 218968)
@@ -0,0 +1,37 @@
+diff -ru sage-7.3.or
[arch-commits] Commit in sagemath-doc/trunk (6 files)
Date: Friday, August 5, 2016 @ 13:01:03
Author: arojas
Revision: 185317
Update to 7.3
Added:
sagemath-doc/trunk/sagemath-ipython5.patch
Modified:
sagemath-doc/trunk/PKGBUILD
sagemath-doc/trunk/disable-fes.patch
sagemath-doc/trunk/is-package-installed.patch
sagemath-doc/trunk/linbox-1.4.patch
sagemath-doc/trunk/paths.patch
+
PKGBUILD | 26 +-
disable-fes.patch |6
is-package-installed.patch | 56 ++--
linbox-1.4.patch | 50 +--
paths.patch| 34 --
sagemath-ipython5.patch| 548 +++
6 files changed, 621 insertions(+), 99 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-08-05 12:54:53 UTC (rev 185316)
+++ PKGBUILD2016-08-05 13:01:03 UTC (rev 185317)
@@ -3,22 +3,23 @@
pkgbase=sagemath-doc
pkgname=(sagemath-doc sagemath-src)
-pkgver=7.2
-pkgrel=2
+pkgver=7.3
+pkgrel=1
arch=(any)
url="http://www.sagemath.org";
license=(GPL)
makedepends=(sagemath sage-notebook python2-pyzmq python2-pillow
python2-docutils ipython2-notebook python2-pkgconfig cython2 python2-sphinx)
source=("$pkgbase-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz";
- package.patch paths.patch disable-fes.patch docbuild_main.patch
linbox-1.4.patch is-package-installed.patch ecm-7.patch)
-md5sums=('2afeb8f75a33107fef5d509698c0eabc'
+ package.patch paths.patch disable-fes.patch docbuild_main.patch
linbox-1.4.patch is-package-installed.patch ecm-7.patch sagemath-ipython5.patch)
+md5sums=('cb2aed3d24de7b2228a9b34e81a27870'
'9ba81f717ffd4e20b8b2f2a318307488'
- '52d30e91110183489f66d7bf73c36c64'
- '4eb23a3c7363258bc9ba764d6e5512ba'
+ '45b84ae5579273196df44f7464a01a30'
+ '06a67e611d10aa2381efe1f08ea4ffd9'
'f3bf3fa4e11e5af2bd0573cf2620e1f8'
- '9f1cef3e477bafebe2ad301db56db8a2'
- '541988696465f204235d595a349017f3'
- '0c9a57d35de80c2cd418ebec912efbbb')
+ 'a276f0fbbff6eade409d0569ebd728d4'
+ 'b3ecf7c93a90e0afccbc686af9fdc85f'
+ '0c9a57d35de80c2cd418ebec912efbbb'
+ '2bcaca7284dda963ebdc17daf78cf6c9')
prepare() {
cd sage-$pkgver
@@ -42,6 +43,8 @@
patch -p0 -i ../disable-fes.patch
# port to new fflas-ffpack/givaro/linbox http://trac.sagemath.org/ticket/17635
patch -p1 -i ../linbox-1.4.patch
+# port to ipython 5.0 https://trac.sagemath.org/ticket/21006
+ patch -p1 -i ../sagemath-ipython5.patch
# replace is_package_installed usage http://trac.sagemath.org/ticket/20377
patch -p1 -i ../is-package-installed.patch
@@ -63,7 +66,7 @@
export SAGE_DOC_SRC="$SAGE_SRC"/doc
export SAGE_DOC="$SAGE_SRC"/doc
export SAGE_DOC_MATHJAX=yes
- export PYTHONPATH="$srcdir/sage-$pkgver/local-python"
+ export
PYTHONPATH="/usr/lib/sage/site-packages:$srcdir/sage-$pkgver/local-python"
python2 sage_setup/docbuild --no-pdf-links -k all html
}
@@ -101,7 +104,4 @@
mkdir -p "$pkgdir"/usr/share/sage/source
cp -r sage-$pkgver/src/{sage,sage_setup} "$pkgdir"/usr/share/sage/source
ln -s /usr/share/doc/sage/html "$pkgdir"/usr/share/sage/source/doc
-
-# remove developer interface
- rm -r "$pkgdir"/usr/share/sage/source/sage/dev
}
Modified: disable-fes.patch
===
--- disable-fes.patch 2016-08-05 12:54:53 UTC (rev 185316)
+++ disable-fes.patch 2016-08-05 13:01:03 UTC (rev 185317)
@@ -1,8 +1,8 @@
--- src/module_list.py.orig2015-06-07 11:29:30.710612146 +0200
+++ src/module_list.py 2015-06-07 11:30:21.877506106 +0200
-@@ -685,11 +685,11 @@
- include_dirs = [SAGE_INC + '/ecl'],
- depends = [SAGE_INC + '/ecl/ecl.h']),
+@@ -564,11 +564,11 @@
+ sources = ["sage/libs/ecl.pyx"],
+ libraries = ["ecl"]),
-OptionalExtension("sage.libs.fes",
- ["sage/libs/fes.pyx"],
Modified: is-package-installed.patch
===
--- is-package-installed.patch 2016-08-05 12:54:53 UTC (rev 185316)
+++ is-package-installed.patch 2016-08-05 13:01:03 UTC (rev 185317)
@@ -2,15 +2,15 @@
index 0a5f794..2969d92 100644
--- a/src/sage/databases/cremona.py
+++ b/src/sage/databases/cremona.py
-@@ -52,7 +52,6 @@ from sage.misc.prandom import randint
+@@ -53,7 +53,6 @@ from sage.misc.prandom import randint
import sage.schemes.elliptic_curves.constructor as elliptic
- from sql_db import SQLDatabase, verify_column
+ from .sql_db import SQLDatabase, verify_column
-from sage.misc.package import is_package_installed
from sage.env import SAGE_SHARE
from sage.misc.all import walltime
-@@ -827,7 +826,7 @@ class MiniCremonaDatabase(SQLDatabase):
+@@ -828,7 +827,7 @@ class MiniCremonaDatabase(SQLDatabase):
if N < self.largest_conductor():
message = "There is no elli
