diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | sagemath-gap-4.11.patch | 19 | ||||
| -rw-r--r-- | test-optional.patch | 11 |
4 files changed, 37 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = sagemath-git pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab - pkgver = 9.2.beta12.r0.g5ec24db181 + pkgver = 9.2.rc3.r0.gf976c52c57 pkgrel = 1 url = http://www.sagemath.org arch = x86_64 @@ -49,7 +49,6 @@ pkgbase = sagemath-git depends = pynac depends = linbox depends = m4rie - depends = rubiks depends = pari-galdata depends = pari-seadata-small depends = planarity @@ -80,6 +79,7 @@ pkgbase = sagemath-git optdepends = ffmpeg: to export animations to video optdepends = imagemagick: to show animations optdepends = coxeter: Coxeter groups implementation + optdepends = rubiks: Rubiks cube algorithms optdepends = lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes optdepends = python-pynormaliz: Normaliz backend for polyhedral computations optdepends = latte-integrale: integral point count in polyhedra @@ -103,10 +103,10 @@ pkgbase = sagemath-git sha256sums = SKIP sha256sums = 4fb46b12b5ee5e5bde87f646dc69a7b8929886be247e2d9a9ae1f12efbe5b580 sha256sums = af922e1f978821a9a1f6c9a56130d71e5011c84a7aee7bf66a591bee658af30b - sha256sums = 77aa8e99aae5da74a9486f01b603a0b5d224c3d13e9d9fab681fb71a6af149f1 + sha256sums = 7da0dbcda15a327c21dc33853cb8f98cb86a283139f8735e3b20a71d49458a88 sha256sums = 937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5 sha256sums = 6f98488d0eb3a12b958cd1a34f85b7bee950ac756430371c1e134e564cbbf7d3 - sha256sums = ae3c0c4412030224e7a911636a78a23e8835f49379557874b411e63dd876786f + sha256sums = 34f06f9776f84f6998b1350555316e0ffea76ed16e149916970f19ef750a467f sha256sums = b881d4a6867a6f5360fd204e6a86fd27c6177c539b06f521402e2bcb5a6209cd pkgname = sagemath-git @@ -124,6 +124,7 @@ pkgname = sagemath-git optdepends = ffmpeg: to export animations to video optdepends = imagemagick: to show animations optdepends = coxeter: Coxeter groups implementation + optdepends = rubiks: Rubiks cube algorithms optdepends = lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes optdepends = python-pynormaliz: Normaliz backend for polyhedral computations optdepends = latte-integrale: integral point count in polyhedra @@ -7,7 +7,7 @@ pkgbase=sagemath-git pkgname=(sagemath-git sagemath-jupyter-git) -pkgver=9.2.beta12.r0.g5ec24db181 +pkgver=9.2.rc3.r0.gf976c52c57 pkgrel=1 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(x86_64) @@ -15,7 +15,7 @@ url="http://www.sagemath.org" license=(GPL) depends=(ipython palp brial cliquer maxima-ecl gfan sympow nauty python-rpy2 python-fpylll python-psutil python-cypari2 python-matplotlib python-scipy python-sympy python-networkx python-pillow python-pplpy python-sphinx - gap flintqs lcalc lrcalc arb eclib zn_poly gd python-cvxopt pynac linbox m4rie rubiks pari-galdata pari-seadata-small planarity rankwidth tachyon + gap flintqs lcalc lrcalc arb eclib zn_poly gd python-cvxopt pynac linbox m4rie pari-galdata pari-seadata-small planarity rankwidth tachyon sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials iml libgiac libhomfly libbraiding symmetrica three.js) optdepends=('cython: to compile cython code' 'python-pkgconfig: to compile cython code' @@ -26,6 +26,7 @@ optdepends=('cython: to compile cython code' 'python-pkgconfig: to compile cytho 'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids' 'ffmpeg: to export animations to video' 'imagemagick: to show animations' 'coxeter: Coxeter groups implementation' + 'rubiks: Rubiks cube algorithms' 'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' 'python-pynormaliz: Normaliz backend for polyhedral computations' 'latte-integrale: integral point count in polyhedra' 'python-jupymake: polymake backend for polyhedral computations' @@ -45,10 +46,10 @@ source=(git://git.sagemath.org/sage.git#branch=develop sha256sums=('SKIP' '4fb46b12b5ee5e5bde87f646dc69a7b8929886be247e2d9a9ae1f12efbe5b580' 'af922e1f978821a9a1f6c9a56130d71e5011c84a7aee7bf66a591bee658af30b' - '77aa8e99aae5da74a9486f01b603a0b5d224c3d13e9d9fab681fb71a6af149f1' + '7da0dbcda15a327c21dc33853cb8f98cb86a283139f8735e3b20a71d49458a88' '937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5' '6f98488d0eb3a12b958cd1a34f85b7bee950ac756430371c1e134e564cbbf7d3' - 'ae3c0c4412030224e7a911636a78a23e8835f49379557874b411e63dd876786f' + '34f06f9776f84f6998b1350555316e0ffea76ed16e149916970f19ef750a467f' 'b881d4a6867a6f5360fd204e6a86fd27c6177c539b06f521402e2bcb5a6209cd') pkgver() { @@ -75,7 +76,7 @@ prepare(){ # assume all optional packages are installed patch -p1 -i ../sagemath-optional-packages.patch # don't list optional packages when running tests - patch -p0 -i ../test-optional.patch + patch -p1 -i ../test-optional.patch # use correct latte-count binary name patch -p1 -i ../latte-count.patch # Fix mathjax path diff --git a/sagemath-gap-4.11.patch b/sagemath-gap-4.11.patch index 601e2f721ec9..46e0a558ec88 100644 --- a/sagemath-gap-4.11.patch +++ b/sagemath-gap-4.11.patch @@ -164,7 +164,7 @@ index 2467582..ac0b7a3 100644 # Note that the output of IsomorphismPermGroup() depends on # memory locations and will change if you change the order of diff --git a/src/sage/groups/perm_gps/permgroup.py b/src/sage/groups/perm_gps/permgroup.py -index 334d90a..d7a0045 100644 +index c411b1e..0355cb6 100644 --- a/src/sage/groups/perm_gps/permgroup.py +++ b/src/sage/groups/perm_gps/permgroup.py @@ -850,7 +850,7 @@ class PermutationGroup_generic(FiniteGroup): @@ -228,6 +228,23 @@ index 123afb8..67e3bbf 100644 [ ConjugacyClassSubgroups(SymmetricGroup( [ 1 .. 2 ] ),Group( () )), ConjugacyClassSubgroups(SymmetricGroup( [ 1 .. 2 ] ),Group( [ (1,2) ] )) ] """ +diff --git a/src/sage/libs/gap/sage.gaprc b/src/sage/libs/gap/sage.gaprc +index 17613fa..39c878f 100644 +--- a/src/sage/libs/gap/sage.gaprc ++++ b/src/sage/libs/gap/sage.gaprc +@@ -1,12 +1,3 @@ + # This file is run by Sage when initializing libgap via GAP_Initialize, and may + # contain bug fixes/workarounds and/or any Sage-specific patches necessary for + # Sage's libgap interface. +- +-if GAPInfo.CommandLineOptions.norepl then +- # GAP 4.10.0 has a bug that an interactive session will be started +- # even if --norepl was set; see https://github.com/gap-system/gap/pull/2840 +- # To work around this we redefine the SESSION function to a no-op +- MAKE_READ_WRITE_GLOBAL("SESSION"); +- UNBIND_GLOBAL("SESSION"); +- BIND_GLOBAL("SESSION", function() end); +-fi; diff --git a/src/sage/tests/books/judson-abstract-algebra/sylow-sage.py b/src/sage/tests/books/judson-abstract-algebra/sylow-sage.py index b609313..0051f20 100644 --- a/src/sage/tests/books/judson-abstract-algebra/sylow-sage.py diff --git a/test-optional.patch b/test-optional.patch index 95de25e94e8a..c4388362d76c 100644 --- a/test-optional.patch +++ b/test-optional.patch @@ -1,6 +1,8 @@ ---- src/sage/doctest/control.py.orig 2016-10-20 19:39:53.714618246 +0200 -+++ src/sage/doctest/control.py 2016-10-20 19:40:15.158049920 +0200 -@@ -347,17 +347,6 @@ +diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py +index 2d93841e50..937e20cd2e 100644 +--- a/src/sage/doctest/control.py ++++ b/src/sage/doctest/control.py +@@ -356,20 +356,6 @@ class DocTestController(SageObject): # Special case to run all optional tests options.optional = True else: @@ -15,6 +17,9 @@ - if pkg['installed'] and pkg['installed_version'] == pkg['remote_version']: - options.optional.add(pkg['name']) - +- from sage.features import package_systems +- options.optional.update(system.name for system in package_systems()) +- # Check that all tags are valid for o in options.optional: if not optionaltag_regex.search(o): |