CVS commit: pkgsrc/math/py-munkres

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jul 23 18:39:51 UTC 2017

Modified Files:
        pkgsrc/math/py-munkres: Makefile PLIST distinfo

Log Message:
Version 1.0.11:

Docs are now generated with pdoc.

Merged Pull Request 24, from @czlee:

* Change to step 4: When it looks for a uncovered zero, rather than starting at row 0, column 0, it starts where it left off, i.e. at the last uncovered zero it found. Since it doesn't start at 
(0,0), when it gets to the last column it now loops around to the first, and exits unsuccessfully if it got back to where it started. This change reduces this reduces the solving time for (certain) 
large matrices. For instance, in tests, solving a matrix of size 394×394 goes from about 2 minutes to about 4 seconds.

* Since Python 3 started cracking down on unnatural comparisons, the DISALLOWED constant added in Pull Request 19 no longer works. (It raises a TypeError for unorderable types, as is expected in 
Python 3.) Since this constant is meant to act like infinity, this modification just changes the two lines where it would otherwise try to make an illegal (in Python 3) comparison between a number 
and DISALLOWED_OBJ() and gets it to behave as if DISALLOWED is always larger.
Added Travis CI integration.

Added some unit tests. See tests and tests/README.md.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-munkres/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/math/py-munkres/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/py-munkres/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-munkres/Makefile
diff -u pkgsrc/math/py-munkres/Makefile:1.4 pkgsrc/math/py-munkres/Makefile:1.5
--- pkgsrc/math/py-munkres/Makefile:1.4 Wed Jun  8 17:43:35 2016
+++ pkgsrc/math/py-munkres/Makefile     Sun Jul 23 18:39:51 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2017/07/23 18:39:51 adam Exp $
 
-DISTNAME=      munkres-1.0.6
+DISTNAME=      munkres-1.0.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/munkres/}
@@ -8,11 +8,11 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=m/munk
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://pypi.python.org/pypi/munkres/
 COMMENT=       Munkres algorithm for the Assignment Problem
-LICENSE=       modified-bsd
+LICENSE=       apache-2.0
 
 USE_LANGUAGES= # none
 REPLACE_PYTHON=        munkres.py
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-munkres/PLIST
diff -u pkgsrc/math/py-munkres/PLIST:1.1.1.1 pkgsrc/math/py-munkres/PLIST:1.2
--- pkgsrc/math/py-munkres/PLIST:1.1.1.1        Wed May 30 11:05:30 2012
+++ pkgsrc/math/py-munkres/PLIST        Sun Jul 23 18:39:51 2017
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/05/30 11:05:30 wiz Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.2 2017/07/23 18:39:51 adam Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/munkres.py
 ${PYSITELIB}/munkres.pyc
 ${PYSITELIB}/munkres.pyo

Index: pkgsrc/math/py-munkres/distinfo
diff -u pkgsrc/math/py-munkres/distinfo:1.3 pkgsrc/math/py-munkres/distinfo:1.4
--- pkgsrc/math/py-munkres/distinfo:1.3 Tue Nov  3 23:33:42 2015
+++ pkgsrc/math/py-munkres/distinfo     Sun Jul 23 18:39:51 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 23:33:42 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/07/23 18:39:51 adam Exp $
 
-SHA1 (munkres-1.0.6.tar.gz) = f5115fe4df109d8ef04e51e1c3799caded84d66d
-RMD160 (munkres-1.0.6.tar.gz) = 21db2ea164f20a829b8c6b3faf691cfb8ec5e625
-SHA512 (munkres-1.0.6.tar.gz) = 0c8b8fb0f41e8d23f09b0ff35900f6161de5efa972be2c77b6e4b5bf9951cbc498ac251aef587b5a2c4254bf8aa68ccda40af179b83ca5e2d4abca3fa4b303b4
-Size (munkres-1.0.6.tar.gz) = 9841 bytes
+SHA1 (munkres-1.0.11.tar.gz) = b32cd39ec9e2eefb4db52c1ff4b2ac0f5df0b2c0
+RMD160 (munkres-1.0.11.tar.gz) = d79235c896c26ea7a99c6fdc644935969ca73e8f
+SHA512 (munkres-1.0.11.tar.gz) = cf9f009483efb82dd34fdd9b4996fc6323802b38e532b24d6c6f241a68f5732689894027a3d4d3cb2207f0a786463702e01864b4f899f5d207beca3e892eab67
+Size (munkres-1.0.11.tar.gz) = 11322 bytes