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

Commit 24807e3

Browse files
saraedumsaraedum
committed
Merge remote-tracking branch 'trac/develop' into t/21869/a_framework_for_discrete_valuations_in_sage
2 parents 4900f56 + 56a4bc7 commit 24807e3

File tree

252 files changed

+9661
-4954
lines changed

Some content is hidden

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

252 files changed

+9661
-4954
lines changed

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 8.2.beta2, Release Date: 2018-01-01
1+
SageMath version 8.2.beta3, Release Date: 2018-01-17

‎build/pkgs/alabaster/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=alabaster-VERSION.tar.gz
2-
sha1=c80dedaf4a1906410e53b653de059fe9d8b17c68
3-
md5=346a71e8a6d51dff2e02086fdd9c5ffe
4-
cksum=2849350596
2+
sha1=dba599faf1ca5541ef35ab251eb2b365ae2f25c7
3+
md5=7934dccf38801faa105f6e7b4784f493
4+
cksum=3227702678

‎build/pkgs/alabaster/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.8.p0
1+
0.7.10

‎build/pkgs/babel/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=Babel-VERSION.tar.gz
2-
sha1=c92786942f1c920e3c39a057a7678d2aa0d1c44c
3-
md5=afa20bc55b0e991833030129ad498f35
4-
cksum=4254002491
2+
sha1=9adbd49864392713c6a3080aeb0a9e6432577277
3+
md5=60228b3ce93a203357158b909afe8ae1
4+
cksum=2035941902

‎build/pkgs/babel/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.4.p0
1+
2.5.1

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=8d46907fc431aaab8b7c378db213fda2dc06ac00
3-
md5=b815a36b9ad3d256ec2a25b41145f7a7
4-
cksum=229126322
2+
sha1=fce3f8df178645228d91b6b65e3a03af0b2b3641
3+
md5=587c7e18518428f0f30138eeb7743bad
4+
cksum=144653522

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
250
1+
251

‎build/pkgs/cython/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=Cython-VERSION.tar.gz
2-
sha1=3f903995b1444d5cbb3af6cd4aeadfd7c1dacc2b
3-
md5=64abe5847736eb413a525b70b48afd7f
4-
cksum=949083648
2+
sha1=688aa815301dd9e710cd847528de31099f3b52c4
3+
md5=6149238287d662bd5d5e572482252493
4+
cksum=460741347

‎build/pkgs/cython/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.27.2
1+
0.27.3

‎build/pkgs/docutils/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=docutils-VERSION.tar.gz
2-
sha1=c16e14ef18142fa248400cd174edb4fa40e51d5b
3-
md5=ea4a893c633c788be9b8078b6b305d53
4-
cksum=137667414
2+
sha1=32cefb69ac3dab5b04c4d150776f35419cc4c863
3+
md5=c53768d63db3873b7d452833553469de
4+
cksum=2981697109

‎build/pkgs/docutils/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.13.1
1+
0.14

‎build/pkgs/fflas_ffpack/spkg-install

+6
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ if [ "$SAGE_FAT_BINARY" = yes ]; then
4343
FFLAS_FFPACK_CONFIGURE="--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 --disable-fma --disable-fma4 --disable-avx --disable-avx2 $FFLAS_FFPACK_CONFIGURE"
4444
fi
4545

46+
# Need to use 'bash' for configure, see
47+
# https://trac.sagemath.org/ticket/23451
48+
if [ -z "$CONFIG_SHELL" ]; then
49+
export CONFIG_SHELL=`command -v bash`
50+
fi
51+
4652
# We disable openmp because of build failures, see
4753
# http://trac.sagemath.org/ticket/17635#comment:67
4854
sdh_configure --with-default="$SAGE_LOCAL" --with-blas-libs="$LINBOX_BLAS" \

‎build/pkgs/future/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=future-VERSION.tar.gz
2-
sha1=431bf8ff160e8e785a2f76c3e57c1b6c2b13b41a
3-
md5=a68eb3c90b3b76714c5ceb8c09ea3a06
4-
cksum=2554543285
2+
sha1=86ed881acef874d04576b9df03c29d25ad2cd25f
3+
md5=3e8e88a2bda48d54b1da7634d04760d7
4+
cksum=1475858329

‎build/pkgs/future/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.15.2.p0
1+
0.16.0

‎build/pkgs/ipykernel/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=ipykernel-VERSION.tar.gz
2-
sha1=21b1930141d1652c79d986092556f46c2bcf8024
3-
md5=1b320ff87a1a0b049e83df2de91b7f7c
4-
cksum=3573376709
2+
sha1=2be4eee12e8fcc3e6f51c5a6c04976caa7b81234
3+
md5=2d597192656fbac76c3c1a95aa18c44e
4+
cksum=3571810947

