From 89e6bc71b46126d2392113ce19dd77080d29a110 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Fri, 6 Oct 2023 15:34:49 -0400 Subject: [PATCH 01/12] Update changelog validation --- .github/workflows/changelog.yml | 11 +++++++++-- .github/workflows/deploy.yml | 1 - 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index b43d4d52..3a0240a2 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -16,8 +16,8 @@ jobs: runs-on: ubuntu-latest steps: - # - uses: actions/checkout@v2 - - uses: dangoslen/changelog-enforcer@v3 + - name: Ensure Changelog Entry Made + uses: dangoslen/changelog-enforcer@v3 with: changeLogPath: 'docs/changelog.md' missingUpdateErrorMessage: | @@ -25,3 +25,10 @@ jobs: changelog describing the changes you have made. Doing so will help to ensure your contribution is accepted. Please see the [Contributing Guide](https://python-markdown.github.io/contributing/#changelog) for details. + - name: Validate Changelog + if: success() + id: changelog_reader + uses: mindsers/changelog-reader-action@v2 + with: + validation_level: error + path: ./docs/changelog.md diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 53409f7e..b10bf7e5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,7 +32,6 @@ jobs: id: changelog_reader uses: mindsers/changelog-reader-action@v2 with: - validation_level: warn version: ${{ github.ref_name }} path: ./docs/changelog.md - name: Release to GitHub From 841fc871867610a52015283de9b8b96a20bb6a23 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Fri, 6 Oct 2023 15:41:49 -0400 Subject: [PATCH 02/12] changelog edit --- markdown/__meta__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/__meta__.py b/markdown/__meta__.py index dfea3e6f..228bf8c3 100644 --- a/markdown/__meta__.py +++ b/markdown/__meta__.py @@ -28,7 +28,7 @@ from __future__ import annotations -__version_info__ = (3, 5, 0, 'final', 0) +__version_info__ = (3, 5, 0, 'rc', 0) def _get_version(version_info): From 241561ed6edb28b0775da8aca289da7fe1e0067b Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Fri, 6 Oct 2023 15:52:31 -0400 Subject: [PATCH 03/12] fix syntax error --- .github/workflows/changelog.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 3a0240a2..b4dc056f 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -26,9 +26,9 @@ jobs: Please see the [Contributing Guide](https://python-markdown.github.io/contributing/#changelog) for details. - name: Validate Changelog - if: success() - id: changelog_reader - uses: mindsers/changelog-reader-action@v2 - with: - validation_level: error - path: ./docs/changelog.md + if: success() + id: changelog_reader + uses: mindsers/changelog-reader-action@v2 + with: + validation_level: error + path: ./docs/changelog.md From a119442bb89fd1eafa9e6612f36308fca42fa257 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Fri, 6 Oct 2023 15:56:15 -0400 Subject: [PATCH 04/12] force validation check --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index b4dc056f..bcdad930 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -26,7 +26,7 @@ jobs: Please see the [Contributing Guide](https://python-markdown.github.io/contributing/#changelog) for details. - name: Validate Changelog - if: success() + # if: success() id: changelog_reader uses: mindsers/changelog-reader-action@v2 with: From db76fea7f23eecd2a01bc26c41e704b25e5cd537 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Fri, 6 Oct 2023 15:57:30 -0400 Subject: [PATCH 05/12] try again --- .github/workflows/changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index bcdad930..ac523564 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -16,15 +16,15 @@ jobs: runs-on: ubuntu-latest steps: - - name: Ensure Changelog Entry Made - uses: dangoslen/changelog-enforcer@v3 - with: - changeLogPath: 'docs/changelog.md' - missingUpdateErrorMessage: | - @${{ github.actor }}, thank you for your contribution. It appears that you have not added a comment to the - changelog describing the changes you have made. Doing so will help to ensure your contribution is accepted. + # - name: Ensure Changelog Entry Made + # uses: dangoslen/changelog-enforcer@v3 + # with: + # changeLogPath: 'docs/changelog.md' + # missingUpdateErrorMessage: | + # @${{ github.actor }}, thank you for your contribution. It appears that you have not added a comment to the + # changelog describing the changes you have made. Doing so will help to ensure your contribution is accepted. - Please see the [Contributing Guide](https://python-markdown.github.io/contributing/#changelog) for details. + # Please see the [Contributing Guide](https://python-markdown.github.io/contributing/#changelog) for details. - name: Validate Changelog # if: success() id: changelog_reader From 227f2720b37787772a8883b9c0011f80fc1a29f2 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Fri, 6 Oct 2023 16:01:46 -0400 Subject: [PATCH 06/12] try again --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index ac523564..3c26d6d4 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -31,4 +31,4 @@ jobs: uses: mindsers/changelog-reader-action@v2 with: validation_level: error - path: ./docs/changelog.md + path: docs/changelog.md From 7ceec221dc0aef85e383dbcb7e8b7a1e3bf98774 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 31 Oct 2023 14:20:49 -0400 Subject: [PATCH 07/12] checkout first --- .github/workflows/changelog.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 3c26d6d4..1eb05a6c 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -16,6 +16,7 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 # - name: Ensure Changelog Entry Made # uses: dangoslen/changelog-enforcer@v3 # with: From 2b2ceb9135b503cee85cf3cd2dd32787565556d0 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 31 Oct 2023 14:24:44 -0400 Subject: [PATCH 08/12] cleanup 3.3.5 changelog entry --- docs/changelog.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 2f9e9250..3245d36a 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -187,10 +187,6 @@ valid parameter and will raise an error if provided. ## [3.3.5] -- 2021-11-16 -### Added - -* Support Python 3.10 (#1124). - ### Fixed * Make the `slugify_unicode` function not remove diacritical marks (#1118). @@ -199,6 +195,7 @@ valid parameter and will raise an error if provided. * Don't process shebangs in fenced code blocks when using CodeHilite (#1156). * Improve email address validation for Automatic Links (#1165). * Ensure `` tags are parsed correctly (#1079). +* Support Python 3.10 (#1124). ## [3.3.4] -- 2021-02-24 From 605a92c801f752b82392fa5323cd71a7ffbf4ea0 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 31 Oct 2023 14:29:07 -0400 Subject: [PATCH 09/12] cleanup 3.4.1 and 3.4.2 changelog entries --- docs/changelog.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 3245d36a..2a0f1eb1 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -51,21 +51,16 @@ links to the header, placing them after all other header content. ## [3.4.2] -- 2023-03-22 -### Added - -* Officially support Python 3.11. - ### Fixed - +* Officially support Python 3.11. * Improve standalone * and _ parsing (#1300). * Consider `` HTML tag a block-level element (#1309). - -### Infrastructure - * Switch from `setup.py` to `pyproject.toml`. ## [3.4.1] -- 2022-07-15 +### Fixed + * Fix an import issue with `importlib.util` (#1274). ## [3.4] -- 2022-07-15 From c0de6cd5fd006d2769a534a1929bf9b58114c968 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 31 Oct 2023 14:32:05 -0400 Subject: [PATCH 10/12] Uncomment rest of workflow --- .github/workflows/changelog.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 1eb05a6c..26b3468f 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -17,17 +17,17 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - # - name: Ensure Changelog Entry Made - # uses: dangoslen/changelog-enforcer@v3 - # with: - # changeLogPath: 'docs/changelog.md' - # missingUpdateErrorMessage: | - # @${{ github.actor }}, thank you for your contribution. It appears that you have not added a comment to the - # changelog describing the changes you have made. Doing so will help to ensure your contribution is accepted. + - name: Ensure Changelog Entry Made + uses: dangoslen/changelog-enforcer@v3 + with: + changeLogPath: 'docs/changelog.md' + missingUpdateErrorMessage: | + @${{ github.actor }}, thank you for your contribution. It appears that you have not added a comment to the + changelog describing the changes you have made. Doing so will help to ensure your contribution is accepted. - # Please see the [Contributing Guide](https://python-markdown.github.io/contributing/#changelog) for details. + Please see the [Contributing Guide](https://python-markdown.github.io/contributing/#changelog) for details. - name: Validate Changelog - # if: success() + if: success() id: changelog_reader uses: mindsers/changelog-reader-action@v2 with: From ba7d4bd9c3403fe530875d1771e367e846434e8d Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 31 Oct 2023 14:36:54 -0400 Subject: [PATCH 11/12] revert edits that forced workflow to run for testing --- markdown/__meta__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/__meta__.py b/markdown/__meta__.py index 228bf8c3..dfea3e6f 100644 --- a/markdown/__meta__.py +++ b/markdown/__meta__.py @@ -28,7 +28,7 @@ from __future__ import annotations -__version_info__ = (3, 5, 0, 'rc', 0) +__version_info__ = (3, 5, 0, 'final', 0) def _get_version(version_info): From 725e8946d742617fc5a08e72b6d1317940f8d62b Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 31 Oct 2023 14:40:01 -0400 Subject: [PATCH 12/12] Always run changelog validation if an edit to changelog is made --- .github/workflows/changelog.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 26b3468f..dec6ca2f 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -5,8 +5,9 @@ on: branches: - '**' path: - # Only run if changes were made in markdown/ + # Only run if changes were made in markdown/ or the changelog - 'markdown/**' + - 'docs/changelog.md' # permissions: # pull-requests: write