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

Commit 65107d4

Browse files
rwstrwst
committed
Merge branch 'develop' into t/8734/ticket/8734-1
* develop: (399 commits) Updated Sage version to 6.3.beta5 Added patch file to lrcalc. trac #16147: fix .abs() for elt of embedded number field document behaviour if system is inconsistent trac #16528: Broken doctest trac #16528: review trac #16535: n1 <= n2 in product decomp. + better doc trac #16503: Broken doc trac #16535: avoid calling recursive construction in OA(3,n) trac #16535: remove who_asked trac #16535: mv W. cons. to orthogonal_arrays_recursive.py Trac #16423: Table of MOLS from the handbook and comparison with Sage trac #16524: more comments in the doc trac #16503: Review trac #16524: move the cyclic difference set to the constructor Changed checksum. Update SPKG.txt and checksums.ini. trac #16528: OA(9,120) trac #16524: OA(9,135) Changed version number. ...
2 parents a195985 + f5e92ea commit 65107d4

File tree

284 files changed

+18398
-5100
lines changed

Some content is hidden

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

284 files changed

+18398
-5100
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
.idea
3838
.iml
3939

40+
# XCode
41+
xcuserdata/
42+
4043
# Eclipse
4144
*.pydevproject
4245
.project

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 6.3.beta3, released 2014-06-04
1+
Sage version 6.3.beta5, released 2014-07-01

‎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=94c4a9dc954e0d5653907a5187f61059835c713b
3-
md5=9316e8ffe91a749ea737da0f57f3f1ef
4-
cksum=66239435
2+
sha1=4d10c539769b8aa53c2bd97f9d9ae6b8a139d356
3+
md5=b9ea7956de216fc5e5965e17b14bab3f
4+
cksum=2387138201

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
33
1+
35