‎build/pkgs/ipykernel/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.6.1
1+
4.7.0

‎build/pkgs/jinja2/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=jinja2-VERSION.tar.gz
2-
sha1=4a33c1a0fd585eba2507e8c274a9cd113b1d13ab
3-
md5=edb51693fe22c53cee5403775c71a99e
4-
cksum=2405780533
2+
sha1=34b69e5caab12ee37b9df69df9018776c008b7b8
3+
md5=61ef1117f945486472850819b8d1eb3d
4+
cksum=3666178370

‎build/pkgs/jinja2/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.p0
1+
2.10

‎build/pkgs/jsonschema/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=jsonschema-VERSION.tar.gz
2-
sha1=c30d415d250699630f302acb8efd660dd006a7ca
3-
md5=374e848fdb69a3ce8b7e778b47c30640
4-
cksum=3533981975
2+
sha1=97e49df4601f7066d9954c0ec4d8d697887b32f0
3+
md5=50c6b69a373a8b55ff1e0ec6e78f13f4
4+
cksum=2742363098

‎build/pkgs/jsonschema/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.1.p0
1+
2.6.0

‎build/pkgs/linbox/spkg-install

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ fi
3434
# See trac ticket #21221.
3535
LINBOX_CONFIGURE="--without-fplll $LINBOX_CONFIGURE"
3636

37+
# Need to use 'bash' for configure, see
38+
# https://trac.sagemath.org/ticket/23451
39+
if [ -z "$CONFIG_SHELL" ]; then
40+
export CONFIG_SHELL=`command -v bash`
41+
fi
42+
3743
# We disable openmp because of build failures, see
3844
# http://trac.sagemath.org/ticket/17635#comment:67
3945
sdh_configure --with-default="$SAGE_LOCAL" \

‎build/pkgs/markupsafe/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=markupsafe-VERSION.tar.gz
2-
sha1=cd5c22acf6dd69046d6cb6a3920d84ea66bdf62a
3-
md5=f5ab3deee4c37cd6a922fb81e730da6e
4-
cksum=586757310
2+
sha1=9072e80a7faa0f49805737a48f3d871eb1c48728
3+
md5=2fcedc9284d50e577b5192e8e3578355
4+
cksum=1008490675

‎build/pkgs/markupsafe/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.23.p0
1+
1.0

‎build/pkgs/meataxe/SPKG.txt

+12-17
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
1-
= MeatAxe =
1+
= SharedMeatAxe =
22

33
== Description ==
44

5-
The MeatAxe is a set of programs for working with matrix representations
6-
over finite fields. Permutation representations are supported to some
7-
extent, too.
5+
SharedMeatAxe 1.0 is an autotoolized shared library version of C MeatAxe 2.4.24,
6+
a set of programs for computing with modular representations.
7+
The package comprises a shared library "libmtx", as well as several
8+
executables.
89

9-
The MeatAxe is developed for the UNIX operating system. Supported platforms
10-
include Linux (x86), SunOS/Solaris (Sparc), HP/UX, DEC OSF/1 (Alpha), and
11-
Windows NT 4.0 (x86, Alpha, PPC).
10+
See http://users.minet.uni-jena.de/~king/SharedMeatAxe/ for the package
11+
documentation.
1212

13-
== License ==
13+
== Licence ==
1414

15-
The C Meat-Axe is free software: you can redistribute it and/or modify it under
15+
The Shared Meat-Axe is free software: you can redistribute it and/or modify it under
1616
the terms of the GNU General Public License as published by the Free Software
1717
Foundation, either version 2 of the License, or (at your option) any later
18-
version.
18+
version. See the file COPYING.
1919

20-
== Upstream Contact ==
20+
== Upstream contact ==
2121

22-
Michael Ringe ([email protected])
23-
24-
== Special Update/Build Instructions ==
25-
26-
The original upstream tarball was re-packaged, so that it unpacks into a single
27-
folder called meataxe-2.4.24
22+
* Simon King <[email protected]>

‎build/pkgs/meataxe/checksums.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tarball=meataxe-VERSION.tar.gz
2-
sha1=0aa4313cc430c78e058068feba805428ef2324aa
3-
md5=e0f384e37a69671c73c2904e4e69dc01
4-
cksum=3083268116
1+
tarball=shared_meataxe-VERSION.tar.gz
2+
sha1=1a84840fb928ca2684f16dc630c854ce579b0c2e
3+
md5=5e1aab41b19c9fec967d02ead5077eca
4+
cksum=2618257012

‎build/pkgs/meataxe/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.24.p3
1+
1.0

‎build/pkgs/meataxe/patches/IO_fixes.patch

-78
This file was deleted.

0 commit comments

Comments
 (0)