From owner-svn-ports-head@freebsd.org Sat Feb 20 12:17:52 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B720AAD3A8; Sat, 20 Feb 2016 12:17:52 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D3EA18C2; Sat, 20 Feb 2016 12:17:52 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1KCHp8q002686; Sat, 20 Feb 2016 12:17:51 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1KCHol2002681; Sat, 20 Feb 2016 12:17:50 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201602201217.u1KCHol2002681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sat, 20 Feb 2016 12:17:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409234 - in head/textproc/py-markdown: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Feb 2016 12:17:52 -0000 Author: koobs Date: Sat Feb 20 12:17:50 2016 New Revision: 409234 URL: https://svnweb.freebsd.org/changeset/ports/409234 Log: textproc/py-markdown: Update to 2.6.5 - Update PORTVERSION and distinfo checksum (2.6.5) - Update test dependencies and test target - Remove dos2unix, no longer needed - Enable architecture independence (NO_ARCH) - Backport upstream issue 453 [1] fix for failing tests due to pygments - Patch setup.py to support setuptools test command - Update pkg-descr WWW: URL (matching that in setup.py) [1] https://github.com/waylan/Python-Markdown/issues/453 Requested by: brnrd (via IRC) Added: head/textproc/py-markdown/files/ head/textproc/py-markdown/files/patch-issue453 (contents, props changed) head/textproc/py-markdown/files/patch-setup.py (contents, props changed) Modified: head/textproc/py-markdown/Makefile head/textproc/py-markdown/distinfo head/textproc/py-markdown/pkg-descr Modified: head/textproc/py-markdown/Makefile ============================================================================== --- head/textproc/py-markdown/Makefile Sat Feb 20 11:58:39 2016 (r409233) +++ head/textproc/py-markdown/Makefile Sat Feb 20 12:17:50 2016 (r409234) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= markdown -PORTVERSION= 2.4.1 +PORTVERSION= 2.6.5 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,13 +14,17 @@ COMMENT= Python implementation of Markdo LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -TEST_DEPENDS= nosetests:${PORTSDIR}/devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}pytidylib:${PORTSDIR}/textproc/py-pytidylib +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ + ${PYTHON_PKGNAMEPREFIX}pytidylib>0:${PORTSDIR}/textproc/py-pytidylib \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml -USES= dos2unix python +USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && nosetests +NO_ARCH= yes + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Modified: head/textproc/py-markdown/distinfo ============================================================================== --- head/textproc/py-markdown/distinfo Sat Feb 20 11:58:39 2016 (r409233) +++ head/textproc/py-markdown/distinfo Sat Feb 20 12:17:50 2016 (r409234) @@ -1,2 +1,2 @@ -SHA256 (Markdown-2.4.1.tar.gz) = 812ec5249f45edc31330b7fb06e52aaf6ab2d83aa27047df7cb6837ef2d269b6 -SIZE (Markdown-2.4.1.tar.gz) = 279760 +SHA256 (Markdown-2.6.5.tar.gz) = 8d94cf6273606f76753fcb1324623792b3738c7612c2b180c85cc5e88642e560 +SIZE (Markdown-2.6.5.tar.gz) = 301781 Added: head/textproc/py-markdown/files/patch-issue453 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-markdown/files/patch-issue453 Sat Feb 20 12:17:50 2016 (r409234) @@ -0,0 +1,106 @@ +From 81b724cfec03634c0bcd88b1bccb5936872d04e2 Mon Sep 17 00:00:00 2001 +From: Waylan Limberg +Date: Thu, 28 Jan 2016 22:09:56 -0500 +Subject: [PATCH] Enabled pygments based tests. + +Added pygments to test-requirements and updated codehiliting tests to +only test partial output as output differs depending on Pygments version. +Fixes #453 + +https://github.com/waylan/Python-Markdown/issues/453 + +--- + test-requirements.txt | 3 ++- + tests/test_extensions.py | 47 ++++++++++++----------------------------------- + 2 files changed, 14 insertions(+), 36 deletions(-) + +diff --git tests/test_extensions.py b/tests/test_extensions.py +index 38f0be3..72ce212 100644 +--- tests/test_extensions.py ++++ tests/test_extensions.py +@@ -134,12 +134,7 @@ def testLinenumsFalse(self): + md = markdown.Markdown( + extensions=[markdown.extensions.codehilite.CodeHiliteExtension(linenums=False)]) + if self.has_pygments: +- self.assertEqual( +- md.convert(text), +- '
' +- '
# A Code Comment\n'
+-                '
' +- ) ++ self.assertTrue(md.convert(text).startswith('
'
+-                '
# A Code Comment\n'
+-                '
' +- ) ++ self.assertTrue(md.convert(text).startswith('
'
+-                    '#line 1\n'
+-                    '#line 2\n'
+-                    '#line 3\n'
+-                    '
' ++ self.assertTrue( ++ md.convert(text).startswith( ++ '
'
+-                'line 1\n'
+-                'line 2\n'
+-                'line 3\n'
+-                '
' ++ self.assertTrue( ++ md.convert(text).startswith('
'
+-                    '#line 1\n'
+-                    '#line 2\n'
+-                    '#line 3\n'
+-                    '
' ++ self.assertTrue( ++ md.convert(text).startswith('