Hello community,
here is the log from the commit of package python-Markdown for openSUSE:Factory
checked in at 2019-05-22 10:53:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Markdown (Old)
and /work/SRC/openSUSE:Factory/.python-Markdown.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Markdown"
Wed May 22 10:53:20 2019 rev:31 rq:704552 version:3.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Markdown/python-Markdown.changes
2019-03-29 20:38:12.110663911 +0100
+++
/work/SRC/openSUSE:Factory/.python-Markdown.new.5148/python-Markdown.changes
2019-05-22 10:53:21.751234850 +0200
@@ -1,0 +2,9 @@
+Tue May 21 16:55:19 UTC 2019 - BenoƮt Monin <[email protected]>
+
+- update to version 3.1.1: bugfix 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).
+
+-------------------------------------------------------------------
Old:
----
Markdown-3.1.tar.gz
New:
----
Markdown-3.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Markdown.spec ++++++
--- /var/tmp/diff_new_pack.6BmIDh/_old 2019-05-22 10:53:23.123233593 +0200
+++ /var/tmp/diff_new_pack.6BmIDh/_new 2019-05-22 10:53:23.155233564 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-Markdown
-Version: 3.1
+Version: 3.1.1
Release: 0
Summary: Python implementation of Markdown
License: BSD-3-Clause
++++++ Markdown-3.1.tar.gz -> Markdown-3.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/Markdown.egg-info/PKG-INFO
new/Markdown-3.1.1/Markdown.egg-info/PKG-INFO
--- old/Markdown-3.1/Markdown.egg-info/PKG-INFO 2019-03-26 01:20:03.000000000
+0100
+++ new/Markdown-3.1.1/Markdown.egg-info/PKG-INFO 2019-05-21
03:10:22.000000000 +0200
@@ -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 @@
Maintainer: Waylan Limberg
Maintainer-email: [email protected]
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/Markdown.egg-info/SOURCES.txt
new/Markdown-3.1.1/Markdown.egg-info/SOURCES.txt
--- old/Markdown-3.1/Markdown.egg-info/SOURCES.txt 2019-03-26
01:20:03.000000000 +0100
+++ new/Markdown-3.1.1/Markdown.egg-info/SOURCES.txt 2019-05-21
03:10:22.000000000 +0200
@@ -54,6 +54,7 @@
docs/extensions/wikilinks.md
markdown/__init__.py
markdown/__main__.py
+markdown/__meta__.py
markdown/blockparser.py
markdown/blockprocessors.py
markdown/core.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/PKG-INFO new/Markdown-3.1.1/PKG-INFO
--- old/Markdown-3.1/PKG-INFO 2019-03-26 01:20:03.000000000 +0100
+++ new/Markdown-3.1.1/PKG-INFO 2019-05-21 03:10:23.000000000 +0200
@@ -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 @@
Maintainer: Waylan Limberg
Maintainer-email: [email protected]
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/docs/change_log/index.md
new/Markdown-3.1.1/docs/change_log/index.md
--- old/Markdown-3.1/docs/change_log/index.md 2019-03-26 01:18:17.000000000
+0100
+++ new/Markdown-3.1.1/docs/change_log/index.md 2019-05-21 02:59:14.000000000
+0200
@@ -3,6 +3,13 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/makefile new/Markdown-3.1.1/makefile
--- old/Markdown-3.1/makefile 2018-01-09 02:43:31.000000000 +0100
+++ new/Markdown-3.1.1/makefile 2019-05-21 02:47:45.000000000 +0200
@@ -19,12 +19,15 @@
.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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/markdown/__init__.py
new/Markdown-3.1.1/markdown/__init__.py
--- old/Markdown-3.1/markdown/__init__.py 2019-03-26 01:18:17.000000000
+0100
+++ new/Markdown-3.1.1/markdown/__init__.py 2019-05-21 02:11:03.000000000
+0200
@@ -25,7 +25,7 @@
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 @@
__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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/markdown/__meta__.py
new/Markdown-3.1.1/markdown/__meta__.py
--- old/Markdown-3.1/markdown/__meta__.py 1970-01-01 01:00:00.000000000
+0100
+++ new/Markdown-3.1.1/markdown/__meta__.py 2019-05-21 02:59:14.000000000
+0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/setup.py new/Markdown-3.1.1/setup.py
--- old/Markdown-3.1/setup.py 2019-03-08 00:39:25.000000000 +0100
+++ new/Markdown-3.1.1/setup.py 2019-05-21 02:11:03.000000000 +0200
@@ -22,10 +22,29 @@
"""
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Markdown-3.1/tox.ini new/Markdown-3.1.1/tox.ini
--- old/Markdown-3.1/tox.ini 2019-03-08 00:39:25.000000000 +0100
+++ new/Markdown-3.1.1/tox.ini 2019-05-21 02:11:03.000000000 +0200
@@ -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 @@
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