summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2023-05-09 18:31:42 +0000
committergrubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2023-05-09 18:31:42 +0000
commit08cad69810123ca7bed2d77f3def19826502d414 (patch)
tree6f6bc764f3e68fdb218b0fb25788febbb0552491
parenta0814f176d99bb121f5cdfad317553de8882cfc0 (diff)
downloaddocutils-08cad69810123ca7bed2d77f3def19826502d414.tar.gz
version 0.20.1b.dev
git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9376 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docutils/HISTORY.txt5
-rw-r--r--docutils/README.txt2
-rw-r--r--docutils/docs/dev/release.txt2
-rw-r--r--docutils/docutils/__init__.py8
-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/embed_images_html5.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.html2
-rw-r--r--docutils/test/functional/expected/misc_rst_html4css1.html2
-rw-r--r--docutils/test/functional/expected/misc_rst_html5.html2
-rw-r--r--docutils/test/functional/expected/pep_html.html2
-rw-r--r--docutils/test/functional/expected/rst_html5_tuftig.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.txt54
24 files changed, 84 insertions, 25 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt
index 15651cd4b..322b7e072 100644
--- a/docutils/HISTORY.txt
+++ b/docutils/HISTORY.txt
@@ -13,6 +13,11 @@
.. contents::
+Changes since 0.20
+==================
+
+Nothing yet
+
Release 0.20 (2023-05-09)
=========================
diff --git a/docutils/README.txt b/docutils/README.txt
index 6d84d7572..ad3a1b024 100644
--- a/docutils/README.txt
+++ b/docutils/README.txt
@@ -1,7 +1,7 @@
.. include:: docs/header0.txt
=======================
- README: Docutils 0.20
+ README: Docutils 0.20.1b.dev
=======================
:Author: David Goodger
diff --git a/docutils/docs/dev/release.txt b/docutils/docs/dev/release.txt
index 7ad1fde92..99025ff90 100644
--- a/docutils/docs/dev/release.txt
+++ b/docutils/docs/dev/release.txt
@@ -107,7 +107,7 @@ Releasing (post 2020)
cd tmp1
tar xzvf ../dist/docutils-#.#.tar.gz
cd docutils-#.#/
- tools/buildhtml.py .
+ python3 tools/buildhtml.py .
find . -name \*.pyc -exec rm -v {} \;
find . -name __pycache__ -exec rmdir -v {} \;
rm -r docutils.egg-info
diff --git a/docutils/docutils/__init__.py b/docutils/docutils/__init__.py
index f3987ed3d..973920c61 100644
--- a/docutils/docutils/__init__.py
+++ b/docutils/docutils/__init__.py
@@ -54,7 +54,7 @@ from collections import namedtuple
__docformat__ = 'reStructuredText'
-__version__ = '0.20'
+__version__ = '0.20.1b.dev'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -117,10 +117,10 @@ class VersionInfo(namedtuple('VersionInfo',
__version_info__ = VersionInfo(
major=0,
minor=20,
- micro=0,
- releaselevel='final', # one of 'alpha', 'beta', 'candidate', 'final'
+ micro=1,
+ releaselevel='beta', # one of 'alpha', 'beta', 'candidate', 'final'
serial=0, # pre-release number (0 for final releases and snapshots)
- release=True # True for official releases and pre-releases
+ release=False # True for official releases and pre-releases
)
"""Comprehensive version information tuple.
diff --git a/docutils/setup.py b/docutils/setup.py
index 3128066cd..5b60a0387 100755
--- a/docutils/setup.py
+++ b/docutils/setup.py
@@ -33,7 +33,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': 'https://docutils.sourceforge.io/',
- 'version': '0.20',
+ 'version': '0.20.1b.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 61b20ba10..288781dab 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<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 d9f25e908..7a75220a3 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<title>dangerous.txt</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
diff --git a/docutils/test/functional/expected/embed_images_html5.html b/docutils/test/functional/expected/embed_images_html5.html
index 78948b956..6ceafa82a 100644
--- a/docutils/test/functional/expected/embed_images_html5.html
+++ b/docutils/test/functional/expected/embed_images_html5.html
@@ -3,7 +3,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta charset="utf-8"/>
-<meta name="generator" content="Docutils 0.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<title>Embedded Images</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/field_name_limit.html b/docutils/test/functional/expected/field_name_limit.html
index 3d1d76f2b..3317848be 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<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 57ec343c5..ebf89fc84 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Test footnote and citation rendering</title>
<link rel="stylesheet" href="../input/data/minimal.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 7b6b50b17..b6a30544d 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<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 eb899f31c..1f92571ba 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<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 5f3514a46..1e26de1e4 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<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.html b/docutils/test/functional/expected/math_output_mathml.html
index 5195732dc..1d919ce02 100644
--- a/docutils/test/functional/expected/math_output_mathml.html
+++ b/docutils/test/functional/expected/math_output_mathml.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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Mathematics</title>
<link rel="stylesheet" href="../input/data/minimal.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 883413940..a19c889f4 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<title>Additional tests with html4css1</title>
<link rel="stylesheet" href="foo&amp;bar.css" type="text/css" />
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
diff --git a/docutils/test/functional/expected/misc_rst_html5.html b/docutils/test/functional/expected/misc_rst_html5.html
index 1bc733736..90e8ecea6 100644
--- a/docutils/test/functional/expected/misc_rst_html5.html
+++ b/docutils/test/functional/expected/misc_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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Additional tests with HTML 5</title>
<link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />
diff --git a/docutils/test/functional/expected/pep_html.html b/docutils/test/functional/expected/pep_html.html
index 85940b8f6..f008e4058 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.20: https://docutils.sourceforge.io/" />
+ <meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<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/rst_html5_tuftig.html b/docutils/test/functional/expected/rst_html5_tuftig.html
index d35f0494b..709546fc5 100644
--- a/docutils/test/functional/expected/rst_html5_tuftig.html
+++ b/docutils/test/functional/expected/rst_html5_tuftig.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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Special Features of the tuftig.css Stylesheet</title>
<link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />
diff --git a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
index cfc44a709..2eafcd5d6 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.20 -->
+<!-- Generated by Docutils 0.20.1b.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 85278903b..634c60797 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<meta content="reStructuredText, test, parser" name="keywords" />
<meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" />
<meta name="author" content="David Goodger" />
diff --git a/docutils/test/functional/expected/standalone_rst_html5.html b/docutils/test/functional/expected/standalone_rst_html5.html
index bb89238c5..45c25f7b8 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta content="reStructuredText, test, parser" name="keywords" />
<meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" xml:lang="en" />
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 e29c196b2..d2e77f855 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<meta name="version" content="S5 1.1" />
<meta name="author" content="David Goodger" />
<meta name="date" content="2005-11-28" />
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 65956e0c3..2df4459f0 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.20: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.20.1b.dev: https://docutils.sourceforge.io/" />
<meta name="version" content="S5 1.1" />
<meta name="author" content="David Goodger" />
<meta name="date" content="2005-11-28" />
diff --git a/sandbox/infrastructure/releasing-log.txt b/sandbox/infrastructure/releasing-log.txt
index 3a905ac35..94dd6f51d 100644
--- a/sandbox/infrastructure/releasing-log.txt
+++ b/sandbox/infrastructure/releasing-log.txt
@@ -56,8 +56,62 @@ release (2023-05-09)
* Commit changes ... the changed version number.
+* tag #.# (Note: only directory docutils is copied)::
+
+ svn copy svn+ssh://grubert@svn.code.sf.net/p/docutils/code/trunk/docutils \
+ svn+ssh://grubert@svn.code.sf.net/p/docutils/code/tags/docutils-0.20 \
+ -m "tagging release 0.20"
+
+* Update your source directory.
+* Rebuild wheel and source-distribution ::
+
+ python3 setup.py sdist
+ python3 setup.py bdist_wheel
+
+* Now upload to pypi::
+
+ python3 -m twine upload dist/docutils-0.20*
+
+* and test::
+
+ python3 -m venv du3 ; cd du3
+ export PYTHONPATH= ; . bin/activate
+
+ pip install --no-deps docutils
+ cp -Lr ../docutils-code/docutils/test .
+ python test/alltests.py
+
+ deactivate ; cd .. ; rm -r du3
+
+* Notify to docutils-developer and user.
+
+* upload source and generated html to sf-htdocs/#.# ::
+
+ mkdir tmp1
+ cd tmp1
+ tar xzvf ../dist/docutils-0.20.tar.gz
+ cd docutils-0.20/
+ python3 tools/buildhtml.py .
+ find . -name \*.pyc -exec rm -v {} \;
+ find . -name __pycache__ -exec rmdir -v {} \;
+ rm -r docutils.egg-info
+ rsync -e ssh -r -t ./ web.sourceforge.net:/home/project-web/docutils/htdocs/0.20
+
+* Check web/index.txt for necessary corrections. Nothing changed.
+* Run sandbox/infrastructure/docutils-update.local to update web-content.
+* Release to sourceforge.
+
+ - Upload docutils-0.20.tar.gz and release notes to sourceforge.
+ - Select docutils-0.20.tar.gz as default for all OS.
+
+* set_version 0.20.1b.dev
+* run tox : OK
+* docutils/HISTORY.txt: add title "Changes Since 0.20"
+* commit
+* run sandbox/infrastructure/docutils-update.local
release candidate 1 (2023-05-04)
+--------------------------------
* svn update
* run tox : py3.7 to py3.11 : OK