Imported Upstream version 3.1.1

Change-Id: I40f12d844cffc9490ab54dc66d5e7d5bbf5bfcb5
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/Markdown.egg-info/PKG-INFO b/Markdown.egg-info/PKG-INFO
index 068b9468631deaa09e268ffe78ff06572808d732..1ea3beeb61f29f930198fb933d14df2a5b761b64 100644 (file)
--- a/Markdown.egg-info/PKG-INFO
+++ b/Markdown.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Markdown
-Version: 3.1
+Version: 3.1.1
 Summary: Python implementation of Markdown.
 Home-page: https://Python-Markdown.github.io/
 Author: Manfred Stienstra, Yuri takhteyev and Waylan limberg
@@ -8,7 +8,7 @@ Author-email: waylan.limberg@icloud.com
 Maintainer: Waylan Limberg
 Maintainer-email: waylan.limberg@icloud.com
 License: BSD License
-Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-3.1-py2.py3-none-any.whl
+Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-3.1.1-py2.py3-none-any.whl
 Description: 
         This is a Python implementation of John Gruber's Markdown_.
         It is almost completely compliant with the reference implementation,

diff --git a/Markdown.egg-info/SOURCES.txt b/Markdown.egg-info/SOURCES.txt
index 95a37d31cbf4bc325c37279eb1867346b327a96e..1e3db0f68b793d3a3b41a8bc7f8931b31c7543e0 100644 (file)
--- a/Markdown.egg-info/SOURCES.txt
+++ b/Markdown.egg-info/SOURCES.txt
@@ -54,6 +54,7 @@ docs/extensions/toc.md
 docs/extensions/wikilinks.md
 markdown/__init__.py
 markdown/__main__.py
+markdown/__meta__.py
 markdown/blockparser.py
 markdown/blockprocessors.py
 markdown/core.py

diff --git a/PKG-INFO b/PKG-INFO
index 068b9468631deaa09e268ffe78ff06572808d732..1ea3beeb61f29f930198fb933d14df2a5b761b64 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Markdown
-Version: 3.1
+Version: 3.1.1
 Summary: Python implementation of Markdown.
 Home-page: https://Python-Markdown.github.io/
 Author: Manfred Stienstra, Yuri takhteyev and Waylan limberg
@@ -8,7 +8,7 @@ Author-email: waylan.limberg@icloud.com
 Maintainer: Waylan Limberg
 Maintainer-email: waylan.limberg@icloud.com
 License: BSD License
-Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-3.1-py2.py3-none-any.whl
+Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-3.1.1-py2.py3-none-any.whl
 Description: 
         This is a Python implementation of John Gruber's Markdown_.
         It is almost completely compliant with the reference implementation,

diff --git a/docs/change_log/index.md b/docs/change_log/index.md
index 22dc4391b53b099cd0acd25d5686343f621104f4..7d0a6274eb178810bfa69f3fc753c7e63e4782b6 100644 (file)
--- a/docs/change_log/index.md
+++ b/docs/change_log/index.md
@@ -3,6 +3,13 @@ title: Change Log
 Python-Markdown Change Log
 =========================
 
