diff options
author | grubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2019-07-20 14:03:04 +0000 |
---|---|---|
committer | grubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2019-07-20 14:03:04 +0000 |
commit | 8644e81a60624ef522d6f4bb56280ff57592023e (patch) | |
tree | 0ac4b198dfeb97849c55186a2e2995bdba3da794 | |
parent | 9c35cd70fa31f4077a1d776cd0ae7cea626af30b (diff) | |
download | docutils-8644e81a60624ef522d6f4bb56280ff57592023e.tar.gz |
set version 0.15rc1.dev
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8263 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
19 files changed, 26 insertions, 23 deletions
diff --git a/docutils/README.txt b/docutils/README.txt index 2a8c06acd..ebf805c0d 100644 --- a/docutils/README.txt +++ b/docutils/README.txt @@ -1,6 +1,6 @@ -============================ - README: Docutils 0.15b.dev -============================ +============================== + README: Docutils 0.15rc1.dev +============================== :Author: David Goodger :Contact: goodger@python.org diff --git a/docutils/docutils/__init__.py b/docutils/docutils/__init__.py index 80ea8bd3a..2f550b80a 100644 --- a/docutils/docutils/__init__.py +++ b/docutils/docutils/__init__.py @@ -56,7 +56,7 @@ from collections import namedtuple __docformat__ = 'reStructuredText' -__version__ = '0.15b.dev' +__version__ = '0.15rc1.dev' """Docutils version identifier (complies with PEP 440):: major.minor[.micro][releaselevel[serial]][.dev] @@ -74,9 +74,9 @@ __version_info__ = VersionInfo( major=0, minor=15, micro=0, - releaselevel='beta', # one of 'alpha', 'beta', 'candidate', 'final' + releaselevel='candidate', # one of 'alpha', 'beta', 'candidate', 'final' # pre-release serial number (0 for final releases and active development): - serial=0, + serial=1, release=False # True for official releases and pre-releases ) """Comprehensive version information tuple. See 'Version Numbering' in diff --git a/docutils/setup.py b/docutils/setup.py index 82f006e53..997255d58 100755 --- a/docutils/setup.py +++ b/docutils/setup.py @@ -115,7 +115,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.15b.dev', + 'version': '0.15rc1.dev', 'author': 'David Goodger', 'author_email': 'goodger@python.org', 'maintainer': 'docutils-develop list', diff --git a/docutils/test/functional/expected/compact_lists.html b/docutils/test/functional/expected/compact_lists.html index 30715a3d0..10142955e 100644 --- a/docutils/test/functional/expected/compact_lists.html +++ b/docutils/test/functional/expected/compact_lists.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>compact_lists.txt</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/dangerous.html b/docutils/test/functional/expected/dangerous.html index 150385e57..646230ccd 100644 --- a/docutils/test/functional/expected/dangerous.html +++ b/docutils/test/functional/expected/dangerous.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>dangerous.txt</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/field_name_limit.html b/docutils/test/functional/expected/field_name_limit.html index b12b8df75..9e181280b 100644 --- a/docutils/test/functional/expected/field_name_limit.html +++ b/docutils/test/functional/expected/field_name_limit.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>field_list.txt</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/footnotes_html5.html b/docutils/test/functional/expected/footnotes_html5.html index e6ae0cc33..56f8704ca 100644 --- a/docutils/test/functional/expected/footnotes_html5.html +++ b/docutils/test/functional/expected/footnotes_html5.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta charset="utf-8"/> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>Test footnote and citation rendering</title> <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" /> <link rel="stylesheet" href="../input/data/plain.css" type="text/css" /> diff --git a/docutils/test/functional/expected/math_output_html.html b/docutils/test/functional/expected/math_output_html.html index 405824a15..acfc8ce48 100644 --- a/docutils/test/functional/expected/math_output_html.html +++ b/docutils/test/functional/expected/math_output_html.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>Mathematics</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> <link rel="stylesheet" href="../input/data/math.css" type="text/css" /> diff --git a/docutils/test/functional/expected/math_output_latex.html b/docutils/test/functional/expected/math_output_latex.html index 32b733bb1..67ac01b5a 100644 --- a/docutils/test/functional/expected/math_output_latex.html +++ b/docutils/test/functional/expected/math_output_latex.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>Mathematics</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/math_output_mathjax.html b/docutils/test/functional/expected/math_output_mathjax.html index 30013f96c..8f7f22822 100644 --- a/docutils/test/functional/expected/math_output_mathjax.html +++ b/docutils/test/functional/expected/math_output_mathjax.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>Mathematics</title> <script type="text/javascript" src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS_CHTML"></script> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> diff --git a/docutils/test/functional/expected/math_output_mathml.xhtml b/docutils/test/functional/expected/math_output_mathml.xhtml index bb97df90d..83ff19a7c 100644 --- a/docutils/test/functional/expected/math_output_mathml.xhtml +++ b/docutils/test/functional/expected/math_output_mathml.xhtml @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta charset="utf-8"/> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>Mathematics</title> <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" /> <link rel="stylesheet" href="../input/data/plain.css" type="text/css" /> diff --git a/docutils/test/functional/expected/misc_rst_html4css1.html b/docutils/test/functional/expected/misc_rst_html4css1.html index a3c05b7a3..1a29c6851 100644 --- a/docutils/test/functional/expected/misc_rst_html4css1.html +++ b/docutils/test/functional/expected/misc_rst_html4css1.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>link_in_substitution.txt</title> <link rel="stylesheet" href="foo&bar.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/pep_html.html b/docutils/test/functional/expected/pep_html.html index fe4fce769..e729838da 100644 --- a/docutils/test/functional/expected/pep_html.html +++ b/docutils/test/functional/expected/pep_html.html @@ -8,7 +8,7 @@ to templates. DO NOT USE THIS HTML FILE AS YOUR TEMPLATE! --> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> + <meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>PEP 100 -- Test PEP</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml index 80cca7929..5409c0132 100644 --- a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml +++ b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd"> -<!-- Generated by Docutils 0.15b.dev --> +<!-- Generated by Docutils 0.15rc1.dev --> <document ids="restructuredtext-test-document doctitle" names="restructuredtext\ test\ document doctitle" source="functional/input/standalone_rst_docutils_xml.txt" title="reStructuredText Test Document"> <title>reStructuredText Test Document</title> <subtitle ids="examples-of-syntax-constructs subtitle" names="examples\ of\ syntax\ constructs subtitle">Examples of Syntax Constructs</subtitle> diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index 8e1229b98..c2fd3b0c3 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>reStructuredText Test Document</title> <meta name="author" content="David Goodger" /> <meta name="authors" content="Me Myself I" /> diff --git a/docutils/test/functional/expected/standalone_rst_html5.html b/docutils/test/functional/expected/standalone_rst_html5.html index 5af93ae42..8fd5b08ca 100644 --- a/docutils/test/functional/expected/standalone_rst_html5.html +++ b/docutils/test/functional/expected/standalone_rst_html5.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta charset="utf-8"/> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <title>reStructuredText Test Document</title> <meta name="author" content="David Goodger" /> <meta name="author" content="Me" /> diff --git a/docutils/test/functional/expected/standalone_rst_s5_html_1.html b/docutils/test/functional/expected/standalone_rst_s5_html_1.html index f0d2b0773..6070cecde 100644 --- a/docutils/test/functional/expected/standalone_rst_s5_html_1.html +++ b/docutils/test/functional/expected/standalone_rst_s5_html_1.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <meta name="version" content="S5 1.1" /> <title>Slide Shows</title> <meta name="author" content="David Goodger" /> diff --git a/docutils/test/functional/expected/standalone_rst_s5_html_2.html b/docutils/test/functional/expected/standalone_rst_s5_html_2.html index 1be705a0b..5d46c1420 100644 --- a/docutils/test/functional/expected/standalone_rst_s5_html_2.html +++ b/docutils/test/functional/expected/standalone_rst_s5_html_2.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.15rc1.dev: http://docutils.sourceforge.net/" /> <meta name="version" content="S5 1.1" /> <title>Slide Shows</title> <meta name="author" content="David Goodger" /> diff --git a/sandbox/infrastructure/releasing-log.txt b/sandbox/infrastructure/releasing-log.txt index a52d3ab9c..ba85b12be 100644 --- a/sandbox/infrastructure/releasing-log.txt +++ b/sandbox/infrastructure/releasing-log.txt @@ -21,7 +21,10 @@ svn revision: 8258 - start of release FIXED: revision 8260 * test on macosx 2.7 3.4 3.6 3.7 : passed -o change version to : 0.15.0 candidate, serial: 1 +* change version to : 0.15rc1.dev + + - run tests: python 2.7 and 3.7 + o merge changes from HISTORY.txt to RELEASE-NOTES.txt o extract release number description setting from release.sh o rename headings in HISTORY.txt and RELEASE-NOTES.txt |