python/python-markdown2
SHA256
15
0
Fork 0
forked from pool/python-markdown2
Code Pull Requests Activity

- Update to 2.3.7:

Browse Source 
[pull #282] Add TOC depth option
  [pull #283] Fix to add TOC html to output via CLI
  [pull #284] Do not remove anchors in safe_mode
  [pull #288] fixing cuddled-lists with a single list item
  [pull #292] Fix Wrong rendering of last list element
  [pull #295] link-patterns fix
  [pull #300] Replace a deprecated method
  [pull #301] DeprecationWarning: invalid escape sequence
  [pull #302] Fix "make test" in Python 3
  [pull #303] Fix CVE-2018-5773
  [pull #306] Drop support for legacy Python versions
  [pull #307] Fix syntax highlighting test cases that depend on Pygments output
  [pull #308] Add support for Python 3.7
  [pull #304] Add Wheel package support
  [pull #312] Fix toc_depth initialization regression
  [pull #315] XSS fix
- Drop merged patch:
  * disable-failing-tests.patch
- Add patch from upstream to fix build command:
  * fix-build.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-markdown2?expand=0&rev=7
This commit is contained in:
Tomáš Chvátal
2019-04-05 12:26:31 +00:00
committed by Git OBS Bridge
parent 17f7290e27
commit e38053d528
6 changed files with 57 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

337
disable-failing-tests.patch
View File

@@ -1,337 +0,0 @@
diff --git a/test/tm-cases/fenced_code_blocks_leading_lang_space.html b/test/tm-cases/fenced_code_blocks_leading_lang_space.html
deleted file mode 100644
index 41a2f12..0000000
--- a/test/tm-cases/fenced_code_blocks_leading_lang_space.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="codehilite"><pre><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
- <span class="k">print</span> <span class="s">&quot;hi&quot;</span>
-</code></pre></div>
diff --git a/test/tm-cases/fenced_code_blocks_leading_lang_space.opts b/test/tm-cases/fenced_code_blocks_leading_lang_space.opts
deleted file mode 100644
index ba411ac..0000000
--- a/test/tm-cases/fenced_code_blocks_leading_lang_space.opts
+++ /dev/null
@@ -1 +0,0 @@
-{"extras": ["fenced-code-blocks"]}
diff --git a/test/tm-cases/fenced_code_blocks_leading_lang_space.tags b/test/tm-cases/fenced_code_blocks_leading_lang_space.tags
deleted file mode 100644
index 0c08c85..0000000
--- a/test/tm-cases/fenced_code_blocks_leading_lang_space.tags
+++ /dev/null
@@ -1 +0,0 @@
-extra fenced-code-blocks
diff --git a/test/tm-cases/fenced_code_blocks_leading_lang_space.text b/test/tm-cases/fenced_code_blocks_leading_lang_space.text
deleted file mode 100644
index 705d64d..0000000
--- a/test/tm-cases/fenced_code_blocks_leading_lang_space.text
+++ /dev/null
@@ -1,4 +0,0 @@
-``` python
-if True:
- print "hi"
-```
diff --git a/test/tm-cases/fenced_code_blocks_safe_highlight.html b/test/tm-cases/fenced_code_blocks_safe_highlight.html
deleted file mode 100644
index ea55753..0000000
--- a/test/tm-cases/fenced_code_blocks_safe_highlight.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="codehilite"><pre><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
- <span class="k">print</span> <span class="s">&quot;hi&quot;</span>
-</code></pre></div>
-
-<p>That's using the <em>fenced-code-blocks</em> extra with Python
-syntax coloring, if <code>pygments</code> is installed. See
-<a href="http://github.github.com/github-flavored-markdown/">http://github.github.com/github-flavored-markdown/</a>.</p>
-
-<div class="codehilite"><pre><code><span class="k">def</span> <span class="nf">foo</span>
- <span class="nb">puts</span> <span class="s2">&quot;hi&quot;</span>
-<span class="k">end</span>
-</code></pre></div>
diff --git a/test/tm-cases/fenced_code_blocks_safe_highlight.opts b/test/tm-cases/fenced_code_blocks_safe_highlight.opts
deleted file mode 100644
index ca41f65..0000000
--- a/test/tm-cases/fenced_code_blocks_safe_highlight.opts
+++ /dev/null
@@ -1 +0,0 @@
-{"extras": ["fenced-code-blocks"], "safe_mode": "escape"}
diff --git a/test/tm-cases/fenced_code_blocks_safe_highlight.tags b/test/tm-cases/fenced_code_blocks_safe_highlight.tags
deleted file mode 100644
index 2c03fb5..0000000
--- a/test/tm-cases/fenced_code_blocks_safe_highlight.tags
+++ /dev/null
@@ -1 +0,0 @@
-extra fenced-code-blocks pygments
diff --git a/test/tm-cases/fenced_code_blocks_safe_highlight.text b/test/tm-cases/fenced_code_blocks_safe_highlight.text
deleted file mode 100644
index 5c6181c..0000000
--- a/test/tm-cases/fenced_code_blocks_safe_highlight.text
+++ /dev/null
@@ -1,14 +0,0 @@
-```python
-if True:
- print "hi"
-```
-
-That's using the *fenced-code-blocks* extra with Python
-syntax coloring, if `pygments` is installed. See
-<http://github.github.com/github-flavored-markdown/>.
-
-```ruby
-def foo
- puts "hi"
-end
-```
diff --git a/test/tm-cases/fenced_code_blocks_syntax_highlighting.html b/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
deleted file mode 100644
index ea55753..0000000
--- a/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="codehilite"><pre><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
- <span class="k">print</span> <span class="s">&quot;hi&quot;</span>
-</code></pre></div>
-
-<p>That's using the <em>fenced-code-blocks</em> extra with Python
-syntax coloring, if <code>pygments</code> is installed. See
-<a href="http://github.github.com/github-flavored-markdown/">http://github.github.com/github-flavored-markdown/</a>.</p>
-
-<div class="codehilite"><pre><code><span class="k">def</span> <span class="nf">foo</span>
- <span class="nb">puts</span> <span class="s2">&quot;hi&quot;</span>
-<span class="k">end</span>
-</code></pre></div>
diff --git a/test/tm-cases/fenced_code_blocks_syntax_highlighting.opts b/test/tm-cases/fenced_code_blocks_syntax_highlighting.opts
deleted file mode 100644
index ba411ac..0000000
--- a/test/tm-cases/fenced_code_blocks_syntax_highlighting.opts
+++ /dev/null
@@ -1 +0,0 @@
-{"extras": ["fenced-code-blocks"]}
diff --git a/test/tm-cases/fenced_code_blocks_syntax_highlighting.tags b/test/tm-cases/fenced_code_blocks_syntax_highlighting.tags
deleted file mode 100644
index 2c03fb5..0000000
--- a/test/tm-cases/fenced_code_blocks_syntax_highlighting.tags
+++ /dev/null
@@ -1 +0,0 @@
-extra fenced-code-blocks pygments
diff --git a/test/tm-cases/fenced_code_blocks_syntax_highlighting.text b/test/tm-cases/fenced_code_blocks_syntax_highlighting.text
deleted file mode 100644
index 5c6181c..0000000
--- a/test/tm-cases/fenced_code_blocks_syntax_highlighting.text
+++ /dev/null
@@ -1,14 +0,0 @@
-```python
-if True:
- print "hi"
-```
-
-That's using the *fenced-code-blocks* extra with Python
-syntax coloring, if `pygments` is installed. See
-<http://github.github.com/github-flavored-markdown/>.
-
-```ruby
-def foo
- puts "hi"
-end
-```
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.html b/test/tm-cases/fenced_code_blocks_syntax_indentation.html
deleted file mode 100644
index 1e286d2..0000000
--- a/test/tm-cases/fenced_code_blocks_syntax_indentation.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="codehilite"><pre><code><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span>
- <span class="k">print</span> <span class="s">&quot;foo&quot;</span>
-
- <span class="k">print</span> <span class="s">&quot;bar&quot;</span>
-</code></pre></div>
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.opts b/test/tm-cases/fenced_code_blocks_syntax_indentation.opts
deleted file mode 100644
index ba411ac..0000000
--- a/test/tm-cases/fenced_code_blocks_syntax_indentation.opts
+++ /dev/null
@@ -1 +0,0 @@
-{"extras": ["fenced-code-blocks"]}
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.tags b/test/tm-cases/fenced_code_blocks_syntax_indentation.tags
deleted file mode 100644
index c88bf4e..0000000
--- a/test/tm-cases/fenced_code_blocks_syntax_indentation.tags
+++ /dev/null
@@ -1 +0,0 @@
-extra fenced-code-blocks pygments indentation
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.text b/test/tm-cases/fenced_code_blocks_syntax_indentation.text
deleted file mode 100644
index 63d185e..0000000
--- a/test/tm-cases/fenced_code_blocks_syntax_indentation.text
+++ /dev/null
@@ -1,6 +0,0 @@
-```python
-def foo():
- print "foo"
-
- print "bar"
-```
diff --git a/test/tm-cases/issue3_bad_code_color_hack.html b/test/tm-cases/issue3_bad_code_color_hack.html
deleted file mode 100644
index aae2027..0000000
--- a/test/tm-cases/issue3_bad_code_color_hack.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- -*- coding: utf-8 -*- -->
-
-<h2>заголовок</h2>
-
-<p>Example from <a href="http://code.google.com/p/python-markdown2/issues/detail?id=3#c8">http://code.google.com/p/python-markdown2/issues/detail?id=3#c8</a>.</p>
-
-<p>Some python code:</p>
-
-<div class="codehilite"><pre><code><span class="c"># комментарий</span>
-<span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
- <span class="k">print</span> <span class="s">&quot;hi&quot;</span>
-</code></pre></div>
diff --git a/test/tm-cases/issue3_bad_code_color_hack.opts b/test/tm-cases/issue3_bad_code_color_hack.opts
deleted file mode 100644
index 95dfd41..0000000
--- a/test/tm-cases/issue3_bad_code_color_hack.opts
+++ /dev/null
@@ -1 +0,0 @@
-{"extras": ["code-color"]}
diff --git a/test/tm-cases/issue3_bad_code_color_hack.tags b/test/tm-cases/issue3_bad_code_color_hack.tags
deleted file mode 100644
index c3f18a9..0000000
--- a/test/tm-cases/issue3_bad_code_color_hack.tags
+++ /dev/null
@@ -1 +0,0 @@
-extra code-color unicode pygments issue3
diff --git a/test/tm-cases/issue3_bad_code_color_hack.text b/test/tm-cases/issue3_bad_code_color_hack.text
deleted file mode 100644
index e6163a1..0000000
--- a/test/tm-cases/issue3_bad_code_color_hack.text
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- -*- coding: utf-8 -*- -->
-
-## заголовок
-
-Example from <http://code.google.com/p/python-markdown2/issues/detail?id=3#c8>.
-
-Some python code:
-
- :::python
- # комментарий
- if True:
- print "hi"
\ No newline at end of file
diff --git a/test/tm-cases/syntax_color.html b/test/tm-cases/syntax_color.html
deleted file mode 100644
index 703caed..0000000
--- a/test/tm-cases/syntax_color.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<p>Here is some sample code:</p>
-
-<div class="codehilite"><pre><code><span class="kn">import</span> <span class="nn">sys</span>
-<span class="k">def</span> <span class="nf">main</span><span class="p">(</span><span class="n">argv</span><span class="o">=</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">):</span>
- <span class="n">logging</span><span class="o">.</span><span class="n">basicConfig</span><span class="p">()</span>
- <span class="n">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&#39;hi&#39;</span><span class="p">)</span>
-</code></pre></div>
-
-<p>and:</p>
-
-<div class="codehilite"><pre><code><span class="n">use</span> <span class="s1">&#39;zlib&#39;</span>
-<span class="nb">sub</span> <span class="n">main</span><span class="p">(</span><span class="n">argv</span><span class="p">)</span>
- <span class="nb">puts</span> <span class="s1">&#39;hi&#39;</span>
-<span class="k">end</span>
-</code></pre></div>
diff --git a/test/tm-cases/syntax_color.opts b/test/tm-cases/syntax_color.opts
deleted file mode 100644
index 95dfd41..0000000
--- a/test/tm-cases/syntax_color.opts
+++ /dev/null
@@ -1 +0,0 @@
-{"extras": ["code-color"]}
diff --git a/test/tm-cases/syntax_color.tags b/test/tm-cases/syntax_color.tags
deleted file mode 100644
index b9a5e48..0000000
--- a/test/tm-cases/syntax_color.tags
+++ /dev/null
@@ -1 +0,0 @@
-extra code-color pygments
diff --git a/test/tm-cases/syntax_color.text b/test/tm-cases/syntax_color.text
deleted file mode 100644
index b4b30e5..0000000
--- a/test/tm-cases/syntax_color.text
+++ /dev/null
@@ -1,15 +0,0 @@
-Here is some sample code:
-
- :::python
- import sys
- def main(argv=sys.argv):
- logging.basicConfig()
- log.info('hi')
-
-and:
-
- :::ruby
- use 'zlib'
- sub main(argv)
- puts 'hi'
- end
diff --git a/test/tm-cases/syntax_color_opts.html b/test/tm-cases/syntax_color_opts.html
deleted file mode 100644
index 7a449e0..0000000
--- a/test/tm-cases/syntax_color_opts.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<p>Here is some sample code:</p>
-
-<div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><code><span style="color: #008000; font-weight: bold">import</span> <span style="color: #0000FF; font-weight: bold">sys</span>
-<span style="color: #008000; font-weight: bold">def</span> <span style="color: #0000FF">main</span>(argv<span style="color: #666666">=</span>sys<span style="color: #666666">.</span>argv):
- logging<span style="color: #666666">.</span>basicConfig()
- log<span style="color: #666666">.</span>info(<span style="color: #BA2121">&#39;hi&#39;</span>)
-</code></pre></div>
-
-<p>and:</p>
-
-<div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><code>use <span style="color: #BA2121">&#39;zlib&#39;</span>
-<span style="color: #008000">sub</span> main(argv)
- <span style="color: #008000">puts</span> <span style="color: #BA2121">&#39;hi&#39;</span>
-<span style="color: #008000; font-weight: bold">end</span>
-</code></pre></div>
diff --git a/test/tm-cases/syntax_color_opts.opts b/test/tm-cases/syntax_color_opts.opts
deleted file mode 100644
index 3c40043..0000000
--- a/test/tm-cases/syntax_color_opts.opts
+++ /dev/null
@@ -1 +0,0 @@
-{"extras": {"code-color": {"noclasses": True}}}
diff --git a/test/tm-cases/syntax_color_opts.tags b/test/tm-cases/syntax_color_opts.tags
deleted file mode 100644
index b9a5e48..0000000
--- a/test/tm-cases/syntax_color_opts.tags
+++ /dev/null
@@ -1 +0,0 @@
-extra code-color pygments
diff --git a/test/tm-cases/syntax_color_opts.text b/test/tm-cases/syntax_color_opts.text
deleted file mode 100644
index b4b30e5..0000000
--- a/test/tm-cases/syntax_color_opts.text
+++ /dev/null
@@ -1,15 +0,0 @@
-Here is some sample code:
-
- :::python
- import sys
- def main(argv=sys.argv):
- logging.basicConfig()
- log.info('hi')
-
-and:
-
- :::ruby
- use 'zlib'
- sub main(argv)
- puts 'hi'
- end

21
fix-build.patch Normal file
View File

@@ -0,0 +1,21 @@
From 7f8a48b504fc20fa5bc5016f9bc96f5cc06cf891 Mon Sep 17 00:00:00 2001
From: Nicholas Serra <nickserra@gmail.com>
Date: Tue, 5 Mar 2019 14:45:01 -0500
Subject: [PATCH] Remove build alias fixes #323
---
setup.cfg | 3 ---
tools/cutarelease.py | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
Index: markdown2-2.3.7/setup.cfg
===================================================================
--- markdown2-2.3.7.orig/setup.cfg
+++ markdown2-2.3.7/setup.cfg
@@ -1,6 +1,3 @@
-[aliases]
-build = sdist bdist_wheel
-
[wheel]
universal = 1

3
markdown2-2.3.5.zip
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8bb9a24eb2aa02f1427aabe46483f0f0215ab18c8a345315ae8e2ee3c3a09c03
size 161923

3
markdown2-2.3.7.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e65d653173f754f616e0a9ccd4496e38e0fe7def285dd8b495a035b75974aa98
size 85941

25
python-markdown2.changes
View File

@@ -1,3 +1,28 @@
-------------------------------------------------------------------
Fri Apr 5 12:17:28 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 2.3.7:
[pull #282] Add TOC depth option
[pull #283] Fix to add TOC html to output via CLI
[pull #284] Do not remove anchors in safe_mode
[pull #288] fixing cuddled-lists with a single list item
[pull #292] Fix Wrong rendering of last list element
[pull #295] link-patterns fix
[pull #300] Replace a deprecated method
[pull #301] DeprecationWarning: invalid escape sequence
[pull #302] Fix "make test" in Python 3
[pull #303] Fix CVE-2018-5773
[pull #306] Drop support for legacy Python versions
[pull #307] Fix syntax highlighting test cases that depend on Pygments output
[pull #308] Add support for Python 3.7
[pull #304] Add Wheel package support
[pull #312] Fix toc_depth initialization regression
[pull #315] XSS fix
- Drop merged patch:
* disable-failing-tests.patch
- Add patch from upstream to fix build command:
* fix-build.patch
-------------------------------------------------------------------
Sun Jul 29 12:03:40 UTC 2018 - jengelh@inai.de

21
python-markdown2.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-markdown2
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,23 +12,21 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test
Name: python-markdown2
Version: 2.3.5
Version: 2.3.7
Release: 0
Summary: A Python implementation of Markdown
License: MIT
Group: Development/Languages/Python
URL: https://pypi.python.org/pypi/markdown2
Source: https://files.pythonhosted.org/packages/source/m/markdown2/markdown2-%{version}.zip
# PATCH-FIX-UPSTREAM disable-failing-tests.patch https://github.com/trentm/python-markdown2/issues/281
Patch0: disable-failing-tests.patch
BuildRequires: %{python_module base}
URL: https://github.com/trentm/python-markdown2
Source: https://files.pythonhosted.org/packages/source/m/markdown2/markdown2-%{version}.tar.gz
Patch0: fix-build.patch
BuildRequires: %{python_module pygments}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -49,7 +47,6 @@ header-ids.
%prep
%setup -q -n markdown2-%{version}
%patch0 -p1
sed -i -e '/^#!\//, 1d' lib/markdown2.py
%build
%python_build
@@ -57,13 +54,11 @@ sed -i -e '/^#!\//, 1d' lib/markdown2.py
%install
%python_install
%python_clone -a %{buildroot}%{_bindir}/markdown2
%python_expand %fdupes %{buildroot}%{$python_bin_suffix}
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
pushd test
%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
%python_exec test.py -- -knownfailure
}
%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python test.py -- -knownfailure
popd
%post