Merge branch 'categories/module-morphisms-8678' into t/11111/more_sup…

…port_for_finite_dimensional_modules_and_algebras_with_basis

VERSION.txt

@@ -1 +1 @@
-Sage version 6.3.beta5, released 2014-07-01
+Sage version 6.4.beta0, released 2014-08-14

build/deps

@@ -31,6 +31,7 @@ all-sage: \
      $(INST)/$(CDDLIB) \
      $(INST)/$(CEPHES) \
      $(INST)/$(CLIQUER) \
+     $(INST)/$(COMBINATORIAL_DESIGNS) \
      $(INST)/$(CONWAY) \
      $(INST)/$(CVXOPT) \
      $(INST)/$(CYTHON) \
@@ -163,12 +164,15 @@ $(INST)/prereq: ../configure
 	    fi; )
 	touch $@
 
+$(INST)/$(PATCH):
+	+$(PIPE) "$(SAGE_SPKG) $(PATCH) 2>&1" "tee -a $(SAGE_LOGS)/$(PATCH).log"
+
+$(INST)/$(PKGCONF): $(INST)/$(PATCH)
+	+$(PIPE) "$(SAGE_SPKG) $(PKGCONF) 2>&1" "tee -a $(SAGE_LOGS)/$(PKGCONF).log"
+
 $(INST)/$(BZIP2): $(INST)/prereq $(INST)/$(PKGCONF)
 	+$(PIPE) "$(SAGE_SPKG) $(BZIP2) 2>&1" "tee -a $(SAGE_LOGS)/$(BZIP2).log"
 
-$(INST)/$(PATCH): $(INST)/$(BZIP2)
-	+$(PIPE) "$(SAGE_SPKG) $(PATCH) 2>&1" "tee -a $(SAGE_LOGS)/$(PATCH).log"
-
 ###############################################################################
 # Building normal packages
 ###############################################################################
@@ -185,6 +189,9 @@ $(INST)/$(BOOST_CROPPED):
 $(INST)/$(CLIQUER):
 	+$(PIPE) "$(SAGE_SPKG) $(CLIQUER) 2>&1" "tee -a $(SAGE_LOGS)/$(CLIQUER).log"
 
+$(INST)/$(COMBINATORIAL_DESIGNS):
+	+$(PIPE) "$(SAGE_SPKG) $(COMBINATORIAL_DESIGNS) 2>&1" "tee -a $(SAGE_LOGS)/$(COMBINATORIAL_DESIGNS).log"
+
 $(INST)/$(NCURSES): $(INST)/$(PKGCONF)
 	+$(PIPE) "$(SAGE_SPKG) $(NCURSES) 2>&1" "tee -a $(SAGE_LOGS)/$(NCURSES).log"
 
@@ -336,7 +343,7 @@ $(INST)/$(SAGETEX): $(INST)/$(PYTHON) \
 $(INST)/$(SETUPTOOLS): $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(SETUPTOOLS) 2>&1" "tee -a $(SAGE_LOGS)/$(SETUPTOOLS).log"
 
-$(INST)/$(SINGULAR): $(INST)/$(MPIR) $(INST)/$(NTL) \
+$(INST)/$(SINGULAR): $(INST)/$(MPIR) $(INST)/$(NTL) $(INST)/$(FLINT) \
 		     $(INST)/$(READLINE) $(INST)/$(MPFR)
 	+$(PIPE) "$(SAGE_SPKG) $(SINGULAR) 2>&1" "tee -a $(SAGE_LOGS)/$(SINGULAR).log"
 
@@ -471,6 +478,7 @@ $(INST)/sage: \
 		 $(INST)/$(IML) \
 		 $(INST)/$(JINJA2) \
 		 $(INST)/$(LCALC) \
+		 $(INST)/$(LRCALC) \
 		 $(INST)/$(LIBGAP) \
 		 $(INST)/$(LIBPNG) \
 		 $(INST)/$(LINBOX) \
@@ -521,9 +529,6 @@ $(INST)/$(GCC): $(INST)/$(MPIR) $(INST)/$(MPFR) $(INST)/$(MPC) \
 $(INST)/$(PILLOW): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 	+$(PIPE) "$(SAGE_SPKG) $(PILLOW) 2>&1" "tee -a $(SAGE_LOGS)/$(PILLOW).log"
 
-$(INST)/$(PKGCONF): 
-	+$(PIPE) "$(SAGE_SPKG) $(PKGCONF) 2>&1" "tee -a $(SAGE_LOGS)/$(PKGCONF).log"
-
 $(INST)/$(PKGCONFIG): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 	+$(PIPE) "$(SAGE_SPKG) $(PKGCONFIG) 2>&1" "tee -a $(SAGE_LOGS)/$(PKGCONFIG).log"
 

build/install

