Index: head/textproc/py-markdown/Makefile =================================================================== --- head/textproc/py-markdown/Makefile (revision 409233) +++ head/textproc/py-markdown/Makefile (revision 409234) @@ -1,26 +1,30 @@ # Created by: Graham Todd # $FreeBSD$ PORTNAME= markdown -PORTVERSION= 2.4.1 +PORTVERSION= 2.6.5 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Markdown-${PORTVERSION} MAINTAINER= koobs@FreeBSD.org COMMENT= Python implementation of Markdown 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 Index: head/textproc/py-markdown/distinfo =================================================================== --- head/textproc/py-markdown/distinfo (revision 409233) +++ head/textproc/py-markdown/distinfo (revision 409234) @@ -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 Index: head/textproc/py-markdown/files/patch-issue453 =================================================================== --- head/textproc/py-markdown/files/patch-issue453 (nonexistent) +++ head/textproc/py-markdown/files/patch-issue453 (revision 409234) @@ -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('