Hello community, here is the log from the commit of package python3-Markups for openSUSE:Factory checked in at 2015-12-16 17:43:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-Markups (Old) and /work/SRC/openSUSE:Factory/.python3-Markups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-Markups" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-Markups/python3-Markups.changes 2015-06-23 11:57:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-Markups.new/python3-Markups.changes 2015-12-16 17:45:03.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Dec 15 03:30:00 UTC 2015 - [email protected] + +- specfile: + * added requirement for setuptools + +- update to version 1.0.0: + * Web module removed, as ReText no longer needs it. + * Textile markup updated to work with the latest version of Python-Textile + module. + * The setup script now uses setuptools when it is available. + * Testsuite and documentation improvements. + +------------------------------------------------------------------- Old: ---- Markups-0.6.3.tar.gz New: ---- Markups-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-Markups.spec ++++++ --- /var/tmp/diff_new_pack.fwMAdq/_old 2015-12-16 17:45:04.000000000 +0100 +++ /var/tmp/diff_new_pack.fwMAdq/_new 2015-12-16 17:45:04.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-Markups -Version: 0.6.3 +Version: 1.0.0 Release: 0 Summary: A wrapper around various text markups License: BSD-3-Clause @@ -26,6 +26,7 @@ Source: https://pypi.python.org/packages/source/M/Markups/Markups-%{version}.tar.gz BuildRequires: python3-devel BuildRequires: python3-nose +BuildRequires: python3-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ Markups-0.6.3.tar.gz -> Markups-1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/.gitignore new/Markups-1.0.0/.gitignore --- old/Markups-0.6.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/Markups-1.0.0/.gitignore 2015-08-07 20:37:13.000000000 +0200 @@ -0,0 +1,6 @@ +build +dist +MANIFEST +Markups.egg-info +__pycache__ +*.pyc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/.travis.yml new/Markups-1.0.0/.travis.yml --- old/Markups-0.6.3/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/Markups-1.0.0/.travis.yml 2015-12-13 15:07:42.000000000 +0100 @@ -0,0 +1,10 @@ +sudo: false +language: python +python: + - "2.7" + - "3.2" + - "3.3" + - "3.4" + - "3.5" +install: pip install Markdown docutils textile +script: python -m unittest discover -s tests -v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/Markups.egg-info/PKG-INFO new/Markups-1.0.0/Markups.egg-info/PKG-INFO --- old/Markups-0.6.3/Markups.egg-info/PKG-INFO 2015-06-16 20:38:51.000000000 +0200 +++ new/Markups-1.0.0/Markups.egg-info/PKG-INFO 2015-12-13 17:23:25.000000000 +0100 @@ -1,29 +1,51 @@ Metadata-Version: 1.1 Name: Markups -Version: 0.6.3 +Version: 1.0.0 Summary: A wrapper around various text markups -Home-page: https://github.com/mitya57/pymarkups +Home-page: https://github.com/retext-project/pymarkups Author: Dmitry Shachnev Author-email: [email protected] License: BSD -Description: This module provides a wrapper around the various text markup languages, - such as Markdown_ and reStructuredText_ (these two are supported by default). +Description: + .. image:: https://api.travis-ci.org/retext-project/pymarkups.svg + :target: https://travis-ci.org/retext-project/pymarkups + :alt: Travis CI status + + This module provides a wrapper around various text markup languages. + + Available by default are Markdown_, reStructuredText_ and Textile_, but you + can easily add your own markups. Usage example: - >>> markup = markups.get_markup_for_file_name("myfile.rst") - >>> markup.name - 'reStructuredText' - >>> markup.attributes[markups.SYNTAX_DOCUMENTATION] - 'http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html' - >>> text = "Hello, world!\n=============\n\nThis is an example **reStructuredText** document." - >>> markup.get_document_title(text) - 'Hello, world!' - >>> markup.get_document_body(text) - '<p>This is an example <strong>reStructuredText</strong> document.</p>\n' + .. code:: python + + >>> import markups + >>> markup = markups.get_markup_for_file_name("myfile.rst") + >>> markup.name + 'reStructuredText' + >>> markup.attributes[markups.common.SYNTAX_DOCUMENTATION] + 'http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html' + >>> text = """ + ... Hello, world! + ... ============= + ... + ... This is an example **reStructuredText** document. + ... """ + >>> markup.get_document_title(text) + 'Hello, world!' + >>> markup.get_document_body(text) + '<p>This is an example <strong>reStructuredText</strong> document.</p>\n' .. _Markdown: http://daringfireball.net/projects/markdown/ .. _reStructuredText: http://docutils.sourceforge.net/rst.html + .. _Textile: https://en.wikipedia.org/wiki/Textile_(markup_language) + + The release version can be downloaded from PyPI_. The source code is hosted on + GitHub_. + + .. _PyPI: http://pypi.python.org/pypi/Markups + .. _GitHub: https://github.com/retext-project/pymarkups Platform: UNKNOWN Classifier: Development Status :: 4 - Beta @@ -31,14 +53,12 @@ Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.0 -Classifier: Programming Language :: Python :: 3.1 Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 Classifier: Topic :: Text Processing :: Markup Classifier: Topic :: Text Processing :: General Classifier: Topic :: Software Development :: Libraries :: Python Modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/Markups.egg-info/SOURCES.txt new/Markups-1.0.0/Markups.egg-info/SOURCES.txt --- old/Markups-0.6.3/Markups.egg-info/SOURCES.txt 2015-06-16 20:38:51.000000000 +0200 +++ new/Markups-1.0.0/Markups.egg-info/SOURCES.txt 2015-12-13 17:23:25.000000000 +0100 @@ -1,3 +1,5 @@ +.gitignore +.travis.yml LICENSE MANIFEST.in README.rst @@ -14,7 +16,6 @@ docs/interface.rst docs/overview.rst docs/standard_markups.rst -examples/example-template.html markups/__init__.py markups/abstract.py markups/common.py @@ -22,13 +23,8 @@ markups/mdx_mathjax.py markups/restructuredtext.py markups/textile.py -markups/web.py tests/__init__.py tests/test_markdown.py tests/test_public_api.py tests/test_restructuredtext.py -tests/test_textile.py -tests/test_web.py -tests/data/page.html -tests/data/page.rst -tests/data/template.html \ No newline at end of file +tests/test_textile.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/PKG-INFO new/Markups-1.0.0/PKG-INFO --- old/Markups-0.6.3/PKG-INFO 2015-06-16 20:38:51.000000000 +0200 +++ new/Markups-1.0.0/PKG-INFO 2015-12-13 17:23:25.000000000 +0100 @@ -1,29 +1,51 @@ Metadata-Version: 1.1 Name: Markups -Version: 0.6.3 +Version: 1.0.0 Summary: A wrapper around various text markups -Home-page: https://github.com/mitya57/pymarkups +Home-page: https://github.com/retext-project/pymarkups Author: Dmitry Shachnev Author-email: [email protected] License: BSD -Description: This module provides a wrapper around the various text markup languages, - such as Markdown_ and reStructuredText_ (these two are supported by default). +Description: + .. image:: https://api.travis-ci.org/retext-project/pymarkups.svg + :target: https://travis-ci.org/retext-project/pymarkups + :alt: Travis CI status + + This module provides a wrapper around various text markup languages. + + Available by default are Markdown_, reStructuredText_ and Textile_, but you + can easily add your own markups. Usage example: - >>> markup = markups.get_markup_for_file_name("myfile.rst") - >>> markup.name - 'reStructuredText' - >>> markup.attributes[markups.SYNTAX_DOCUMENTATION] - 'http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html' - >>> text = "Hello, world!\n=============\n\nThis is an example **reStructuredText** document." - >>> markup.get_document_title(text) - 'Hello, world!' - >>> markup.get_document_body(text) - '<p>This is an example <strong>reStructuredText</strong> document.</p>\n' + .. code:: python + + >>> import markups + >>> markup = markups.get_markup_for_file_name("myfile.rst") + >>> markup.name + 'reStructuredText' + >>> markup.attributes[markups.common.SYNTAX_DOCUMENTATION] + 'http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html' + >>> text = """ + ... Hello, world! + ... ============= + ... + ... This is an example **reStructuredText** document. + ... """ + >>> markup.get_document_title(text) + 'Hello, world!' + >>> markup.get_document_body(text) + '<p>This is an example <strong>reStructuredText</strong> document.</p>\n' .. _Markdown: http://daringfireball.net/projects/markdown/ .. _reStructuredText: http://docutils.sourceforge.net/rst.html + .. _Textile: https://en.wikipedia.org/wiki/Textile_(markup_language) + + The release version can be downloaded from PyPI_. The source code is hosted on + GitHub_. + + .. _PyPI: http://pypi.python.org/pypi/Markups + .. _GitHub: https://github.com/retext-project/pymarkups Platform: UNKNOWN Classifier: Development Status :: 4 - Beta @@ -31,14 +53,12 @@ Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.0 -Classifier: Programming Language :: Python :: 3.1 Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 Classifier: Topic :: Text Processing :: Markup Classifier: Topic :: Text Processing :: General Classifier: Topic :: Software Development :: Libraries :: Python Modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/README.rst new/Markups-1.0.0/README.rst --- old/Markups-0.6.3/README.rst 2015-06-08 12:01:58.000000000 +0200 +++ new/Markups-1.0.0/README.rst 2015-12-13 17:20:35.000000000 +0100 @@ -1,22 +1,39 @@ -This module provides a wrapper around the various text markup languages, -such as Markdown_ and reStructuredText_ (these two are supported by default). +.. image:: https://api.travis-ci.org/retext-project/pymarkups.svg + :target: https://travis-ci.org/retext-project/pymarkups + :alt: Travis CI status + +This module provides a wrapper around various text markup languages. + +Available by default are Markdown_, reStructuredText_ and Textile_, but you +can easily add your own markups. Usage example: ->>> markup = markups.get_markup_for_file_name("myfile.rst") ->>> markup.name -'reStructuredText' ->>> markup.attributes[markups.common.SYNTAX_DOCUMENTATION] -'http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html' ->>> text = "Hello, world!\n=============\n\nThis is an example **reStructuredText** document." ->>> markup.get_document_title(text) -'Hello, world!' ->>> markup.get_document_body(text) -'<p>This is an example <strong>reStructuredText</strong> document.</p>\n' +.. code:: python + + >>> import markups + >>> markup = markups.get_markup_for_file_name("myfile.rst") + >>> markup.name + 'reStructuredText' + >>> markup.attributes[markups.common.SYNTAX_DOCUMENTATION] + 'http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html' + >>> text = """ + ... Hello, world! + ... ============= + ... + ... This is an example **reStructuredText** document. + ... """ + >>> markup.get_document_title(text) + 'Hello, world!' + >>> markup.get_document_body(text) + '<p>This is an example <strong>reStructuredText</strong> document.</p>\n' .. _Markdown: http://daringfireball.net/projects/markdown/ .. _reStructuredText: http://docutils.sourceforge.net/rst.html +.. _Textile: https://en.wikipedia.org/wiki/Textile_(markup_language) -The release version can be downloaded from PyPI_. +The release version can be downloaded from PyPI_. The source code is hosted on +GitHub_. .. _PyPI: http://pypi.python.org/pypi/Markups +.. _GitHub: https://github.com/retext-project/pymarkups diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/changelog new/Markups-1.0.0/changelog --- old/Markups-0.6.3/changelog 2015-06-16 20:37:45.000000000 +0200 +++ new/Markups-1.0.0/changelog 2015-12-13 17:22:27.000000000 +0100 @@ -1,3 +1,12 @@ +Version 1.0, 2015-12-13 +======================= + +* Web module removed, as ReText no longer needs it. +* Textile markup updated to work with the latest version of Python-Textile + module. +* The setup script now uses setuptools when it is available. +* Testsuite and documentation improvements. + Version 0.6.3, 2015-06-16 ========================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/docs/changelog.rst new/Markups-1.0.0/docs/changelog.rst --- old/Markups-0.6.3/docs/changelog.rst 2014-07-24 18:59:33.000000000 +0200 +++ new/Markups-1.0.0/docs/changelog.rst 2015-09-13 19:55:56.000000000 +0200 @@ -6,6 +6,6 @@ happened in Python-Markups. Please see the `Git log`_ for the full list of changes. -.. _`Git log`: https://github.com/mitya57/pymarkups/commits/master +.. _`Git log`: https://github.com/retext-project/pymarkups/commits/master .. include:: ../changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/docs/conf.py new/Markups-1.0.0/docs/conf.py --- old/Markups-0.6.3/docs/conf.py 2015-01-25 12:10:11.000000000 +0100 +++ new/Markups-1.0.0/docs/conf.py 2015-12-13 17:03:34.000000000 +0100 @@ -1,17 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# -# Python-Markups documentation build configuration file, created by -# sphinx-quickstart on Mon Jul 21 14:51:00 2014. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. import sys import os @@ -23,9 +10,6 @@ # -- General configuration ------------------------------------------------ -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. @@ -39,9 +23,6 @@ # The suffix of source filenames. source_suffix = '.rst' -# The encoding of source files. -#source_encoding = 'utf-8-sig' - # The master toctree document. master_doc = 'index' @@ -59,204 +40,11 @@ # The full version, including alpha/beta/rc tags. release = '%d.%d.%d' % __version_tuple__ -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -#keep_warnings = False - - # -- Options for HTML output ---------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. html_theme = 'nature' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# "<project> v<release> documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -#html_static_path = [] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -#html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a <link> tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'Python-Markupsdoc' - - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - ('index', 'Python-Markups.tex', u'Python-Markups Documentation', - u'Dmitry Shachnev', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output --------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'python-markups', u'Python-Markups Documentation', - [u'Dmitry Shachnev'], 1) -] - -# If true, show URL addresses after external links. -#man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'Python-Markups', u'Python-Markups Documentation', - u'Dmitry Shachnev', 'Python-Markups', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - -# If true, do not generate a @detailmenu in the "Top" node's menu. -#texinfo_no_detailmenu = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/docs/index.rst new/Markups-1.0.0/docs/index.rst --- old/Markups-0.6.3/docs/index.rst 2014-07-25 13:12:34.000000000 +0200 +++ new/Markups-1.0.0/docs/index.rst 2015-09-13 19:56:17.000000000 +0200 @@ -34,6 +34,6 @@ * You can get the source tarball from PyPI_. * It is also packaged in Debian_. -.. _GitHub: https://github.com/mitya57/pymarkups +.. _GitHub: https://github.com/retext-project/pymarkups .. _PyPI: https://pypi.python.org/pypi/Markups .. _Debian: https://packages.debian.org/sid/source/pymarkups diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/docs/standard_markups.rst new/Markups-1.0.0/docs/standard_markups.rst --- old/Markups-0.6.3/docs/standard_markups.rst 2015-05-02 19:13:06.000000000 +0200 +++ new/Markups-1.0.0/docs/standard_markups.rst 2015-12-13 14:34:56.000000000 +0100 @@ -48,7 +48,7 @@ .. _Markdown: http://daringfireball.net/projects/markdown/ .. _Python-Markdown: https://pythonhosted.org/Markdown/ -.. _MathJax: http://www.mathjax.org/ +.. _MathJax: https://www.mathjax.org/ .. _`Python-Markdown extensions`: http://pythonhosted.org/Markdown/extensions/ .. _`Python-Markdown Extra`: http://pythonhosted.org/Markdown/extensions/extra.html @@ -75,7 +75,7 @@ The file extension associated with Textile markup is ``.textile``. -.. _Textile: http://en.wikipedia.org/wiki/Textile_(markup_language) -.. _python-textile: https://github.com/sebix/python-textile +.. _Textile: https://en.wikipedia.org/wiki/Textile_(markup_language) +.. _python-textile: https://github.com/textile/python-textile .. autoclass:: markups.TextileMarkup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/examples/example-template.html new/Markups-1.0.0/examples/example-template.html --- old/Markups-0.6.3/examples/example-template.html 2014-07-21 12:24:09.000000000 +0200 +++ new/Markups-1.0.0/examples/example-template.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -<html> -<head> -<meta http-equiv="content-type" content="text/html; charset=utf-8"> -<meta name="generator" content="%GENERATOR%"> -<title>%PAGENAME%</title> -</head> -<body> -%CONTENT% -<hr> -<p>Generated by %APPINFO% from %MARKUPNAME% source.<br> -Generation time: %TIME%.</p> -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/markups/__init__.py new/Markups-1.0.0/markups/__init__.py --- old/Markups-0.6.3/markups/__init__.py 2015-06-16 20:36:44.000000000 +0200 +++ new/Markups-1.0.0/markups/__init__.py 2015-12-13 17:22:27.000000000 +0100 @@ -10,7 +10,7 @@ from markups.restructuredtext import ReStructuredTextMarkup from markups.textile import TextileMarkup -__version_tuple__ = (0, 6, 3) +__version_tuple__ = (1, 0, 0) __version__ = '.'.join(map(str, __version_tuple__)) builtin_markups = [MarkdownMarkup, ReStructuredTextMarkup, TextileMarkup] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/markups/common.py new/Markups-1.0.0/markups/common.py --- old/Markups-0.6.3/markups/common.py 2015-06-08 12:06:08.000000000 +0200 +++ new/Markups-1.0.0/markups/common.py 2015-09-30 15:55:21.000000000 +0200 @@ -6,7 +6,7 @@ # Some common constants and functions (LANGUAGE_HOME_PAGE, MODULE_HOME_PAGE, SYNTAX_DOCUMENTATION) = range(3) -CONFIGURATION_DIR = (os.environ.get('XDG_CONFIG_HOME') or +CONFIGURATION_DIR = (os.getenv('XDG_CONFIG_HOME') or os.getenv('APPDATA') or os.path.expanduser('~/.config')) MATHJAX_LOCAL_URL = 'file:///usr/share/javascript/mathjax/MathJax.js' MATHJAX_WEB_URL = 'https://cdn.mathjax.org/mathjax/latest/MathJax.js' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/markups/markdown.py new/Markups-1.0.0/markups/markdown.py --- old/Markups-0.6.3/markups/markdown.py 2015-06-08 11:50:53.000000000 +0200 +++ new/Markups-1.0.0/markups/markdown.py 2015-09-01 19:17:49.000000000 +0200 @@ -49,7 +49,7 @@ import markdown except ImportError: return False - return markdown.version_info >= (2, 6) + return hasattr(markdown, 'version_info') and markdown.version_info >= (2, 6) def _load_extensions_list_from_file(self, filename): try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/markups/textile.py new/Markups-1.0.0/markups/textile.py --- old/Markups-0.6.3/markups/textile.py 2015-06-08 12:06:55.000000000 +0200 +++ new/Markups-1.0.0/markups/textile.py 2015-12-13 14:02:42.000000000 +0100 @@ -14,7 +14,7 @@ name = 'Textile' attributes = { common.LANGUAGE_HOME_PAGE: 'http://en.wikipedia.org/wiki/Textile_(markup_language)', - common.MODULE_HOME_PAGE: 'https://github.com/sebix/python-textile', + common.MODULE_HOME_PAGE: 'https://github.com/textile/python-textile', common.SYNTAX_DOCUMENTATION: 'http://movabletype.org/documentation/author/textile-2-syntax.html' } @@ -31,8 +31,8 @@ def __init__(self, filename=None): AbstractMarkup.__init__(self, filename) - from textile import Textile + from textile.core import Textile self.parser = Textile() def get_document_body(self, text): - return self.parser.textile(text) + return self.parser.parse(text) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/markups/web.py new/Markups-1.0.0/markups/web.py --- old/Markups-0.6.3/markups/web.py 2015-06-08 12:04:52.000000000 +0200 +++ new/Markups-1.0.0/markups/web.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -# python-markups, web module -# License: BSD -# Copyright: (C) Dmitry Shachnev, 2012 - -import os -import markups -import sys -import warnings -from email.utils import formatdate - -if sys.version_info[0] < 3: - raise ImportError('Python 3.x is required.') - -warnings.warn('Web module is deprecated and will be removed soon.', - DeprecationWarning) - -__version__ = markups.__version__ -site = 'https://github.com/mitya57/pymarkups' - -APP_NAME, APP_VERSION, APP_SITE = range(3) -default_app_data = ('python-markups', __version__, site) - -class WebUpdateError(IOError): - pass - -class WebLibrary(object): - def __init__(self, working_dir='.', app_data=default_app_data): - """Construct a new WebLibrary object""" - self.working_dir = working_dir - if app_data[APP_SITE]: - self.app_info = '<a href="' + app_data[APP_SITE] + '">' \ - + app_data[APP_NAME] + '</a>' - else: - self.app_info = app_data[APP_NAME] - if app_data[APP_VERSION]: - self.generator_info = app_data[APP_NAME] + ' ' + app_data[APP_VERSION] - else: - self.generator_info = app_data[APP_NAME] - - def update_all(self): - """Process all documents in the directory""" - def is_supported_file(path): - filename = os.path.join(self.working_dir, path) - if not os.path.isfile(filename): - return False - return (markups.get_markup_for_file_name(filename) is not None) - - self._init_template() - for fname in filter(is_supported_file, os.listdir(self.working_dir)): - self._process_page(fname) - - def update(self, filename): - """Process one file in the directory""" - self._init_template() - if os.path.exists(os.path.join(self.working_dir, filename)): - self._process_page(filename) - else: - raise WebUpdateError('File not found.') - - def _init_template(self): - templatefile = open(os.path.join(self.working_dir, 'template.html')) - self.template = templatefile.read() - templatefile.close() - self.template = self.template.replace('%GENERATOR%', self.generator_info) - self.template = self.template.replace('%APPINFO%', self.app_info) - - def _process_page(self, fname): - inputfile = os.path.join(self.working_dir, fname) - markup = markups.get_markup_for_file_name(inputfile) - if not markup: - raise WebUpdateError('No suitable markup found.') - bn, ext = os.path.splitext(fname) - html = pagename = '' - inputfile = open(inputfile, 'r') - text = inputfile.read() - inputfile.close() - markup.enable_cache = True - html = markup.get_document_body(text).rstrip() - pagename = markup.get_document_title(text) - javascript = markup.get_javascript(text, webenv=True) - if not pagename: - pagename = bn - if html or bn == 'index': - content = self.template - content = content.replace('%CONTENT%', html) - content = content.replace('%PAGENAME%', pagename) - content = content.replace('%SOURCEFILENAME%', fname) - content = content.replace('%EXTRAHEADERS%', javascript) - content = content.replace('%HTMLDIR%', '.') - content = content.replace('%MARKUPNAME%', markup.name) - content = content.replace('%TIME%', formatdate(usegmt=True)) - content = content.replace(' href="'+bn+'.html"', '') - content = content.replace('%\\', '%') - htmldir = os.path.join(self.working_dir, 'html') - if not os.path.exists(htmldir): - os.mkdir(htmldir) - outputfile = open(os.path.join(htmldir, bn+'.html'), 'w') - outputfile.write(content) - outputfile.close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/setup.cfg new/Markups-1.0.0/setup.cfg --- old/Markups-0.6.3/setup.cfg 2015-06-16 20:38:52.000000000 +0200 +++ new/Markups-1.0.0/setup.cfg 2015-12-13 17:23:25.000000000 +0100 @@ -1,5 +1,5 @@ [egg_info] -tag_svn_revision = 0 -tag_build = tag_date = 0 +tag_build = +tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/setup.py new/Markups-1.0.0/setup.py --- old/Markups-0.6.3/setup.py 2015-01-25 10:49:11.000000000 +0100 +++ new/Markups-1.0.0/setup.py 2015-12-13 17:16:09.000000000 +0100 @@ -1,53 +1,27 @@ #!/usr/bin/env python3 import sys -from distutils.core import setup, Command -from markups import __version__ as version - -try: - from sphinx.setup_command import BuildDoc -except ImportError: - BuildDoc = None - try: - from setuptools.command.upload_docs import upload_docs + from setuptools import setup, Command except ImportError: - upload_docs = None + from distutils.core import setup, Command +from markups import __version__ as version +from os.path import dirname, join -long_description = \ -"""This module provides a wrapper around the various text markup languages, -such as Markdown_ and reStructuredText_ (these two are supported by default). - -Usage example: - ->>> markup = markups.get_markup_for_file_name("myfile.rst") ->>> markup.name -'reStructuredText' ->>> markup.attributes[markups.SYNTAX_DOCUMENTATION] -'http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html' ->>> text = "Hello, world!\\n=============\\n\\nThis is an example **reStructuredText** document." ->>> markup.get_document_title(text) -'Hello, world!' ->>> markup.get_document_body(text) -'<p>This is an example <strong>reStructuredText</strong> document.</p>\\n' - -.. _Markdown: http://daringfireball.net/projects/markdown/ -.. _reStructuredText: http://docutils.sourceforge.net/rst.html -""" +with open(join(dirname(__file__), 'README.rst')) as readme_file: + long_description = '\n' + readme_file.read() classifiers = ['Development Status :: 4 - Beta', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.0', - 'Programming Language :: Python :: 3.1', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Topic :: Text Processing :: Markup', 'Topic :: Text Processing :: General', 'Topic :: Software Development :: Libraries :: Python Modules' @@ -68,10 +42,6 @@ cmdclass = {} if sys.version_info[0] >= 3: cmdclass['test'] = run_tests -if BuildDoc: - cmdclass['build_sphinx'] = BuildDoc -if upload_docs: - cmdclass['upload_docs'] = upload_docs setup_args = { 'name': 'Markups', @@ -80,7 +50,7 @@ 'long_description': long_description, 'author': 'Dmitry Shachnev', 'author_email': '[email protected]', - 'url': 'https://github.com/mitya57/pymarkups', + 'url': 'https://github.com/retext-project/pymarkups', 'packages': ['markups'], 'license': 'BSD', 'cmdclass': cmdclass, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/tests/data/page.html new/Markups-1.0.0/tests/data/page.html --- old/Markups-0.6.3/tests/data/page.html 2014-07-21 12:24:09.000000000 +0200 +++ new/Markups-1.0.0/tests/data/page.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -<html><head> -<title>Hello, world!</title> -</head><body> -<div id="content-test"> -<p>This is an example <strong>reStructuredText</strong> document.</p> -</div> -<pre id="headers-test"> -SOURCEFILENAME: page.rst -HTMLDIR: . -MARKUPNAME: reStructuredText -GENERATOR: test 1.0 -APPINFO: <a href="http://example.com/";>test</a> -</pre> -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/tests/data/page.rst new/Markups-1.0.0/tests/data/page.rst --- old/Markups-0.6.3/tests/data/page.rst 2014-07-21 12:24:09.000000000 +0200 +++ new/Markups-1.0.0/tests/data/page.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -Hello, world! -============= - -This is an example **reStructuredText** document. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/tests/data/template.html new/Markups-1.0.0/tests/data/template.html --- old/Markups-0.6.3/tests/data/template.html 2014-07-21 12:24:09.000000000 +0200 +++ new/Markups-1.0.0/tests/data/template.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -<html><head> -<title>%PAGENAME%</title> -</head><body> -<div id="content-test"> -%CONTENT% -</div> -<pre id="headers-test"> -SOURCEFILENAME: %SOURCEFILENAME% -HTMLDIR: %HTMLDIR% -MARKUPNAME: %MARKUPNAME% -GENERATOR: %GENERATOR% -APPINFO: %APPINFO% -</pre> -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/tests/test_markdown.py new/Markups-1.0.0/tests/test_markdown.py --- old/Markups-0.6.3/tests/test_markdown.py 2015-06-08 12:07:33.000000000 +0200 +++ new/Markups-1.0.0/tests/test_markdown.py 2015-12-13 14:30:50.000000000 +0100 @@ -181,19 +181,19 @@ def test_remove_extra(self): markup = MarkdownMarkup(extensions=['remove_extra']) html = markup.get_document_body(tables_source) - self.assertNotIn(html, '<table>') + self.assertNotIn('<table>', html) def test_remove_extra_document_extension(self): markup = MarkdownMarkup(extensions=[]) html = markup.get_document_body( 'Required-Extensions: remove_extra\n\n' + tables_source) - self.assertNotIn(html, '<table>') + self.assertNotIn('<table>', html) def test_remove_extra_removes_mathjax(self): - markup = MarkdownMarkup() + markup = MarkdownMarkup(extensions=['remove_extra']) html = markup.get_document_body('$$1$$') - self.assertNotIn(html, 'math/tex') + self.assertNotIn('math/tex', html) def test_meta(self): markup = MarkdownMarkup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/tests/test_public_api.py new/Markups-1.0.0/tests/test_public_api.py --- old/Markups-0.6.3/tests/test_public_api.py 2015-06-08 12:07:43.000000000 +0200 +++ new/Markups-1.0.0/tests/test_public_api.py 2015-12-13 13:55:02.000000000 +0100 @@ -8,12 +8,15 @@ class APITest(unittest.TestCase): def test_api(self): all_markups = markups.get_all_markups() - self.assertTrue(markups.MarkdownMarkup in all_markups and - markups.ReStructuredTextMarkup in all_markups) + self.assertIn(markups.MarkdownMarkup, all_markups) + self.assertIn(markups.ReStructuredTextMarkup, all_markups) markup_class = markups.find_markup_class_by_name('restructuredtext') self.assertEqual(markups.ReStructuredTextMarkup, markup_class) markup_class = markups.get_markup_for_file_name('myfile.mkd', return_class=True) self.assertEqual(markups.MarkdownMarkup, markup_class) + + @unittest.skipUnless(markups.MarkdownMarkup.available(), 'Markdown not available') + def test_api_instance(self): markup = markups.get_markup_for_file_name('myfile.mkd') self.assertIsInstance(markup, markups.MarkdownMarkup) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-0.6.3/tests/test_web.py new/Markups-1.0.0/tests/test_web.py --- old/Markups-0.6.3/tests/test_web.py 2015-01-25 12:17:49.000000000 +0100 +++ new/Markups-1.0.0/tests/test_web.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -# This file is part of python-markups test suite -# License: BSD -# Copyright: (C) Dmitry Shachnev, 2012 - -import os -import sys -import unittest -from markups.restructuredtext import ReStructuredTextMarkup - -if sys.version_info[0] < 3: - raise unittest.SkipTest('Python 3.x is required') - -import markups.web - -class WebTest(unittest.TestCase): - @classmethod - def setUpClass(cls): - if os.path.exists('tests/data'): - working_dir='tests/data' - elif os.path.exists('data'): - working_dir='data' - else: - raise RuntimeError('Could not find data directory!') - cls.get_file = staticmethod(lambda fn: os.path.join(working_dir, fn)) - app_data = ('test', '1.0', 'http://example.com/') - cls.lib = markups.web.WebLibrary(working_dir, app_data) - - @unittest.skipUnless(ReStructuredTextMarkup.available(), 'Docutils not available') - def test_web(self): - self.lib.update('page.rst') - with open(self.get_file('page.html')) as expected_file: - expected_output = expected_file.read() - with open(self.get_file('html/page.html')) as html_file: - html_output = html_file.read() - self.assertEqual(expected_output, html_output) - os.remove(self.get_file('html/page.html')) - self.lib.update_all() - self.assertTrue(os.path.exists(self.get_file('html/page.html'))) - - def test_exceptions(self): - self.assertRaisesRegex(markups.web.WebUpdateError, - 'File not found.', self.lib.update, 'nosuchfile.txt') - with open(self.get_file('test.unknown'), 'w'): - pass - self.assertRaisesRegex(markups.web.WebUpdateError, - 'No suitable markup found.', self.lib.update, - 'test.unknown') - os.remove(self.get_file('test.unknown')) - - @classmethod - def tearDownClass(cls): - if os.path.exists(cls.get_file('html/page.html')): - os.remove(cls.get_file('html/page.html')) - if os.path.exists(cls.get_file('html')): - os.rmdir(cls.get_file('html')) - -if __name__ == '__main__': - unittest.main()
