mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-04 06:15:24 +00:00
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)
This commit is contained in:
Kubilay Kocak
parent
457ee16508
commit
55fa5fd218
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=409234
@ -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 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 <bsd.port.mk>
|
||||
|
||||
@ -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
|
||||
|
||||
106
textproc/py-markdown/files/patch-issue453
Normal file
106
textproc/py-markdown/files/patch-issue453
Normal file
@ -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(
|
||||
10
textproc/py-markdown/files/patch-setup.py
Normal file
10
textproc/py-markdown/files/patch-setup.py
Normal file
@ -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',
|
||||
)
|
||||
@ -10,4 +10,4 @@ Features:
|
||||
* "Safe Modes"
|
||||
* Command Line Interface
|
||||
|
||||
WWW: http://packages.python.org/Markdown
|
||||
WWW: https://pythonhosted.org/Markdown/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user