From 3eb19d640981e12fe9f4fc2b9a17fa6f3861bc54 Mon Sep 17 00:00:00 2001 From: Angus Hollands Date: Tue, 12 Dec 2023 10:00:52 +0000 Subject: [PATCH 1/6] MAINT: update changelog via github-activity (#102) --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a52974..8c25351 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log +## 1.0.0 - 2023-11-08 + +([full changelog](https://github.com/executablebooks/sphinx-external-toc/compare/v0.3.1...9e8cc1f92d84fed6eb9602371709b6a88e47f688)) + +### Merged PRs + +- maint: add ruff [#101](https://github.com/executablebooks/sphinx-external-toc/pull/101) ([@agoose77](https://github.com/agoose77)) +- Bump actions/checkout from 3 to 4 [#98](https://github.com/executablebooks/sphinx-external-toc/pull/98) ([@dependabot](https://github.com/dependabot)) +- chore: update versioning [#97](https://github.com/executablebooks/sphinx-external-toc/pull/97) ([@agoose77](https://github.com/agoose77)) +- fixes https://github.com/executablebooks/jupyter-book/issues/1414 [#94](https://github.com/executablebooks/sphinx-external-toc/pull/94) ([@jdsalaro](https://github.com/jdsalaro)) +- [pre-commit.ci] pre-commit autoupdate [#82](https://github.com/executablebooks/sphinx-external-toc/pull/82) ([@pre-commit-ci](https://github.com/pre-commit-ci)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/executablebooks/sphinx-external-toc/graphs/contributors?from=2022-11-24&to=2023-12-04&type=c)) + +[@agoose77](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Aagoose77+updated%3A2022-11-24..2023-12-04&type=Issues) | [@codecov](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Acodecov+updated%3A2022-11-24..2023-12-04&type=Issues) | [@dependabot](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Adependabot+updated%3A2022-11-24..2023-12-04&type=Issues) | [@jdsalaro](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Ajdsalaro+updated%3A2022-11-24..2023-12-04&type=Issues) | [@mmcky](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Ammcky+updated%3A2022-11-24..2023-12-04&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Apre-commit-ci+updated%3A2022-11-24..2023-12-04&type=Issues) | [@welcome](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Awelcome+updated%3A2022-11-24..2023-12-04&type=Issues) + ## 0.3.1 - 2022-11-25 - ⬆️ UPGRADE: Support `sphinx5` [#85](https://github.com/executablebooks/sphinx-external-toc/pull/85) From 3053d2eba913c95e764caf7dcef3e08e762cccda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:01:05 +0000 Subject: [PATCH 2/6] Bump actions/setup-python from 4 to 5 (#103) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 28802b7..2d0d2b6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -57,7 +57,7 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11 - name: install flit From bceac0151c903252a4f5e2e86cac55599f706c21 Mon Sep 17 00:00:00 2001 From: Angus Hollands Date: Tue, 12 Dec 2023 10:01:15 +0000 Subject: [PATCH 3/6] FIX: exit if non-html builder (#104) --- sphinx_external_toc/events.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sphinx_external_toc/events.py b/sphinx_external_toc/events.py index dc57ea1..aa78fd6 100644 --- a/sphinx_external_toc/events.py +++ b/sphinx_external_toc/events.py @@ -333,6 +333,8 @@ def ensure_index_file(app: Sphinx, exception: Optional[Exception]) -> None: redirect_url = f"{root_name}.html" elif app.builder.name == "dirhtml": redirect_url = f"{root_name}/index.html" + else: + return redirect_text = f'\n' index_path.write_text(redirect_text, encoding="utf8") From 34d215062343d5d9955a970ae2df8625ac732a8c Mon Sep 17 00:00:00 2001 From: Kalle Westerling <7298727+kallewesterling@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:06:54 +0000 Subject: [PATCH 4/6] Update index.md (#100) Grammatical error --- docs/example/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/example/index.md b/docs/example/index.md index 3e7155b..6bbdfcf 100644 --- a/docs/example/index.md +++ b/docs/example/index.md @@ -1,4 +1,4 @@ # Example Project These pages provide an example of different aspects of the ToC. -See this projects `_toc.yml` for how they are added. +See this project's `_toc.yml` for how they are added. From 21adcf94ca0e09e7fbce21bf87734435520169f2 Mon Sep 17 00:00:00 2001 From: Angus Hollands Date: Tue, 12 Dec 2023 10:09:20 +0000 Subject: [PATCH 5/6] FIX: rework 104 to support e.g. PDFHTML (#105) --- sphinx_external_toc/events.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sphinx_external_toc/events.py b/sphinx_external_toc/events.py index aa78fd6..8d468f4 100644 --- a/sphinx_external_toc/events.py +++ b/sphinx_external_toc/events.py @@ -329,12 +329,11 @@ def ensure_index_file(app: Sphinx, exception: Optional[Exception]) -> None: root_name = remove_suffix(app.config.master_doc, app.config.source_suffix) - if app.builder.name == "html": - redirect_url = f"{root_name}.html" - elif app.builder.name == "dirhtml": + if app.builder.name == "dirhtml": redirect_url = f"{root_name}/index.html" else: - return + # Assume a single index for all non dir-HTML builders + redirect_url = f"{root_name}.html" redirect_text = f'\n' index_path.write_text(redirect_text, encoding="utf8") From 172e0e7ed0bd503ad80208582f0d58ede662baab Mon Sep 17 00:00:00 2001 From: Angus Hollands Date: Tue, 12 Dec 2023 10:16:13 +0000 Subject: [PATCH 6/6] RELEASE: v1.0.1 (#106) * DOCS: update changelog for release * FEAT: bump version --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ sphinx_external_toc/__init__.py | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c25351..74880e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ # Change Log +## v1.0.1 - 2023-12-12 + +([full changelog](https://github.com/executablebooks/sphinx-external-toc/compare/v1.0.0...21adcf94ca0e09e7fbce21bf87734435520169f2)) + +### Bugs fixed + +- FIX: rework 104 to support e.g. PDFHTML [#105](https://github.com/executablebooks/sphinx-external-toc/pull/105) ([@agoose77](https://github.com/agoose77)) +- FIX: exit if non-html builder [#104](https://github.com/executablebooks/sphinx-external-toc/pull/104) ([@agoose77](https://github.com/agoose77)) +- FIX: simple grammatical error in `index.md` [#100](https://github.com/executablebooks/sphinx-external-toc/pull/100) ([@kallewesterling](https://github.com/kallewesterling)) + +### Maintenance and upkeep improvements + +- MAINT: update changelog via github-activity [#102](https://github.com/executablebooks/sphinx-external-toc/pull/102) ([@agoose77](https://github.com/agoose77)) + +### Other merged PRs + +- Bump actions/setup-python from 4 to 5 [#103](https://github.com/executablebooks/sphinx-external-toc/pull/103) ([@dependabot](https://github.com/dependabot)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/executablebooks/sphinx-external-toc/graphs/contributors?from=2023-11-08&to=2023-12-12&type=c)) + +[@agoose77](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Aagoose77+updated%3A2023-11-08..2023-12-12&type=Issues) | [@codecov](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Acodecov+updated%3A2023-11-08..2023-12-12&type=Issues) | [@dependabot](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Adependabot+updated%3A2023-11-08..2023-12-12&type=Issues) | [@kallewesterling](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Akallewesterling+updated%3A2023-11-08..2023-12-12&type=Issues) | [@welcome](https://github.com/search?q=repo%3Aexecutablebooks%2Fsphinx-external-toc+involves%3Awelcome+updated%3A2023-11-08..2023-12-12&type=Issues) + + + ## 1.0.0 - 2023-11-08 ([full changelog](https://github.com/executablebooks/sphinx-external-toc/compare/v0.3.1...9e8cc1f92d84fed6eb9602371709b6a88e47f688)) diff --git a/sphinx_external_toc/__init__.py b/sphinx_external_toc/__init__.py index 03f585b..6bcffd4 100644 --- a/sphinx_external_toc/__init__.py +++ b/sphinx_external_toc/__init__.py @@ -1,6 +1,6 @@ """A sphinx extension that allows the project toctree to be defined in a single file.""" -__version__ = "1.0.0" +__version__ = "1.0.1" from typing import TYPE_CHECKING