@@ -324,6 +324,7 @@ BZIP2=`newest_version bzip2`
 CDDLIB=`newest_version cddlib`
 CEPHES=`newest_version cephes`
 CLIQUER=`newest_version cliquer`
+COMBINATORIAL_DESIGNS=`newest_version combinatorial_designs`
 CONWAY=`newest_version conway_polynomials`
 CVXOPT=`newest_version cvxopt`
 CYTHON=`newest_version cython`

build/pkgs/combinatorial_designs/SPKG.txt

@@ -0,0 +1,29 @@
+= Combinatorial Designs =
+
+== Description ==
+
+Data for Combinatorial Designs. Current content:
+
+- The table of MOLS (10 000 integers) from the Handbook of Combinatorial
+  Designs, 2ed.
+
+== SPKG Maintainers ==
+
+ * Nathann Cohen
+
+== License ==
+
+Public domain.
+
+== Upstream Contact ==
+
+ None
+
+== Dependencies ==
+
+N/A
+
+== Changelog ==
+
+== designs-20140630 (Nathann Cohen, 2014-06-30) ==
+ * #16541: Table of MOLS

build/pkgs/combinatorial_designs/checksums.ini

@@ -0,0 +1,4 @@
+tarball=combinatorial_designs-VERSION.tar.bz2
+sha1=353ba24217f9b7920890a784fd75dc59175f7196
+md5=f345a6918b1bcf34fcd71c2f26d10de0
+cksum=131472289

build/pkgs/combinatorial_designs/package-version.txt

@@ -0,0 +1 @@
+20140630

