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

Commit

Permalink
Merge remote-tracking branch 'trac/develop' into t/21869/a_framework_…
Browse files Browse the repository at this point in the history
…for_discrete_valuations_in_sage
  • Loading branch information
saraedum committed Jan 19, 2018
2 parents 4900f56 + 56a4bc7 commit 24807e3
Show file tree
Hide file tree
Showing 252 changed files with 9,661 additions and 4,954 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 8.2.beta2, Release Date: 2018-01-01
SageMath version 8.2.beta3, Release Date: 2018-01-17
6 changes: 3 additions & 3 deletions build/pkgs/alabaster/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=alabaster-VERSION.tar.gz
sha1=c80dedaf4a1906410e53b653de059fe9d8b17c68
md5=346a71e8a6d51dff2e02086fdd9c5ffe
cksum=2849350596
sha1=dba599faf1ca5541ef35ab251eb2b365ae2f25c7
md5=7934dccf38801faa105f6e7b4784f493
cksum=3227702678
2 changes: 1 addition & 1 deletion build/pkgs/alabaster/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.8.p0
0.7.10
6 changes: 3 additions & 3 deletions build/pkgs/babel/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=Babel-VERSION.tar.gz
sha1=c92786942f1c920e3c39a057a7678d2aa0d1c44c
md5=afa20bc55b0e991833030129ad498f35
cksum=4254002491
sha1=9adbd49864392713c6a3080aeb0a9e6432577277
md5=60228b3ce93a203357158b909afe8ae1
cksum=2035941902
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.3.4.p0
2.5.1
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=8d46907fc431aaab8b7c378db213fda2dc06ac00
md5=b815a36b9ad3d256ec2a25b41145f7a7
cksum=229126322
sha1=fce3f8df178645228d91b6b65e3a03af0b2b3641
md5=587c7e18518428f0f30138eeb7743bad
cksum=144653522
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
250
251
6 changes: 3 additions & 3 deletions build/pkgs/cython/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=Cython-VERSION.tar.gz
sha1=3f903995b1444d5cbb3af6cd4aeadfd7c1dacc2b
md5=64abe5847736eb413a525b70b48afd7f
cksum=949083648
sha1=688aa815301dd9e710cd847528de31099f3b52c4
md5=6149238287d662bd5d5e572482252493
cksum=460741347
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.27.2
0.27.3
6 changes: 3 additions & 3 deletions build/pkgs/docutils/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=docutils-VERSION.tar.gz
sha1=c16e14ef18142fa248400cd174edb4fa40e51d5b
md5=ea4a893c633c788be9b8078b6b305d53
cksum=137667414
sha1=32cefb69ac3dab5b04c4d150776f35419cc4c863
md5=c53768d63db3873b7d452833553469de
cksum=2981697109
2 changes: 1 addition & 1 deletion build/pkgs/docutils/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.13.1
0.14
6 changes: 6 additions & 0 deletions build/pkgs/fflas_ffpack/spkg-install
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ if [ "$SAGE_FAT_BINARY" = yes ]; then
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"
fi

# Need to use 'bash' for configure, see
# https://trac.sagemath.org/ticket/23451
if [ -z "$CONFIG_SHELL" ]; then
export CONFIG_SHELL=`command -v bash`
fi

