Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Jul 2015 15:11:40 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r392924 - in head/science/py-scikit-sparse: . files
Message-ID:  <201507261511.t6QFBeQv095341@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sun Jul 26 15:11:39 2015
New Revision: 392924
URL: https://svnweb.freebsd.org/changeset/ports/392924

Log:
  - Fix build when using python 3.x
  - Update WWW in pkg-descr, points to new project location now
  
  PR:		201346
  Submitted by:	john@saltant.com
  Approved by:	yuri@rawbw.com (maintainer)
  MFH:		2015Q3

Added:
  head/science/py-scikit-sparse/files/
  head/science/py-scikit-sparse/files/patch-scikits_sparse_test__cholmod.py   (contents, props changed)
Modified:
  head/science/py-scikit-sparse/Makefile
  head/science/py-scikit-sparse/pkg-descr

Modified: head/science/py-scikit-sparse/Makefile
==============================================================================
--- head/science/py-scikit-sparse/Makefile	Sun Jul 26 15:04:34 2015	(r392923)
+++ head/science/py-scikit-sparse/Makefile	Sun Jul 26 15:11:39 2015	(r392924)
@@ -3,6 +3,7 @@
 
 PORTNAME=	scikit-sparse
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Added: head/science/py-scikit-sparse/files/patch-scikits_sparse_test__cholmod.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/py-scikit-sparse/files/patch-scikits_sparse_test__cholmod.py	Sun Jul 26 15:11:39 2015	(r392924)
@@ -0,0 +1,36 @@
+This patch is the origin of the upstream contribution referenced by
+https://github.com/njsmith/scikits-sparse/pull/12
+
+--- scikits/sparse/test_cholmod.py.orig	2015-06-24 10:39:06 UTC
++++ scikits/sparse/test_cholmod.py
+@@ -53,17 +53,17 @@ def test_integer_size():
+ def test_cholesky_smoke_test():
+     f = cholesky(sparse.eye(10, 10) * 1.)
+     d = np.arange(20).reshape(10, 2)
+-    print "dense"
++    print("dense")
+     assert np.allclose(f(d), d)
+-    print "sparse"
++    print("sparse")
+     s_csc = sparse.csc_matrix(np.eye(10)[:, :2] * 1.)
+     assert sparse.issparse(f(s_csc))
+     assert np.allclose(f(s_csc).todense(), s_csc.todense())
+-    print "csr"
++    print("csr")
+     s_csr = s_csc.tocsr()
+     assert sparse.issparse(f(s_csr))
+     assert np.allclose(f(s_csr).todense(), s_csr.todense())
+-    print "extract"
++    print("extract")
+     assert np.all(f.P() == np.arange(10))
+ 
+ def real_matrix():
+@@ -193,7 +193,7 @@ def test_cholesky_matrix_market():
+             f3.cholesky_AAt_inplace(X.T)
+             assert np.allclose(f3(Xty), answer)
+ 
+-            print problem, mode
++            print(problem, mode)
+             for f in (f1, f2, f3, f4):
+                 pXtX = XtX.todense()[f.P()[:, np.newaxis],
+                                      f.P()[np.newaxis, :]]

Modified: head/science/py-scikit-sparse/pkg-descr
==============================================================================
--- head/science/py-scikit-sparse/pkg-descr	Sun Jul 26 15:04:34 2015	(r392923)
+++ head/science/py-scikit-sparse/pkg-descr	Sun Jul 26 15:11:39 2015	(r392924)
@@ -1,3 +1,3 @@
 scikits-sparse is a Python module for sparse matrix calculations.
 
-WWW: https://scikits.appspot.com/sparse/
+WWW: https://github.com/njsmith/scikits-sparse



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507261511.t6QFBeQv095341>