build/pkgs/combinatorial_designs/spkg-install

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+mkdir -p "$SAGE_SHARE"/combinatorial_designs
+mv src/* "$SAGE_SHARE"/combinatorial_designs

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=4d10c539769b8aa53c2bd97f9d9ae6b8a139d356
-md5=b9ea7956de216fc5e5965e17b14bab3f
-cksum=2387138201
+sha1=3bf450cfe7244e6f52ecfe602689f4cf792ac9d9
+md5=ff7ba3c70a9a1a332996af18b30bbb42
+cksum=4284066357

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-35
+44

build/pkgs/graphs/spkg-install

@@ -1,6 +1,4 @@
 #!/bin/sh
 
-rm -rf "$SAGE_SHARE"/graphs
-
-mkdir -p "$SAGE_SHARE"
-mv src "$SAGE_SHARE"/graphs
+mkdir -p "$SAGE_SHARE"/graphs
+cp src/* "$SAGE_SHARE"/graphs/

build/pkgs/libgap/spkg-install

@@ -44,6 +44,7 @@ done
 echo "Configuring libGAP..."
 ./configure --disable-static \
     CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
+    --libdir="$SAGE_LOCAL/lib" \
     --with-gap_system_arch="$GAParch_system" \
     --with-sage="$SAGE_LOCAL" --with-gmp="$SAGE_LOCAL" --prefix="$SAGE_LOCAL"
 if [ $? -ne 0 ]; then

build/pkgs/nose/SPKG.txt

@@ -0,0 +1,39 @@
+= nose =
+
+== Description ==
+
+nose extends the test loading and running features of unittest, making
+it easier to write, find and run tests.
+
+== License ==
+
+GNU LGPL
+
+== SPKG Maintainers ==
+
+John H. Palmieri <palmieri@math.washington.edu>
+Martin W.-Raum <martin@raum-brother.eu>
+
+== Upstream Contact ==
+
+Author: Jason Pellerin
+Home Page: http://readthedocs.org/docs/nose/
+  see also https://github.com/nose-devs/nose
+
+== Dependencies ==
+
+ * setuptools / distribute
+ * Python
+ * GNU patch (shipped with Sage)
+
+== Special Update/Build Instructions ==
+
+Remove any .pyc files by running the spkg-src script.
+
+== Changelog ==
+
+=== nose-1.1.2 (John H. Palmieri, June 14, 2012) ===
+ * #9921: initial version.
+
+=== nose-1.3.3 (Martin W.-Raum, Juli 21, 2014) ===
+ * #??: Updated

build/pkgs/nose/checksums.ini

@@ -0,0 +1,4 @@
+tarball=nose-VERSION.tar.bz2
+sha1=b3177ffaa32eb169e1d775d02c8a361d0d76808e
+md5=aab52d77de9845d58ad717016f48668f
+cksum=2069758669

build/pkgs/nose/package-version.txt

@@ -0,0 +1 @@
+1.3.3

build/pkgs/nose/spkg-check

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+if [ -z "$SAGE_LOCAL" ]; then
+    echo "SAGE_LOCAL undefined - exiting..."
+    echo "Maybe run 'sage -sh'?"
+    exit 1
+fi
+
+cd src
+
+nosetests functional_tests
+if [ $? -ne 0 ]; then
+    echo "Error running functional_tests."
+    exit 1
+fi
+nosetests unit_tests
+if [ $? -ne 0 ]; then
+    echo "Error running unit_tests."
+    exit 1
+fi

build/pkgs/nose/spkg-install

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+if [ -z "$SAGE_LOCAL" ]; then
+    echo "SAGE_LOCAL undefined - exiting..."
+    echo "Maybe run 'sage -sh'?"
+    exit 1
+fi
+
+# Helper functions
+success() {
+    if [ $? -ne 0 ]; then
+        echo "Error: '$1'"
+        exit 1
+    fi
+}
+
+CUR=`pwd`
+
+cd src
+
+# Build new version
+echo "Building nose..."
+python setup.py build
+success 'Error building nose'
+echo
+
+echo "Removing old version of nose..."
+rm -rf "$SAGE_LOCAL"/lib/python/site-packages/Nose-*
+success 'Error deleting previous version'
+echo
+
+# Install new version
+echo "Installing nose..."
+python setup.py install
+success 'Error installing nose'
+echo

build/pkgs/openssl/SPKG.txt

@@ -22,27 +22,5 @@ library in a variety of computer languages are available.
 
 === Patches ===
 
- * src/Configure: Sage's gcc doesn't recognize the '-arch' option,
-   while Apple's gcc does, so we remove this flag.
  * src/config: patched to fix a problem on Solaris.
 
-== Changelog ==
-
-=== openssl-1.0.1c.p0 (John Palmieri, 17 June 2012) ===
- * Trac #13126: Update source to 1.0.1c
- * Created hg repository
- * Cleaned up spkg-install
- * Created spkg-check
- * Patch to build on OS X Lion
- * Patch to build on Solaris
-
-=== openssl-1.0.1a (Mariah Lenox, 23 April 2012) ===
- * upgraded source
-
-=== openssl-1.0.0.p0 (William Stein, June 3, 2010) ===
- * Fix issue with openssl libraries getting installed to lib64,
-   as recommended by Mariah (the referee).
-
-=== openssl-1.0.0 (William Stein, April 27, 2010) ===
- * Initial version in modernized format
-

build/pkgs/openssl/checksums.ini

@@ -1,4 +1,4 @@
 tarball=openssl-VERSION.tar.gz
-sha1=3f1b1223c9e8189bfe4e186d86449775bd903460
-md5=66bf6f10f060d561929de96f9dfe5b8c
-cksum=4124470397
+sha1=b2239599c8bf8f7fc48590a55205c26abe560bf8
+md5=8d6d684a9430d5cc98a62a5d8fbda8cf
+cksum=3773835410

build/pkgs/openssl/package-version.txt

@@ -1 +1 @@
-1.0.1e
+1.0.1h

build/pkgs/patch/SPKG.txt

@@ -37,30 +37,5 @@ None
 In the event patches ever need to be made to this package, the method of
 applying the patches should not rely on the 'patch' existing on the system.
 
-Versions 2.6 and 2.6.1 seem to be broken on OS X 10.4 (and supposedly also
-Solaris too). So do NOT update the package to those versions.
-
-Version 2.6.1 had some self-tests, so assuming the OS X & Solaris bugs get
-fixed at some point, a spkg-check file should be added.
-
-== Changelog ==
-
-=== patch-2.5.9.p3 (Jean-Pierre Flori, 5 January 2013) ===
- * #13844: Install manifest file on Cygwin for Windows 7.
-
-=== patch-2.5.9.p2 (Jeroen Demeyer, 16 August 2011) ===
- * #11232: Make all files in src/ owner-writable.
-
-=== patch-2.5.9.p1 (Dima Pasechnik, 21nd March 2011)  ===
- * #11232 We should not build patch on Cygwin, and rely on Cygwin-supplied
-   one.
-
-=== patch-2.5.9.p0 (David Kirkby, 22nd March 2011)  ===
- * #10979 Disable debugging information on AIX, by adding -g0
-  to CFLAGS otherwise there are link errors with GNU patch and
-  many other programs. See these threads.
-  http://www.ibm.com/developerworks/forums/thread.jspa?threadID=348558
-  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46072
-
-=== patch-2.5.9 (David Kirkby, Jeroen Demeyer, 16th november 2010)  ===
- * Initial version.
+Since bzip2 may (actually, does) depend on patch indirectly the patch
+tarball must be in gzip format.

build/pkgs/patch/checksums.ini

@@ -1,4 +1,4 @@
-tarball=patch-VERSION.tar.bz2
-sha1=b0858023f34c87028cbdbeab6c4a797258ea1be1
-md5=e0871f9e39c6625b2ec05cf79a959830
-cksum=1913387126
+tarball=patch-VERSION.tar.gz
+sha1=4ac0fc1a636365be9db252c9340aba7209c60bbe
+md5=95dd8d7e41dcbcecdd5cd88ef915378d
+cksum=3799073743

build/pkgs/patch/package-version.txt

@@ -1 +1 @@
-2.5.9.p3
+2.7.1