From 751582831fc6055fcc9b1b334be7393978deb962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Gmach?= Date: Tue, 3 Nov 2020 14:59:39 +0100 Subject: [PATCH 1/6] Add missing classifier for Python 3.9 --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index a1d44fe..e9f5fdc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,7 @@ classifiers = [ "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Programming Language :: Python :: Implementation :: PyPy", "Operating System :: OS Independent", "Topic :: Documentation", From 073431439d5b0f5f44312e83861d39cef413f6f7 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 4 Nov 2020 08:44:58 +0100 Subject: [PATCH 2/6] =?UTF-8?q?+J=C3=BCrgen=20Gmach?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 5f8b042..82b74d8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,11 +16,12 @@ PRIMARY AUTHORS are and/or have been (alphabetic order): CONTRIBUTORS are and/or have been: +* Jürgen Gmach * John Dupuy * Julien Enselme * Sepero * Vitja.Makarov -* Betz Stefan alias 'encbladexp' +* Betz Stefan alias 'encbladexp' * Eric O'Connell From c33a6a8788cec0bc4cc56433448b61d31f9b4fa3 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 4 Nov 2020 08:45:10 +0100 Subject: [PATCH 3/6] add "make tox-py39" --- Makefile | 3 +++ README.creole | 1 + 2 files changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 76eb81f..1e23439 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,9 @@ tox-py37: check-poetry ## Run pytest via tox with *python v3.7* tox-py38: check-poetry ## Run pytest via tox with *python v3.8* poetry run tox -e py38 +tox-py39: check-poetry ## Run pytest via tox with *python v3.9* + poetry run tox -e py39 + pytest: check-poetry ## Run pytest poetry run pytest diff --git a/README.creole b/README.creole index 7f6b6ac..90cf3ba 100644 --- a/README.creole +++ b/README.creole @@ -212,6 +212,7 @@ tox Run pytest via tox with all environments tox-py36 Run pytest via tox with *python v3.6* tox-py37 Run pytest via tox with *python v3.7* tox-py38 Run pytest via tox with *python v3.8* +tox-py39 Run pytest via tox with *python v3.9* pytest Run pytest update-rst-readme update README.rst from README.creole publish Release new version to PyPi From 867afca57e4e6d7fae419d7b11cc78a5f7ecee7f Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 4 Nov 2020 08:45:34 +0100 Subject: [PATCH 4/6] update test_update_rst_readme() --- creole/tests/test_project_setup.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/creole/tests/test_project_setup.py b/creole/tests/test_project_setup.py index cc06578..cb9aa1e 100644 --- a/creole/tests/test_project_setup.py +++ b/creole/tests/test_project_setup.py @@ -2,11 +2,13 @@ :copyleft: 2020 by python-creole team, see AUTHORS for more details. :license: GNU GPL v3 or above, see LICENSE for more details. """ -from poetry_publish.tests.test_assert_rst_readme import test_assert_rst_readme as assert_rst_readme +from pathlib import Path + from poetry_publish.tests.test_project_setup import test_poetry_check as assert_poetry_check from poetry_publish.tests.test_project_setup import test_version as assert_version from creole import __version__ +from creole.setup_utils import update_rst_readme from creole.tests.constants import CREOLE_PACKAGE_ROOT @@ -18,13 +20,15 @@ def test_version(): assert_version(package_root=CREOLE_PACKAGE_ROOT, version=__version__) -def test_assert_rst_readme(): - """ - Check if own README.rst is up-to-date with README.creole - """ - assert_rst_readme( - package_root=CREOLE_PACKAGE_ROOT, version=__version__, filename='README.creole' +def test_update_rst_readme(capsys): + rest_readme_path = update_rst_readme( + package_root=CREOLE_PACKAGE_ROOT, filename='README.creole' ) + captured = capsys.readouterr() + assert captured.out == 'Generate README.rst from README.creole...nothing changed, ok.\n' + assert captured.err == '' + assert isinstance(rest_readme_path, Path) + assert str(rest_readme_path).endswith('/README.rst') def test_poetry_check(): From 59ed916d51885feac62f9dbbb98e41950766909d Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 4 Nov 2020 08:45:44 +0100 Subject: [PATCH 5/6] update README --- README.creole | 5 ++++- README.rst | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.creole b/README.creole index 90cf3ba..bc9137b 100644 --- a/README.creole +++ b/README.creole @@ -228,8 +228,11 @@ Note: In this case you must install **docutils**! See above. = history = -* *dev* - [[https://github.com/jedie/python-creole/compare/v1.4.7...master|compare v1.4.7...master]] +* *dev* - [[https://github.com/jedie/python-creole/compare/v1.4.9...master|compare v1.4.9...master]] ** TBC +* v1.4.9 - 2020-11-4 - [[https://github.com/jedie/python-creole/compare/v1.4.8...v1.4.9|compare v1.4.8...v1.4.9]] +** Add missing classifier for Python 3.9 ([[https://github.com/jedie/python-creole/pull/55|Contributed by jugmac00]]) +** Update readme test * v1.4.8 - 2020-10-17 - [[https://github.com/jedie/python-creole/compare/v1.4.7...v1.4.8|compare v1.4.7...v1.4.8]] ** Validate generated {{{README.rst}}} with [[https://pypi.org/project/readme-renderer/|readme-renderer]] * v1.4.7 - 2020-10-17 - [[https://github.com/jedie/python-creole/compare/v1.4.6...v1.4.7|compare v1.4.6...v1.4.7]] diff --git a/README.rst b/README.rst index 2dcaf62..dfa4db8 100644 --- a/README.rst +++ b/README.rst @@ -281,6 +281,7 @@ To see all make targets, just call ``make``: tox-py36 Run pytest via tox with *python v3.6* tox-py37 Run pytest via tox with *python v3.7* tox-py38 Run pytest via tox with *python v3.8* + tox-py39 Run pytest via tox with *python v3.9* pytest Run pytest update-rst-readme update README.rst from README.creole publish Release new version to PyPi @@ -298,10 +299,16 @@ Note: In this case you must install **docutils**! See above. history ======= -* *dev* - `compare v1.4.7...master `_ +* *dev* - `compare v1.4.9...master `_ * TBC +* v1.4.9 - 2020-11-4 - `compare v1.4.8...v1.4.9 `_ + + * Add missing classifier for Python 3.9 + + * Update readme test + * v1.4.8 - 2020-10-17 - `compare v1.4.7...v1.4.8 `_ * Validate generated ``README.rst`` with `readme-renderer `_ @@ -687,4 +694,4 @@ donation ------------ -``Note: this file is generated from README.creole 2020-10-17 22:52:28 with "python-creole"`` \ No newline at end of file +``Note: this file is generated from README.creole 2020-11-04 08:42:52 with "python-creole"`` \ No newline at end of file From b622957a8747716db66d57dcde1288e0898b72f2 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 4 Nov 2020 08:46:18 +0100 Subject: [PATCH 6/6] bump version number --- README.rst | 4 ++-- creole/__init__.py | 2 +- pyproject.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index dfa4db8..f5c0826 100644 --- a/README.rst +++ b/README.rst @@ -305,7 +305,7 @@ history * v1.4.9 - 2020-11-4 - `compare v1.4.8...v1.4.9 `_ - * Add missing classifier for Python 3.9 + * Add missing classifier for Python 3.9 (`Contributed by jugmac00 `_) * Update readme test @@ -694,4 +694,4 @@ donation ------------ -``Note: this file is generated from README.creole 2020-11-04 08:42:52 with "python-creole"`` \ No newline at end of file +``Note: this file is generated from README.creole 2020-11-04 08:46:39 with "python-creole"`` \ No newline at end of file diff --git a/creole/__init__.py b/creole/__init__.py index 6acb5b9..3f1c443 100644 --- a/creole/__init__.py +++ b/creole/__init__.py @@ -23,7 +23,7 @@ from creole.parser.html_parser import HtmlParser -__version__ = "1.4.8" +__version__ = "1.4.9" __api__ = "1.0" # Creole 1.0 spec - http://wikicreole.org/ VERSION_STRING = __version__ # remove in future diff --git a/pyproject.toml b/pyproject.toml index e9f5fdc..0dc0a07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "python-creole" -version = "1.4.8" +version = "1.4.9" description = "python-creole is an open-source (GPL) markup converter in pure Python for: creole2html, html2creole, html2ReSt, html2textile" # Will be generated from README.creole with: "poetry run update_rst_readme"