summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2019-07-20 19:50:51 +0000
committergrubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2019-07-20 19:50:51 +0000
commit331359b85cc32ac48e0aaf8bfb38f65aa1df992c (patch)
tree41ca1ed247e637c369f61e713eb7b82d77e8c2a2
parent43ec2d78ff28e27ec339b2c327dc1c77378efc4a (diff)
downloaddocutils-331359b85cc32ac48e0aaf8bfb38f65aa1df992c.tar.gz
Change to 0.15 final
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8267 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat
-rw-r--r--docutils/HISTORY.txt6
-rw-r--r--docutils/RELEASE-NOTES.txt4
-rw-r--r--docutils/docutils/__init__.py10
-rwxr-xr-xdocutils/setup.py2
-rw-r--r--docutils/test/functional/expected/compact_lists.html2
-rw-r--r--docutils/test/functional/expected/dangerous.html2
-rw-r--r--docutils/test/functional/expected/field_name_limit.html2
-rw-r--r--docutils/test/functional/expected/footnotes_html5.html2
-rw-r--r--docutils/test/functional/expected/math_output_html.html2
-rw-r--r--docutils/test/functional/expected/math_output_latex.html2
-rw-r--r--docutils/test/functional/expected/math_output_mathjax.html2
-rw-r--r--docutils/test/functional/expected/math_output_mathml.xhtml2
-rw-r--r--docutils/test/functional/expected/misc_rst_html4css1.html2
-rw-r--r--docutils/test/functional/expected/pep_html.html2
-rw-r--r--docutils/test/functional/expected/standalone_rst_docutils_xml.xml2
-rw-r--r--docutils/test/functional/expected/standalone_rst_html4css1.html2
-rw-r--r--docutils/test/functional/expected/standalone_rst_html5.html2
-rw-r--r--docutils/test/functional/expected/standalone_rst_s5_html_1.html2
-rw-r--r--docutils/test/functional/expected/standalone_rst_s5_html_2.html2
-rw-r--r--sandbox/infrastructure/releasing-log.txt2
20 files changed, 29 insertions, 25 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt
index a860fc749..3159c3a8f 100644
--- a/docutils/HISTORY.txt
+++ b/docutils/HISTORY.txt
@@ -13,9 +13,13 @@
.. contents::
-Changes Since 0.14
+Changes Since 0.15
==================
+
+Release 0.15 (2019-07-20)
+=========================
+
* General
- Dropped support for Python 2.4, 2.5, 3.1, and 3.2.
diff --git a/docutils/RELEASE-NOTES.txt b/docutils/RELEASE-NOTES.txt
index c407d626a..e7995de32 100644
--- a/docutils/RELEASE-NOTES.txt
+++ b/docutils/RELEASE-NOTES.txt
@@ -63,8 +63,8 @@ Future changes
__ docs/ref/rst/restructuredtext.html#bibliographic-fields
-Release 0.15b.dev
-=================
+Release 0.15
+============
.. Note::
diff --git a/docutils/docutils/__init__.py b/docutils/docutils/__init__.py
index 2f550b80a..f66de5acd 100644
--- a/docutils/docutils/__init__.py
+++ b/docutils/docutils/__init__.py
@@ -56,7 +56,7 @@ from collections import namedtuple
__docformat__ = 'reStructuredText'
-__version__ = '0.15rc1.dev'
+__version__ = '0.15'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -74,15 +74,15 @@ __version_info__ = VersionInfo(
major=0,
minor=15,
micro=0,
- releaselevel='candidate', # one of 'alpha', 'beta', 'candidate', 'final'
+ releaselevel='final', # one of 'alpha', 'beta', 'candidate', 'final'
# pre-release serial number (0 for final releases and active development):
- serial=1,
- release=False # True for official releases and pre-releases
+ serial=0,
+ release=True # True for official releases and pre-releases
)
"""Comprehensive version information tuple. See 'Version Numbering' in
docs/dev/policies.txt."""
-__version_details__ = ''
+__version_details__ = 'release'
"""Optional extra version details (e.g. 'snapshot 2005-05-29, r3410').
(For development and release status see `__version_info__`.)
"""
diff --git a/docutils/setup.py b/docutils/setup.py
index 997255d58..f080df10a 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.15rc1.dev',
+ 'version': '0.15',
'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 10142955e..49d82facc 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 646230ccd..9b27f07b2 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 9e181280b..a745d65b2 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 56f8704ca..3d32d0a83 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 acfc8ce48..8edc0c6a4 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 67ac01b5a..1299f936f 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 8f7f22822..51802aac8 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 83ff19a7c..5e9cd2203 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 1a29c6851..99942706a 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&amp;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 e729838da..c30142f1d 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.15rc1.dev: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.15: 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 5409c0132..599e7a3b8 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.15rc1.dev -->
+<!-- Generated by Docutils 0.15 -->
<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 c2fd3b0c3..e86737da6 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 8fd5b08ca..b4d1b2d5f 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 6070cecde..73ac61b2f 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 5d46c1420..9f22e317a 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.15rc1.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15: 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 425b4603c..257939f76 100644
--- a/sandbox/infrastructure/releasing-log.txt
+++ b/sandbox/infrastructure/releasing-log.txt
@@ -26,7 +26,7 @@ svn revision: 8258 - start of release
- run tests: python 2.7 and 3.7
* extract changes from HISTORY.txt to RELEASE-NOTES.txt
-o rename headings in HISTORY.txt and RELEASE-NOTES.txt
+* rename headings in HISTORY.txt and RELEASE-NOTES.txt
o run release.sh stage 2: do a clean checkout and packing
o run local test with python 2.6 2.7 3.4 3.5 3.6 3.7
o upload to sourceforge.net. Keep 0.14 as lattest, stable.
View Lorry Controller Status