Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Feb 2016 12:17:50 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
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
Message-ID:  <201602201217.u1KCHol2002681@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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 <waylan.limberg@icloud.com>
+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),
+-                '<div class="codehilite">'
+-                '<pre><span class="c"># A Code Comment</span>\n'
+-                '</pre></div>'
+-            )
++            self.assertTrue(md.convert(text).startswith('<div class="codehilite"><pre><span'))
+         else:
+             self.assertEqual(
+                 md.convert(text),
+@@ -187,12 +182,7 @@ def testLinenumsNoneWithColon(self):
+             extensions=[markdown.extensions.codehilite.CodeHiliteExtension(linenums=None)]
+         )
+         if self.has_pygments:
+-            self.assertEqual(
+-                md.convert(text),
+-                '<div class="codehilite">'
+-                '<pre><span class="c"># A Code Comment</span>\n'
+-                '</pre></div>'
+-            )
++            self.assertTrue(md.convert(text).startswith('<div class="codehilite"><pre><span'))
+         else:
+             self.assertEqual(
+                 md.convert(text),
+@@ -202,19 +192,16 @@ def testLinenumsNoneWithColon(self):
+ 
+     def testHighlightLinesWithColon(self):
+         # Test with hl_lines delimited by single or double quotes.
+-        text0 = '\t:::Python hl_lines="2"\n\t#line 1\n\t#line 2\n\t#line 3'
+-        text1 = "\t:::Python hl_lines='2'\n\t#line 1\n\t#line 2\n\t#line 3"
++        text0 = '\t:::Python hl_lines="1"\n\t#line 1\n\t#line 2\n\t#line 3'
++        text1 = "\t:::Python hl_lines='1'\n\t#line 1\n\t#line 2\n\t#line 3"
+ 
+         for text in (text0, text1):
+             md = markdown.Markdown(extensions=['markdown.extensions.codehilite'])
+             if self.has_pygments:
+-                self.assertEqual(
+-                    md.convert(text),
+-                    '<div class="codehilite"><pre>'
+-                    '<span class="c">#line 1</span>\n'
+-                    '<span class="hll"><span class="c">#line 2</span>\n</span>'
+-                    '<span class="c">#line 3</span>\n'
+-                    '</pre></div>'
++                self.assertTrue(
++                    md.convert(text).startswith(
++                        '<div class="codehilite"><pre><span class="hll"'
++                    )
+                 )
+             else:
+                 self.assertEqual(
+@@ -333,13 +320,8 @@ def testFencedCodeWithHighlightLines(self):
+         )
+ 
+         if self.has_pygments:
+-            self.assertEqual(
+-                md.convert(text),
+-                '<div class="codehilite"><pre>'
+-                '<span class="hll">line 1\n</span>'
+-                'line 2\n'
+-                '<span class="hll">line 3\n</span>'
+-                '</pre></div>'
++            self.assertTrue(
++                md.convert(text).startswith('<div class="codehilite"><pre><span class="hll"')
+             )
+         else:
+             self.assertEqual(
+@@ -372,13 +354,8 @@ def testFencedLanguageAndHighlightLines(self):
+                 ]
+             )
+             if self.has_pygments:
+-                self.assertEqual(
+-                    md.convert(text),
+-                    '<div class="codehilite"><pre>'
+-                    '<span class="hll"><span class="c">#line 1</span>\n</span>'
+-                    '<span class="c">#line 2</span>\n'
+-                    '<span class="hll"><span class="c">#line 3</span>\n</span>'
+-                    '</pre></div>'
++                self.assertTrue(
++                    md.convert(text).startswith('<div class="codehilite"><pre><span class="hll"')
+                 )
+             else:
+                 self.assertEqual(

Added: head/textproc/py-markdown/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/py-markdown/files/patch-setup.py	Sat Feb 20 12:17:50 2016	(r409234)
@@ -0,0 +1,10 @@
+--- setup.py.orig	2016-02-20 06:59:25 UTC
++++ setup.py
+@@ -268,5 +268,6 @@ setup(
+         'Topic :: Software Development :: Libraries :: Python Modules',
+         'Topic :: Text Processing :: Filters',
+         'Topic :: Text Processing :: Markup :: HTML'
+-    ]
++    ],
++    test_suite='nose.collector',
+ )

Modified: head/textproc/py-markdown/pkg-descr
==============================================================================
--- head/textproc/py-markdown/pkg-descr	Sat Feb 20 11:58:39 2016	(r409233)
+++ head/textproc/py-markdown/pkg-descr	Sat Feb 20 12:17:50 2016	(r409234)
@@ -10,4 +10,4 @@ Features:
   * "Safe Modes"
   * Command Line Interface
 
-WWW: http://packages.python.org/Markdown
+WWW: https://pythonhosted.org/Markdown/



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