+May 20, 2019: Released version 3.1.1 (a bug-fix release).
+
+* Fixed import failure in `setup.py` when the source directory is not
+  on `sys.path` (#823).
+* Prefer public `packaging` module to pkg_resources' private copy of
+  it (#825).
+
 Mar 25, 2019: Released version 3.1 ([Notes](release-3.1.md)).
 
 Sept 28, 2018: Released version 3.0.1 (a bug-fix release).

diff --git a/makefile b/makefile
index 3eb7d483399a658f11ddd804cbf62f89294083c9..2fbe695c027885d411090935ea4bfda4ccb06343 100644 (file)
--- a/makefile
+++ b/makefile
@@ -19,12 +19,15 @@ install:
 
 .PHONY : deploy
 deploy:
+       rm -rf build
        rm -rf dist
        python setup.py bdist_wheel sdist --formats gztar
        twine upload dist/*
 
 .PHONY : build
 build:
+       rm -rf build
+       rm -rf dist
        python setup.py bdist_wheel sdist --formats gztar
 
 .PHONY : build-win

diff --git a/markdown/__init__.py b/markdown/__init__.py
index 4d958067fcb2f2872c7670cbed7f15d1f88dddf4..dd128f07ec19bd8a4a2185dd02d2120205df4fbd 100644 (file)
--- a/markdown/__init__.py
+++ b/markdown/__init__.py
@@ -25,7 +25,7 @@ from __future__ import unicode_literals
 from .core import Markdown, markdown, markdownFromFile
 from .util import PY37
 from .pep562 import Pep562
-from pkg_resources.extern import packaging
+from .__meta__ import __version__, __version_info__
 import warnings
 
 # For backward compatibility as some extensions expect it...
@@ -33,39 +33,6 @@ from .extensions import Extension  # noqa
 
 __all__ = ['Markdown', 'markdown', 'markdownFromFile']
 
-# version must conform to PEP 440
-# https://www.python.org/dev/peps/pep-0440/
-
-# __version_info__ format:
-# (major, minor, patch, dev/alpha/beta/rc/final, #)
-# (1, 1, 2, 'dev', 0) => "1.1.2.dev0"
-# (1, 1, 2, 'alpha', 1) => "1.1.2a1"
-# (1, 2, 0, 'beta', 2) => "1.2b2"
-# (1, 2, 0, 'rc', 4) => "1.2rc4"
-# (1, 2, 0, 'final', 0) => "1.2"
-__version_info__ = (3, 1, 0, 'final', 0)
-
-
-def _get_version():  # pragma: no cover
-    " Returns a PEP 440-compliant version number from version_info. "
-    assert len(__version_info__) == 5
-    assert __version_info__[3] in ('dev', 'alpha', 'beta', 'rc', 'final')
-
-    parts = 2 if __version_info__[2] == 0 else 3
-    v = '.'.join(map(str, __version_info__[:parts]))
-
-    if __version_info__[3] == 'dev':
-        v += '.dev' + str(__version_info__[4])
-    elif __version_info__[3] != 'final':
-        mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'rc'}
-        v += mapping[__version_info__[3]] + str(__version_info__[4])
-
-    # Ensure version is valid and normalized
-    return str(packaging.version.Version(v))
-
-
-__version__ = _get_version()
-
 __deprecated__ = {
     "version": ("__version__", __version__),
     "version_info": ("__version_info__", __version_info__)

diff --git a/markdown/__meta__.py b/markdown/__meta__.py
new file mode 100644 (file)
index 0000000..1b7d60a
--- /dev/null
+++ b/markdown/__meta__.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+"""
+Python Markdown
+
+A Python implementation of John Gruber's Markdown.
+
+Documentation: https://python-markdown.github.io/
+GitHub: https://github.com/Python-Markdown/markdown/
+PyPI: https://pypi.org/project/Markdown/
+
+Started by Manfred Stienstra (http://www.dwerg.net/).
+Maintained for a few years by Yuri Takhteyev (http://www.freewisdom.org).
+Currently maintained by Waylan Limberg (https://github.com/waylan),
+Dmitry Shachnev (https://github.com/mitya57) and Isaac Muse (https://github.com/facelessuser).
+
+Copyright 2007-2018 The Python Markdown Project (v. 1.7 and later)
+Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
+Copyright 2004 Manfred Stienstra (the original version)
+
+License: BSD (see LICENSE.md for details).
+"""
+
+try:
+    import packaging.version
+except ImportError:
+    from pkg_resources.extern import packaging
+
+# __version_info__ format:
+# (major, minor, patch, dev/alpha/beta/rc/final, #)
+# (1, 1, 2, 'dev', 0) => "1.1.2.dev0"
+# (1, 1, 2, 'alpha', 1) => "1.1.2a1"
+# (1, 2, 0, 'beta', 2) => "1.2b2"
+# (1, 2, 0, 'rc', 4) => "1.2rc4"
+# (1, 2, 0, 'final', 0) => "1.2"
+__version_info__ = (3, 1, 1, 'final', 0)
+
+
+def _get_version():  # pragma: no cover
+    " Returns a PEP 440-compliant version number from version_info. "
+    assert len(__version_info__) == 5
+    assert __version_info__[3] in ('dev', 'alpha', 'beta', 'rc', 'final')
+
+    parts = 2 if __version_info__[2] == 0 else 3
+    v = '.'.join(map(str, __version_info__[:parts]))
+
+    if __version_info__[3] == 'dev':
+        v += '.dev' + str(__version_info__[4])
+    elif __version_info__[3] != 'final':
+        mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'rc'}
+        v += mapping[__version_info__[3]] + str(__version_info__[4])
+
+    # Ensure version is valid and normalized
+    return str(packaging.version.Version(v))
+
+
+__version__ = _get_version()

diff --git a/setup.py b/setup.py
index 55107efeb568a80ec4a015aac021d81f8947ee55..2be5810f3af8e661572f998893b91e19ce88f764 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -22,10 +22,29 @@ License: BSD (see LICENSE.md for details).
 """
 
 
+import os
+import sys
 from setuptools import setup
-from markdown import __version__, __version_info__
 
 
+def get_version():
+    """Get version and version_info from markdown/__meta__.py file."""
+    module_path = os.path.join(os.path.dirname('__file__'), 'markdown', '__meta__.py')
+
+    if sys.version_info[0] == 2:
+        import imp
+        meta = imp.load_source('__meta__', module_path)
+        return meta.__version__, meta.__version_info__
+
+    import importlib.util
+    spec = importlib.util.spec_from_file_location('__meta__', module_path)
+    meta = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(meta)
+    return meta.__version__, meta.__version_info__
+
+
+__version__, __version_info__ = get_version()
+
 # Get development Status for classifiers
 dev_status_map = {
     'dev':   '2 - Pre-Alpha',

diff --git a/tox.ini b/tox.ini
index e7de513e48aac17bbda731590dfc47f7cc6880ff..016a734ace692fdba4ef729c61e5c34b8a0eec01 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, py37, pypy, pypy3, flake8, checkspelling
+envlist = py27, py35, py36, py37, pypy, pypy3, flake8, checkspelling, pep517check
 requires = setuptools>=36
 isolated_build = True
 
@@ -19,6 +19,10 @@ deps =
     mkdocs_nature
 commands = {toxinidir}/checkspelling.sh
 
+[testenv:pep517check]
+deps = pep517
+commands = python -m pep517.check {toxinidir}
+
 [flake8]
 max-line-length = 119
 exclude=markdown/pep562.py