# We disable openmp because of build failures, see
# http://trac.sagemath.org/ticket/17635#comment:67
sdh_configure --with-default="$SAGE_LOCAL" --with-blas-libs="$LINBOX_BLAS" \
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/future/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=future-VERSION.tar.gz
sha1=431bf8ff160e8e785a2f76c3e57c1b6c2b13b41a
md5=a68eb3c90b3b76714c5ceb8c09ea3a06
cksum=2554543285
sha1=86ed881acef874d04576b9df03c29d25ad2cd25f
md5=3e8e88a2bda48d54b1da7634d04760d7
cksum=1475858329
2 changes: 1 addition & 1 deletion build/pkgs/future/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.15.2.p0
0.16.0
6 changes: 3 additions & 3 deletions build/pkgs/ipykernel/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=ipykernel-VERSION.tar.gz
sha1=21b1930141d1652c79d986092556f46c2bcf8024
md5=1b320ff87a1a0b049e83df2de91b7f7c
cksum=3573376709
sha1=2be4eee12e8fcc3e6f51c5a6c04976caa7b81234
md5=2d597192656fbac76c3c1a95aa18c44e
cksum=3571810947
2 changes: 1 addition & 1 deletion build/pkgs/ipykernel/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.6.1
4.7.0
6 changes: 3 additions & 3 deletions build/pkgs/jinja2/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=jinja2-VERSION.tar.gz
sha1=4a33c1a0fd585eba2507e8c274a9cd113b1d13ab
md5=edb51693fe22c53cee5403775c71a99e
cksum=2405780533
sha1=34b69e5caab12ee37b9df69df9018776c008b7b8
md5=61ef1117f945486472850819b8d1eb3d
cksum=3666178370
2 changes: 1 addition & 1 deletion build/pkgs/jinja2/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.p0
2.10
6 changes: 3 additions & 3 deletions build/pkgs/jsonschema/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=jsonschema-VERSION.tar.gz
sha1=c30d415d250699630f302acb8efd660dd006a7ca
md5=374e848fdb69a3ce8b7e778b47c30640
cksum=3533981975
sha1=97e49df4601f7066d9954c0ec4d8d697887b32f0
md5=50c6b69a373a8b55ff1e0ec6e78f13f4
cksum=2742363098
2 changes: 1 addition & 1 deletion build/pkgs/jsonschema/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.1.p0
2.6.0
6 changes: 6 additions & 0 deletions build/pkgs/linbox/spkg-install
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ fi
# See trac ticket #21221.
LINBOX_CONFIGURE="--without-fplll $LINBOX_CONFIGURE"

# Need to use 'bash' for configure, see
# https://trac.sagemath.org/ticket/23451
if [ -z "$CONFIG_SHELL" ]; then
export CONFIG_SHELL=`command -v bash`
fi

# We disable openmp because of build failures, see
# http://trac.sagemath.org/ticket/17635#comment:67
sdh_configure --with-default="$SAGE_LOCAL" \
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/markupsafe/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=markupsafe-VERSION.tar.gz
sha1=cd5c22acf6dd69046d6cb6a3920d84ea66bdf62a
md5=f5ab3deee4c37cd6a922fb81e730da6e
cksum=586757310
sha1=9072e80a7faa0f49805737a48f3d871eb1c48728
md5=2fcedc9284d50e577b5192e8e3578355
cksum=1008490675
2 changes: 1 addition & 1 deletion build/pkgs/markupsafe/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.23.p0
1.0
29 changes: 12 additions & 17 deletions build/pkgs/meataxe/SPKG.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
= MeatAxe =
= SharedMeatAxe =

== Description ==

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

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

== License ==
== Licence ==

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

== Upstream Contact ==
== Upstream contact ==

Michael Ringe (mringe@math.rwth-aachen.de)

== Special Update/Build Instructions ==

The original upstream tarball was re-packaged, so that it unpacks into a single
folder called meataxe-2.4.24
* Simon King <simon.king@uni-jena.de>
8 changes: 4 additions & 4 deletions build/pkgs/meataxe/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=meataxe-VERSION.tar.gz
sha1=0aa4313cc430c78e058068feba805428ef2324aa
md5=e0f384e37a69671c73c2904e4e69dc01
cksum=3083268116
tarball=shared_meataxe-VERSION.tar.gz
sha1=1a84840fb928ca2684f16dc630c854ce579b0c2e
md5=5e1aab41b19c9fec967d02ead5077eca
cksum=2618257012
2 changes: 1 addition & 1 deletion build/pkgs/meataxe/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.24.p3
1.0
78 changes: 0 additions & 78 deletions build/pkgs/meataxe/patches/IO_fixes.patch

This file was deleted.

Loading

0 comments on commit 24807e3

Please sign in to comment.