From 05af43ecba6f4881e1d06a10fcc15616464e8bda Mon Sep 17 00:00:00 2001 From: grubert Date: Wed, 10 Feb 2021 21:03:46 +0000 Subject: [PATCH] version 0.17b2.dev git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8616 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/README.txt | 2 +- docutils/docutils/__init__.py | 6 ++-- docutils/setup.py | 2 +- .../test/functional/expected/compact_lists.html | 2 +- docutils/test/functional/expected/dangerous.html | 2 +- .../functional/expected/embed_images_html5.html | 2 +- .../test/functional/expected/field_name_limit.html | 2 +- .../test/functional/expected/footnotes_html5.html | 2 +- .../test/functional/expected/math_output_html.html | 2 +- .../functional/expected/math_output_latex.html | 2 +- .../functional/expected/math_output_mathjax.html | 2 +- .../functional/expected/math_output_mathml.xhtml | 2 +- .../functional/expected/misc_rst_html4css1.html | 2 +- docutils/test/functional/expected/pep_html.html | 2 +- .../expected/standalone_rst_docutils_xml.xml | 2 +- .../expected/standalone_rst_html4css1.html | 2 +- .../functional/expected/standalone_rst_html5.html | 2 +- .../expected/standalone_rst_s5_html_1.html | 2 +- .../expected/standalone_rst_s5_html_2.html | 2 +- sandbox/infrastructure/releasing-log.txt | 33 ++++++++++++++++++++-- 20 files changed, 52 insertions(+), 23 deletions(-) diff --git a/docutils/README.txt b/docutils/README.txt index 2977e5472..bbd9fcfc1 100644 --- a/docutils/README.txt +++ b/docutils/README.txt @@ -1,5 +1,5 @@ ============================ - README: Docutils 0.17b1 + README: Docutils 0.17b2.dev ============================ :Author: David Goodger diff --git a/docutils/docutils/__init__.py b/docutils/docutils/__init__.py index 7a5d683ee..396c54b7d 100644 --- a/docutils/docutils/__init__.py +++ b/docutils/docutils/__init__.py @@ -56,7 +56,7 @@ from collections import namedtuple __docformat__ = 'reStructuredText' -__version__ = '0.17b1' +__version__ = '0.17b2.dev' """Docutils version identifier (complies with PEP 440):: major.minor[.micro][releaselevel[serial]][.dev] @@ -115,8 +115,8 @@ __version_info__ = VersionInfo( micro=0, releaselevel='beta', # one of 'alpha', 'beta', 'candidate', 'final' # pre-release serial number (0 for final releases and active development): - serial=1, - release=True # True for official releases and pre-releases + serial=2, + release=False # True for official releases and pre-releases ) """Comprehensive version information tuple. See 'Version Numbering' in docs/dev/policies.txt.""" diff --git a/docutils/setup.py b/docutils/setup.py index c734252da..a6590db58 100755 --- a/docutils/setup.py +++ b/docutils/setup.py @@ -31,7 +31,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.17b1', + 'version': '0.17b2.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 62220ac88..2bc2d07cd 100644 --- a/docutils/test/functional/expected/compact_lists.html +++ b/docutils/test/functional/expected/compact_lists.html @@ -3,7 +3,7 @@ - + compact_lists.txt diff --git a/docutils/test/functional/expected/dangerous.html b/docutils/test/functional/expected/dangerous.html index 78e804a92..6556fb2c0 100644 --- a/docutils/test/functional/expected/dangerous.html +++ b/docutils/test/functional/expected/dangerous.html @@ -3,7 +3,7 @@ - + dangerous.txt diff --git a/docutils/test/functional/expected/embed_images_html5.html b/docutils/test/functional/expected/embed_images_html5.html index ef724d08d..d211de431 100644 --- a/docutils/test/functional/expected/embed_images_html5.html +++ b/docutils/test/functional/expected/embed_images_html5.html @@ -2,7 +2,7 @@ - + Embedded Images diff --git a/docutils/test/functional/expected/field_name_limit.html b/docutils/test/functional/expected/field_name_limit.html index 042bdf6e5..e14335934 100644 --- a/docutils/test/functional/expected/field_name_limit.html +++ b/docutils/test/functional/expected/field_name_limit.html @@ -3,7 +3,7 @@ - + field_list.txt diff --git a/docutils/test/functional/expected/footnotes_html5.html b/docutils/test/functional/expected/footnotes_html5.html index 949e97198..a4fc70fe5 100644 --- a/docutils/test/functional/expected/footnotes_html5.html +++ b/docutils/test/functional/expected/footnotes_html5.html @@ -2,7 +2,7 @@ - + Test footnote and citation rendering diff --git a/docutils/test/functional/expected/math_output_html.html b/docutils/test/functional/expected/math_output_html.html index 9dadd55a0..24c9d5312 100644 --- a/docutils/test/functional/expected/math_output_html.html +++ b/docutils/test/functional/expected/math_output_html.html @@ -3,7 +3,7 @@ - + Mathematics diff --git a/docutils/test/functional/expected/math_output_latex.html b/docutils/test/functional/expected/math_output_latex.html index 2ef92d805..bda689315 100644 --- a/docutils/test/functional/expected/math_output_latex.html +++ b/docutils/test/functional/expected/math_output_latex.html @@ -3,7 +3,7 @@ - + Mathematics diff --git a/docutils/test/functional/expected/math_output_mathjax.html b/docutils/test/functional/expected/math_output_mathjax.html index 04ab720f5..f3128d3f0 100644 --- a/docutils/test/functional/expected/math_output_mathjax.html +++ b/docutils/test/functional/expected/math_output_mathjax.html @@ -3,7 +3,7 @@ - + Mathematics diff --git a/docutils/test/functional/expected/math_output_mathml.xhtml b/docutils/test/functional/expected/math_output_mathml.xhtml index e457ddd69..2714ff464 100644 --- a/docutils/test/functional/expected/math_output_mathml.xhtml +++ b/docutils/test/functional/expected/math_output_mathml.xhtml @@ -2,7 +2,7 @@ - + Mathematics diff --git a/docutils/test/functional/expected/misc_rst_html4css1.html b/docutils/test/functional/expected/misc_rst_html4css1.html index 3af590aa4..5fd2fc592 100644 --- a/docutils/test/functional/expected/misc_rst_html4css1.html +++ b/docutils/test/functional/expected/misc_rst_html4css1.html @@ -3,7 +3,7 @@ - + link_in_substitution.txt diff --git a/docutils/test/functional/expected/pep_html.html b/docutils/test/functional/expected/pep_html.html index 5e7ff4452..4319c0a36 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! --> - + PEP 100 -- Test PEP diff --git a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml index 030723014..3bdcf361c 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 @@ - + reStructuredText Test Document Examples of Syntax Constructs diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index 4206ac39b..9e08ae3cc 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -3,7 +3,7 @@ - + reStructuredText Test Document diff --git a/docutils/test/functional/expected/standalone_rst_html5.html b/docutils/test/functional/expected/standalone_rst_html5.html index c25154c1f..a13f67f92 100644 --- a/docutils/test/functional/expected/standalone_rst_html5.html +++ b/docutils/test/functional/expected/standalone_rst_html5.html @@ -2,7 +2,7 @@ - + reStructuredText Test Document 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 fd8667cb9..cdd83099d 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 @@ - + Slide Shows 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 b62abc820..1ae62ab5b 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 @@ - + Slide Shows diff --git a/sandbox/infrastructure/releasing-log.txt b/sandbox/infrastructure/releasing-log.txt index 3f69e6f6e..56154054b 100644 --- a/sandbox/infrastructure/releasing-log.txt +++ b/sandbox/infrastructure/releasing-log.txt @@ -92,8 +92,6 @@ BetaRelease 0.17b1 (2021-02-10) to test.pypi python2 test/alltests.py # IGNORE stylesheet path differences ? - deactivate ; cd .. ; rm -rf du2 - Test in venv :: python3 -m venv du3 ; cd du3 @@ -110,6 +108,37 @@ BetaRelease 0.17b1 (2021-02-10) to test.pypi * commit 0.17b1 to code.sf +* Now upload to pypi:: + + python3 -m twine upload dist/docutils-0.17b1* + +* and test:: + + python3 -m venv du3 ; cd du3 + export PYTHONPATH= ; . bin/activate + + pip install --no-deps --pre docutils + # 0.17b1 + cp -r ~/projects/docutils-code/docutils/test . + cp -r ~/projects/docutils-code/docutils/docs . + python test/alltests.py + # css paths fail + +* Notify to docutils-developer and user. + +* tag 0.16 (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.16 \ + -m "tagging release 0.16" + +* run sandbox/infrastructure/docutils-update.local + +* set version 0.17b2.dev +* test with tox: py27 and py38 39 +* commit to code.sf +* run sandbox/infrastructure/docutils-update.local + Release 0.16 (2020-01-12) ========================= -- 2.11.4.GIT