Skip to content

Commit f0afb23

Browse files
committed
fix #44, fix #45
1 parent 1ca7c3a commit f0afb23

File tree

5 files changed

+33
-39
lines changed

5 files changed

+33
-39
lines changed

.github/workflows/test.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
virtualenvs-in-project: true
3737
- name: Install Dependencies
3838
run: |
39+
sudo apt-get install libopenblas-dev
3940
poetry config virtualenvs.in-project true
4041
poetry run pip install --upgrade pip
4142
poetry install -E html -E png -E pdf
@@ -50,21 +51,20 @@ jobs:
5051
matrix:
5152
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13.0-rc.1']
5253
sphinx-version:
53-
- 'Sphinx~=7.0.0'
54-
- 'Sphinx~=7.2.0'
55-
- 'Sphinx~=7.3.0'
56-
- 'Sphinx~=7.4.0'
54+
- '6.0'
55+
- '7.0'
56+
- '8'
5757
exclude:
5858
- python-version: '3.12'
59-
sphinx-version: 'Sphinx~=7.0.0'
60-
- python-version: '3.13.0-rc.1'
61-
sphinx-version: 'Sphinx~=7.0.0'
62-
- python-version: '3.13.0-rc.1'
63-
sphinx-version: 'Sphinx~=7.1.0'
59+
sphinx-version: '7.0'
60+
- python-version: '3.12'
61+
sphinx-version: '6.0'
6462
- python-version: '3.13.0-rc.1'
65-
sphinx-version: 'Sphinx~=7.2.0'
63+
sphinx-version: '7.0'
6664
- python-version: '3.13.0-rc.1'
67-
sphinx-version: 'Sphinx~=7.3.0'
65+
sphinx-version: '6.0'
66+
- python-version: '3.9'
67+
sphinx-version: '8'
6868

6969
steps:
7070
- uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
8383
poetry config virtualenvs.in-project true
8484
poetry run pip install --upgrade pip
8585
poetry install -E html -E png -E pdf
86-
poetry run pip install -U "${{ matrix.sphinx-version }}"
86+
poetry run pip install -U "Sphinx~=${{ matrix.sphinx-version }}"
8787
8888
- name: Install Emacs
8989
if: ${{ github.event.inputs.debug == 'on' }}

doc/source/changelog.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
Change Log
33
==========
44

5-
v0.4.3 (24-AUG-2024)
5+
v0.5.0 (24-AUG-2024)
66
====================
77

8+
* Implemented `Support Sphinx 8 <https://github.com/sphinx-contrib/typer/issues/45>`_
9+
* Implemented `Support Python 3.13 <https://github.com/sphinx-contrib/typer/issues/44>`_
810
* Fixed `typer 0.12.5+ breaks click compatibility <https://github.com/sphinx-contrib/typer/issues/43>`_
911

1012
v0.4.2 (22-AUG-2024)

pyproject.toml

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "sphinxcontrib-typer"
3-
version = "0.4.3"
3+
version = "0.5.0"
44
description = "Auto generate docs for typer commands."
55
authors = ["Brian Kohan <[email protected]>"]
66
license = "MIT"
@@ -11,7 +11,9 @@ classifiers = [
1111
"Development Status :: 5 - Production/Stable",
1212
"Environment :: Console",
1313
"Environment :: Web Environment",
14+
"Framework :: Sphinx",
1415
"Framework :: Sphinx :: Extension",
16+
"Topic :: Documentation :: Sphinx",
1517
"Intended Audience :: Developers",
1618
"License :: OSI Approved :: MIT License",
1719
"Operating System :: OS Independent",
@@ -32,11 +34,11 @@ packages = [
3234

3335
[tool.poetry.dependencies]
3436
python = "^3.9"
35-
sphinx = ">=4.0.0"
37+
sphinx = ">=5.0.0"
3638

3739
selenium = "^4.0.0"
3840
webdriver-manager = ">=3.0.0,<5.0.0"
39-
cairosvg = "^2.4.0"
41+
cairosvg = "^2.7.0"
4042
lxml = ">=4.2.0,<6.0.0"
4143
typer-slim = {extras = ["standard"], version = ">=0.12.0,<1.0.0"}
4244
pillow = ">=8.0.0"
@@ -45,33 +47,21 @@ pillow = ">=8.0.0"
4547
ruff = "^0.4.4"
4648
ipdb = "^0.13.13"
4749
pytest = ">=7.4.3,<9.0.0"
48-
pytest-cov = "^4.1.0"
50+
pytest-cov = "^5.0.0"
4951
doc8 = ">0.1"
50-
mypy = "^1.7.1"
51-
readme-renderer = {extras = ["md"], version = ">=42,<44"}
52+
mypy = "^1.11.1"
53+
readme-renderer = {extras = ["md"], version = ">=44"}
5254
aiohttp = "^3.9.1"
53-
numpy = [
54-
{ version = "^1.26", markers = "python_version > '3.8'" },
55-
{ version = "<=1.24", markers = "python_version <= '3.8'" },
56-
]
57-
scipy = [
58-
{ version = ">=1.11", markers = "python_version > '3.8'" },
59-
{ version = "<=1.10", markers = "python_version <= '3.8'" },
60-
]
61-
scikit-image = [
62-
{ version = ">=0.22", markers = "python_version > '3.8'" },
63-
{ version = "<=0.21", markers = "python_version <= '3.8'" },
64-
]
65-
typing-extensions = { version = ">=3.7.4.3", python = "<3.9" }
66-
scikit-learn = "^1.3.2"
55+
numpy = ">=2.0"
56+
scipy = ">=1.13"
57+
scikit-image = ">=0.24"
58+
typing-extensions = ">=4.12"
59+
scikit-learn = "^1.5.1"
6760
beautifulsoup4 = "^4.12.2"
6861
pypdf = ">=3.17.3,<5.0.0"
69-
sphinx-autobuild = [
70-
{ version = ">=2024.2.4", python = ">=3.9"},
71-
{ version = "<2024.2.4", python = "<3.9"},
72-
]
62+
sphinx-autobuild = ">=2024.4.16"
7363
furo = "^2024.8.6"
74-
sphinx-rtd-theme = "^2.0.0"
64+
sphinx-rtd-theme = ">=1.3.0"
7565

7666

7767
[tool.poetry.extras]

sphinxcontrib/typer/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
from typer.models import Context as TyperContext
5555
from typer.models import TyperInfo
5656

57-
VERSION = (0, 4, 3)
57+
VERSION = (0, 5, 0)
5858

5959
__title__ = "SphinxContrib Typer"
6060
__version__ = ".".join(str(i) for i in VERSION)

tests/tests.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import pytest
22
import re
33
from sphinx.application import Sphinx
4+
from sphinx import version_info as sphinx_version
45
from typer import __version__ as typer_version
56
import typing as t
67
import os
@@ -89,6 +90,7 @@ def replace_in_file(file_path: str, search_string: str, replacement_string: str)
8990
file.write(file_contents.replace(search_string, replacement_string))
9091

9192

93+
@pytest.mark.skipif(sphinx_version[0] < 6, reason="Sphinx >=6.0 required to build docs")
9294
def test_sphinx_html_build():
9395
"""
9496
The documentation is extensive and exercises most of the features of the extension so

0 commit comments

Comments
 (0)