‎build/pkgs/d3js/SPKG.txt

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
= d3js =
2+
3+
== Description ==
4+
5+
D3.js is a JavaScript library for manipulating documents based on data.
6+
The file d3.min.js will be placed into the ${SAGE_SHARE}/d3js/ directory.
7+
8+
== License ==
9+
10+
BSD 3-Clause License
11+
12+
== SPKG Maintainers ==
13+
14+
* Thierry Monteil
15+
16+
== Upstream Contact ==
17+
18+
Author: Mike Bostock (http://bost.ocks.org/mike/)
19+
Home page: http://d3js.org/
20+
21+
== Dependencies ==
22+
23+
None.
24+
25+
== Special Update/Build Instructions ==
26+
27+
Two kind of archives can be downloaded from d3.js website: one with all source
28+
code and tests that weights 2,9M (both in zip and tar.gz formats) and one with
29+
the final javascript scripts which weights 121K (zip format only). Since
30+
testing requires node.js that is not shipped with Sage, we currenlty ship the
31+
final js only. Hence we have to transform it from zip to tar.gz format.
32+
Running sage-src should do all the repackaging job.
33+

‎build/pkgs/d3js/checksums.ini

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tarball=d3js-VERSION.tar.gz
2+
sha1=2fd4da34ca9e645cf81bf914d289c21c7bb8c166
3+
md5=d859a120f1eaebb8b563f4598868c564
4+
cksum=527881311

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.4.8

‎build/pkgs/d3js/spkg-install

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/sh
2+
3+
if [ -z "$SAGE_SHARE" ]; then
4+
echo >&2 "SAGE_SHARE undefined ... exiting"
5+
echo >&2 "Maybe run 'sage --sh'?"
6+
exit 1
7+
fi
8+
9+
TARGET="${SAGE_SHARE}/d3js"
10+
if [ ! -d "${TARGET}" ]; then
11+
mkdir "${TARGET}"
12+
fi
13+
14+
cp 'src/d3.min.js' "${TARGET}/"
15+

‎build/pkgs/d3js/spkg-src

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
[ -n "${SAGE_ROOT}" ] || SAGE_ROOT="$(pwd)/../../../"
6+
7+
8+
# prepare a clean directory.
9+
[ -d "work" ] && rm -rf "work"
10+
mkdir "work"
11+
cd "work"
12+
13+
14+
# determine latest version.
15+
wget 'https://raw.githubusercontent.com/mbostock/d3/master/package.json'
16+
GIT_VERSION="$(grep '"version":' 'package.json' | sed 's/.*: "\(.*\)",/\1/g')"
17+
18+
19+
# fetch source and check version.
20+
wget "https://github.com/mbostock/d3/releases/download/v${GIT_VERSION}/d3.zip"
21+
unzip 'd3.zip'
22+
ZIP_VERSION="$(grep 'version:' 'd3.js' | sed 's/.*: "\(.*\)"/\1/g')"
23+
if [ ! "${GIT_VERSION}" = "${ZIP_VERSION}" ] ; then
24+
echo "Version mismatch: ${GIT_VERSION} vs ${ZIP_VERSION}."
25+
exit 1
26+
fi
27+
28+
29+
# build and move tarball
30+
mkdir "d3js-${ZIP_VERSION}"
31+
mv 'd3.min.js' 'LICENSE' "d3js-${ZIP_VERSION}"
32+
tar czvf "d3js-${ZIP_VERSION}.tar.gz" "d3js-${ZIP_VERSION}"
33+
mv "d3js-${ZIP_VERSION}.tar.gz" "${SAGE_ROOT}/upstream/"
34+
35+
36+
# update package info
37+
cd ..
38+
echo "${ZIP_VERSION}" > 'package-version.txt'
39+
sage -sh 'sage-fix-pkg-checksums'
40+
41+

‎build/pkgs/database_gap/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=database_gap-VERSION.tar.bz2
2-
sha1=6e5f63df55881a509076c4ecbd02c7afc8f81ef9
3-
md5=6f9d4632f6d2f4a7000c22cff5d15406
4-
cksum=1275532986
2+
sha1=0e81cd017dc0542fc5faf923324eb1fffb61cdeb
3+
md5=879fc85f53fa9ff9f12dc7ebd621a528
4+
cksum=3437971482

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.4
1+
4.7.5

‎build/pkgs/gap/SPKG.txt

-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,3 @@ update GAP, please also update and use the spkg-src script.
5454

5555
* writeandcheck.patch: fix infinite loop in writeandcheck() when
5656
writing an error message fails.
57-
58-
* sparc_segfault.patch: fix alignment issue on SPARC
59-
60-
* osx_10_4.patch: OSX 10.4 build fix taken from https://bitbucket.org/gap-system/gap/

‎build/pkgs/gap/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=gap-VERSION.tar.bz2
2-
sha1=e61699cedf56b3b1668dec7387437eeb08fba3e7
3-
md5=3d3c1a40185d05863afbfd59956eecd9
4-
cksum=2711033242
2+
sha1=8a2437546c374652457da6d4d9749e94f39d83e7
3+
md5=348a75094d3320303e8179bd6962d560
4+
cksum=2730509972

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.4
1+
4.7.5

‎build/pkgs/gap/patches/osx_10_4.patch

-36
This file was deleted.

‎build/pkgs/gap/patches/sparc_segfault.patch

-25
This file was deleted.

‎build/pkgs/gap_packages/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=gap_packages-VERSION.tar.bz2
2-
sha1=9ce61e1947bc5aa0f761f97fb9777e97ab6d3eda
3-
md5=57657e75f9b80f5afc36dcdd3538eada
4-
cksum=2009528425
2+
sha1=f9703c422906fa37f1e6896f6d497e2eda2aa576
3+
md5=ceb9d10e091753a14fe135078e8c7d2c
4+
cksum=3463670966

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.4.20140531
1+
4.7.5

‎build/pkgs/gap_packages/spkg-src

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mkdir src
2727
for pkg in \
2828
crime ctbllib design factint grape \
2929
guava Hap HAPcryst laguna polymaking \
30-
sonata toric polycyclic autpgrp Alnuth
30+
sonata toric polycyclic autpgrp Alnuth atlasrep
3131
do
3232
echo "Copying package $pkg"
3333
pkg_dir=`ls -d "$GAP/pkg/$pkg"*`

‎build/pkgs/ipython/SPKG.txt

-6
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,3 @@ [email protected]
3535
== Dependencies ==
3636

3737
* Python
38-
39-
== Patches ==
40-
41-
* 0001-Allow-InputTransformers-to-raise-SyntaxErrors.patch: See
42-
https://github.com/ipython/ipython/pull/4504. This patch allows
43-
Sage to raise SyntaxErrors for our extensions to the Python language.

‎build/pkgs/ipython/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=ipython-VERSION.tar.gz
2-
sha1=0041de4de5cac2fb5d0522af84958c78c1dfd9bf
3-
md5=4ffb36697f7ca8cb4a2de0f5b30bc89c
4-
cksum=1840805192
2+
sha1=e80c30388cbe576038a78fc8ebb159cddae84fb4
3+
md5=785c7b6364c6a0dd34aa4ea970cf83b9
4+
cksum=2529846191

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.1
1+
2.1.0

0 commit comments

Comments
 (0)